/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
16
15
# 
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
31
30
# Contact the authors at <mandos@fukt.bsnet.se>.
32
31
# 
33
32
 
34
 
from __future__ import division, with_statement, absolute_import
 
33
from __future__ import division
35
34
 
36
35
import SocketServer
37
36
import socket
38
 
import optparse
 
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
 
from contextlib import closing
60
58
 
61
59
import dbus
62
 
import dbus.service
63
60
import gobject
64
61
import avahi
65
62
from dbus.mainloop.glib import DBusGMainLoop
66
63
import ctypes
67
64
import ctypes.util
68
65
 
69
 
version = "1.0.5"
 
66
version = "1.0"
70
67
 
71
68
logger = logging.Logger('mandos')
72
 
syslogger = (logging.handlers.SysLogHandler
73
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
 
              address = "/dev/log"))
75
 
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos [%(process)d]: %(levelname)s:'
77
 
                        ' %(message)s'))
 
69
syslogger = logging.handlers.SysLogHandler\
 
70
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
71
             address = "/dev/log")
 
72
syslogger.setFormatter(logging.Formatter\
 
73
                        ('Mandos: %(levelname)s: %(message)s'))
78
74
logger.addHandler(syslogger)
79
75
 
80
76
console = logging.StreamHandler()
81
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
 
                                       ' %(levelname)s: %(message)s'))
 
77
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
78
                                       ' %(message)s'))
83
79
logger.addHandler(console)
84
80
 
85
81
class AvahiError(Exception):
86
 
    def __init__(self, value, *args, **kwargs):
 
82
    def __init__(self, value):
87
83
        self.value = value
88
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
89
 
    def __unicode__(self):
90
 
        return unicode(repr(self.value))
 
84
        super(AvahiError, self).__init__()
 
85
    def __str__(self):
 
86
        return repr(self.value)
91
87
 
92
88
class AvahiServiceError(AvahiError):
93
89
    pass
113
109
                  a sensible number of times
114
110
    """
115
111
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
 
                 servicetype = None, port = None, TXT = None,
117
 
                 domain = "", host = "", max_renames = 32768,
118
 
                 protocol = avahi.PROTO_UNSPEC):
 
112
                 servicetype = None, port = None, TXT = None, domain = "",
 
113
                 host = "", max_renames = 32768):
119
114
        self.interface = interface
120
115
        self.name = name
121
116
        self.type = servicetype
122
117
        self.port = port
123
 
        self.TXT = TXT if TXT is not None else []
 
118
        if TXT is None:
 
119
            self.TXT = []
 
120
        else:
 
121
            self.TXT = TXT
124
122
        self.domain = domain
125
123
        self.host = host
126
124
        self.rename_count = 0
127
125
        self.max_renames = max_renames
128
 
        self.protocol = protocol
129
126
    def rename(self):
130
127
        """Derived from the Avahi example code"""
131
128
        if self.rename_count >= self.max_renames:
132
129
            logger.critical(u"No suitable Zeroconf service name found"
133
130
                            u" after %i retries, exiting.",
134
131
                            self.rename_count)
135
 
            raise AvahiServiceError(u"Too many renames")
 
132
            raise AvahiServiceError("Too many renames")
136
133
        self.name = server.GetAlternativeServiceName(self.name)
137
134
        logger.info(u"Changing Zeroconf service name to %r ...",
138
135
                    str(self.name))
139
 
        syslogger.setFormatter(logging.Formatter
 
136
        syslogger.setFormatter(logging.Formatter\
140
137
                               ('Mandos (%s): %%(levelname)s:'
141
 
                                ' %%(message)s' % self.name))
 
138
                               ' %%(message)s' % self.name))
142
139
        self.remove()
143
140
        self.add()
144
141
        self.rename_count += 1
150
147
        """Derived from the Avahi example code"""
151
148
        global group
152
149
        if group is None:
153
 
            group = dbus.Interface(bus.get_object
154
 
                                   (avahi.DBUS_NAME,
 
150
            group = dbus.Interface\
 
151
                    (bus.get_object(avahi.DBUS_NAME,
155
152
                                    server.EntryGroupNew()),
156
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
157
154
            group.connect_to_signal('StateChanged',
158
155
                                    entry_group_state_changed)
159
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
160
157
                     service.name, service.type)
161
158
        group.AddService(
162
159
                self.interface,         # interface
163
 
                self.protocol,          # protocol
 
160
                avahi.PROTO_INET6,      # protocol
164
161
                dbus.UInt32(0),         # flags
165
162
                self.name, self.type,
166
163
                self.domain, self.host,
173
170
# End of Avahi example code
174
171
 
175
172
 
176
 
def _datetime_to_dbus(dt, variant_level=0):
177
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
178
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
179
 
 
180
 
 
181
 
class Client(dbus.service.Object):
 
173
class Client(object):
182
174
    """A representation of a client host served by this server.
183
175
    Attributes:
184
 
    name:       string; from the config file, used in log messages and
185
 
                        D-Bus identifiers
 
176
    name:      string; from the config file, used in log messages
186
177
    fingerprint: string (40 or 32 hexadecimal digits); used to
187
178
                 uniquely identify the client
188
 
    secret:     bytestring; sent verbatim (over TLS) to client
189
 
    host:       string; available for use by the checker command
190
 
    created:    datetime.datetime(); (UTC) object creation
191
 
    last_enabled: datetime.datetime(); (UTC)
192
 
    enabled:    bool()
193
 
    last_checked_ok: datetime.datetime(); (UTC) or None
194
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
195
 
                                      until this client is invalid
196
 
    interval:   datetime.timedelta(); How often to start a new checker
197
 
    disable_hook:  If set, called by disable() as disable_hook(self)
198
 
    checker:    subprocess.Popen(); a running checker process used
199
 
                                    to see if the client lives.
200
 
                                    'None' if no process is running.
 
179
    secret:    bytestring; sent verbatim (over TLS) to client
 
180
    host:      string; available for use by the checker command
 
181
    created:   datetime.datetime(); object creation, not client host
 
182
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
183
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
184
                                     until this client is invalid
 
185
    interval:  datetime.timedelta(); How often to start a new checker
 
186
    stop_hook: If set, called by stop() as stop_hook(self)
 
187
    checker:   subprocess.Popen(); a running checker process used
 
188
                                   to see if the client lives.
 
189
                                   'None' if no process is running.
201
190
    checker_initiator_tag: a gobject event source tag, or None
202
 
    disable_initiator_tag:    - '' -
 
191
    stop_initiator_tag:    - '' -
203
192
    checker_callback_tag:  - '' -
204
193
    checker_command: string; External command which is run to check if
205
194
                     client lives.  %() expansions are done at
206
195
                     runtime with vars(self) as dict, so that for
207
196
                     instance %(name)s can be used in the command.
208
 
    use_dbus: bool(); Whether to provide D-Bus interface and signals
209
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
 
197
    Private attibutes:
 
198
    _timeout: Real variable for 'timeout'
 
199
    _interval: Real variable for 'interval'
 
200
    _timeout_milliseconds: Used when calling gobject.timeout_add()
 
201
    _interval_milliseconds: - '' -
210
202
    """
211
 
    def timeout_milliseconds(self):
212
 
        "Return the 'timeout' attribute in milliseconds"
213
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
214
 
                + (self.timeout.seconds * 1000)
215
 
                + (self.timeout.microseconds // 1000))
216
 
    
217
 
    def interval_milliseconds(self):
218
 
        "Return the 'interval' attribute in milliseconds"
219
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
220
 
                + (self.interval.seconds * 1000)
221
 
                + (self.interval.microseconds // 1000))
222
 
    
223
 
    def __init__(self, name = None, disable_hook=None, config=None,
224
 
                 use_dbus=True):
 
203
    def _set_timeout(self, timeout):
 
204
        "Setter function for 'timeout' attribute"
 
205
        self._timeout = timeout
 
206
        self._timeout_milliseconds = ((self.timeout.days
 
207
                                       * 24 * 60 * 60 * 1000)
 
208
                                      + (self.timeout.seconds * 1000)
 
209
                                      + (self.timeout.microseconds
 
210
                                         // 1000))
 
211
    timeout = property(lambda self: self._timeout,
 
212
                       _set_timeout)
 
213
    del _set_timeout
 
214
    def _set_interval(self, interval):
 
215
        "Setter function for 'interval' attribute"
 
216
        self._interval = interval
 
217
        self._interval_milliseconds = ((self.interval.days
 
218
                                        * 24 * 60 * 60 * 1000)
 
219
                                       + (self.interval.seconds
 
220
                                          * 1000)
 
221
                                       + (self.interval.microseconds
 
222
                                          // 1000))
 
223
    interval = property(lambda self: self._interval,
 
224
                        _set_interval)
 
225
    del _set_interval
 
226
    def __init__(self, name = None, stop_hook=None, config=None):
225
227
        """Note: the 'checker' key in 'config' sets the
226
228
        'checker_command' attribute and *not* the 'checker'
227
229
        attribute."""
228
 
        self.name = name
229
230
        if config is None:
230
231
            config = {}
 
232
        self.name = name
231
233
        logger.debug(u"Creating client %r", self.name)
232
 
        self.use_dbus = False   # During __init__
233
234
        # Uppercase and remove spaces from fingerprint for later
234
235
        # comparison purposes with return value from the fingerprint()
235
236
        # function
236
 
        self.fingerprint = (config["fingerprint"].upper()
237
 
                            .replace(u" ", u""))
 
237
        self.fingerprint = config["fingerprint"].upper()\
 
238
                           .replace(u" ", u"")
238
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
239
240
        if "secret" in config:
240
241
            self.secret = config["secret"].decode(u"base64")
241
242
        elif "secfile" in config:
242
 
            with closing(open(os.path.expanduser
243
 
                              (os.path.expandvars
244
 
                               (config["secfile"])))) as secfile:
245
 
                self.secret = secfile.read()
 
243
            secfile = open(os.path.expanduser(os.path.expandvars
 
244
                                              (config["secfile"])))
 
245
            self.secret = secfile.read()
 
246
            secfile.close()
246
247
        else:
247
248
            raise TypeError(u"No secret or secfile for client %s"
248
249
                            % self.name)
249
250
        self.host = config.get("host", "")
250
 
        self.created = datetime.datetime.utcnow()
251
 
        self.enabled = False
252
 
        self.last_enabled = None
 
251
        self.created = datetime.datetime.now()
253
252
        self.last_checked_ok = None
254
253
        self.timeout = string_to_delta(config["timeout"])
255
254
        self.interval = string_to_delta(config["interval"])
256
 
        self.disable_hook = disable_hook
 
255
        self.stop_hook = stop_hook
257
256
        self.checker = None
258
257
        self.checker_initiator_tag = None
259
 
        self.disable_initiator_tag = None
 
258
        self.stop_initiator_tag = None
260
259
        self.checker_callback_tag = None
261
 
        self.checker_command = config["checker"]
262
 
        self.last_connect = None
263
 
        # Only now, when this client is initialized, can it show up on
264
 
        # the D-Bus
265
 
        self.use_dbus = use_dbus
266
 
        if self.use_dbus:
267
 
            self.dbus_object_path = (dbus.ObjectPath
268
 
                                     ("/clients/"
269
 
                                      + self.name.replace(".", "_")))
270
 
            dbus.service.Object.__init__(self, bus,
271
 
                                         self.dbus_object_path)
272
 
    
273
 
    def enable(self):
 
260
        self.check_command = config["checker"]
 
261
    def start(self):
274
262
        """Start this client's checker and timeout hooks"""
275
 
        self.last_enabled = datetime.datetime.utcnow()
276
263
        # Schedule a new checker to be started an 'interval' from now,
277
264
        # and every interval from then on.
278
 
        self.checker_initiator_tag = (gobject.timeout_add
279
 
                                      (self.interval_milliseconds(),
280
 
                                       self.start_checker))
 
265
        self.checker_initiator_tag = gobject.timeout_add\
 
266
                                     (self._interval_milliseconds,
 
267
                                      self.start_checker)
281
268
        # Also start a new checker *right now*.
282
269
        self.start_checker()
283
 
        # Schedule a disable() when 'timeout' has passed
284
 
        self.disable_initiator_tag = (gobject.timeout_add
285
 
                                   (self.timeout_milliseconds(),
286
 
                                    self.disable))
287
 
        self.enabled = True
288
 
        if self.use_dbus:
289
 
            # Emit D-Bus signals
290
 
            self.PropertyChanged(dbus.String(u"enabled"),
291
 
                                 dbus.Boolean(True, variant_level=1))
292
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
293
 
                                 (_datetime_to_dbus(self.last_enabled,
294
 
                                                    variant_level=1)))
295
 
    
296
 
    def disable(self):
297
 
        """Disable this client."""
298
 
        if not getattr(self, "enabled", False):
 
270
        # Schedule a stop() when 'timeout' has passed
 
271
        self.stop_initiator_tag = gobject.timeout_add\
 
272
                                  (self._timeout_milliseconds,
 
273
                                   self.stop)
 
274
    def stop(self):
 
275
        """Stop this client.
 
276
        The possibility that a client might be restarted is left open,
 
277
        but not currently used."""
 
278
        # If this client doesn't have a secret, it is already stopped.
 
279
        if hasattr(self, "secret") and self.secret:
 
280
            logger.info(u"Stopping client %s", self.name)
 
281
            self.secret = None
 
282
        else:
299
283
            return False
300
 
        logger.info(u"Disabling client %s", self.name)
301
 
        if getattr(self, "disable_initiator_tag", False):
302
 
            gobject.source_remove(self.disable_initiator_tag)
303
 
            self.disable_initiator_tag = None
 
284
        if getattr(self, "stop_initiator_tag", False):
 
285
            gobject.source_remove(self.stop_initiator_tag)
 
286
            self.stop_initiator_tag = None
304
287
        if getattr(self, "checker_initiator_tag", False):
305
288
            gobject.source_remove(self.checker_initiator_tag)
306
289
            self.checker_initiator_tag = None
307
290
        self.stop_checker()
308
 
        if self.disable_hook:
309
 
            self.disable_hook(self)
310
 
        self.enabled = False
311
 
        if self.use_dbus:
312
 
            # Emit D-Bus signal
313
 
            self.PropertyChanged(dbus.String(u"enabled"),
314
 
                                 dbus.Boolean(False, variant_level=1))
 
291
        if self.stop_hook:
 
292
            self.stop_hook(self)
315
293
        # Do not run this again if called by a gobject.timeout_add
316
294
        return False
317
 
    
318
295
    def __del__(self):
319
 
        self.disable_hook = None
320
 
        self.disable()
321
 
    
322
 
    def checker_callback(self, pid, condition, command):
 
296
        self.stop_hook = None
 
297
        self.stop()
 
298
    def checker_callback(self, pid, condition):
323
299
        """The checker has completed, so take appropriate actions."""
 
300
        now = datetime.datetime.now()
324
301
        self.checker_callback_tag = None
325
302
        self.checker = None
326
 
        if self.use_dbus:
327
 
            # Emit D-Bus signal
328
 
            self.PropertyChanged(dbus.String(u"checker_running"),
329
 
                                 dbus.Boolean(False, variant_level=1))
330
 
        if os.WIFEXITED(condition):
331
 
            exitstatus = os.WEXITSTATUS(condition)
332
 
            if exitstatus == 0:
333
 
                logger.info(u"Checker for %(name)s succeeded",
334
 
                            vars(self))
335
 
                self.checked_ok()
336
 
            else:
337
 
                logger.info(u"Checker for %(name)s failed",
338
 
                            vars(self))
339
 
            if self.use_dbus:
340
 
                # Emit D-Bus signal
341
 
                self.CheckerCompleted(dbus.Int16(exitstatus),
342
 
                                      dbus.Int64(condition),
343
 
                                      dbus.String(command))
344
 
        else:
 
303
        if os.WIFEXITED(condition) \
 
304
               and (os.WEXITSTATUS(condition) == 0):
 
305
            logger.info(u"Checker for %(name)s succeeded",
 
306
                        vars(self))
 
307
            self.last_checked_ok = now
 
308
            gobject.source_remove(self.stop_initiator_tag)
 
309
            self.stop_initiator_tag = gobject.timeout_add\
 
310
                                      (self._timeout_milliseconds,
 
311
                                       self.stop)
 
312
        elif not os.WIFEXITED(condition):
345
313
            logger.warning(u"Checker for %(name)s crashed?",
346
314
                           vars(self))
347
 
            if self.use_dbus:
348
 
                # Emit D-Bus signal
349
 
                self.CheckerCompleted(dbus.Int16(-1),
350
 
                                      dbus.Int64(condition),
351
 
                                      dbus.String(command))
352
 
    
353
 
    def checked_ok(self):
354
 
        """Bump up the timeout for this client.
355
 
        This should only be called when the client has been seen,
356
 
        alive and well.
357
 
        """
358
 
        self.last_checked_ok = datetime.datetime.utcnow()
359
 
        gobject.source_remove(self.disable_initiator_tag)
360
 
        self.disable_initiator_tag = (gobject.timeout_add
361
 
                                      (self.timeout_milliseconds(),
362
 
                                       self.disable))
363
 
        if self.use_dbus:
364
 
            # Emit D-Bus signal
365
 
            self.PropertyChanged(
366
 
                dbus.String(u"last_checked_ok"),
367
 
                (_datetime_to_dbus(self.last_checked_ok,
368
 
                                   variant_level=1)))
369
 
    
 
315
        else:
 
316
            logger.info(u"Checker for %(name)s failed",
 
317
                        vars(self))
370
318
    def start_checker(self):
371
319
        """Start a new checker subprocess if one is not running.
372
320
        If a checker already exists, leave it running and do
381
329
        # is as it should be.
382
330
        if self.checker is None:
383
331
            try:
384
 
                # In case checker_command has exactly one % operator
385
 
                command = self.checker_command % self.host
 
332
                # In case check_command has exactly one % operator
 
333
                command = self.check_command % self.host
386
334
            except TypeError:
387
335
                # Escape attributes for the shell
388
336
                escaped_attrs = dict((key, re.escape(str(val)))
389
337
                                     for key, val in
390
338
                                     vars(self).iteritems())
391
339
                try:
392
 
                    command = self.checker_command % escaped_attrs
 
340
                    command = self.check_command % escaped_attrs
393
341
                except TypeError, error:
394
342
                    logger.error(u'Could not format string "%s":'
395
 
                                 u' %s', self.checker_command, error)
 
343
                                 u' %s', self.check_command, error)
396
344
                    return True # Try again later
397
345
            try:
398
346
                logger.info(u"Starting checker %r for %s",
404
352
                self.checker = subprocess.Popen(command,
405
353
                                                close_fds=True,
406
354
                                                shell=True, cwd="/")
407
 
                if self.use_dbus:
408
 
                    # Emit D-Bus signal
409
 
                    self.CheckerStarted(command)
410
 
                    self.PropertyChanged(
411
 
                        dbus.String("checker_running"),
412
 
                        dbus.Boolean(True, variant_level=1))
413
 
                self.checker_callback_tag = (gobject.child_watch_add
414
 
                                             (self.checker.pid,
415
 
                                              self.checker_callback,
416
 
                                              data=command))
417
 
                # The checker may have completed before the gobject
418
 
                # watch was added.  Check for this.
419
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
420
 
                if pid:
421
 
                    gobject.source_remove(self.checker_callback_tag)
422
 
                    self.checker_callback(pid, status, command)
 
355
                self.checker_callback_tag = gobject.child_watch_add\
 
356
                                            (self.checker.pid,
 
357
                                             self.checker_callback)
423
358
            except OSError, error:
424
359
                logger.error(u"Failed to start subprocess: %s",
425
360
                             error)
426
361
        # Re-run this periodically if run by gobject.timeout_add
427
362
        return True
428
 
    
429
363
    def stop_checker(self):
430
364
        """Force the checker process, if any, to stop."""
431
365
        if self.checker_callback_tag:
443
377
            if error.errno != errno.ESRCH: # No such process
444
378
                raise
445
379
        self.checker = None
446
 
        if self.use_dbus:
447
 
            self.PropertyChanged(dbus.String(u"checker_running"),
448
 
                                 dbus.Boolean(False, variant_level=1))
449
 
    
450
380
    def still_valid(self):
451
381
        """Has the timeout not yet passed for this client?"""
452
 
        if not getattr(self, "enabled", False):
453
 
            return False
454
 
        now = datetime.datetime.utcnow()
 
382
        now = datetime.datetime.now()
455
383
        if self.last_checked_ok is None:
456
384
            return now < (self.created + self.timeout)
457
385
        else:
458
386
            return now < (self.last_checked_ok + self.timeout)
459
 
    
460
 
    ## D-Bus methods & signals
461
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
462
 
    
463
 
    # CheckedOK - method
464
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
465
 
    CheckedOK.__name__ = "CheckedOK"
466
 
    
467
 
    # CheckerCompleted - signal
468
 
    @dbus.service.signal(_interface, signature="nxs")
469
 
    def CheckerCompleted(self, exitcode, waitstatus, command):
470
 
        "D-Bus signal"
471
 
        pass
472
 
    
473
 
    # CheckerStarted - signal
474
 
    @dbus.service.signal(_interface, signature="s")
475
 
    def CheckerStarted(self, command):
476
 
        "D-Bus signal"
477
 
        pass
478
 
    
479
 
    # GetAllProperties - method
480
 
    @dbus.service.method(_interface, out_signature="a{sv}")
481
 
    def GetAllProperties(self):
482
 
        "D-Bus method"
483
 
        return dbus.Dictionary({
484
 
                dbus.String("name"):
485
 
                    dbus.String(self.name, variant_level=1),
486
 
                dbus.String("fingerprint"):
487
 
                    dbus.String(self.fingerprint, variant_level=1),
488
 
                dbus.String("host"):
489
 
                    dbus.String(self.host, variant_level=1),
490
 
                dbus.String("created"):
491
 
                    _datetime_to_dbus(self.created, variant_level=1),
492
 
                dbus.String("last_enabled"):
493
 
                    (_datetime_to_dbus(self.last_enabled,
494
 
                                       variant_level=1)
495
 
                     if self.last_enabled is not None
496
 
                     else dbus.Boolean(False, variant_level=1)),
497
 
                dbus.String("enabled"):
498
 
                    dbus.Boolean(self.enabled, variant_level=1),
499
 
                dbus.String("last_checked_ok"):
500
 
                    (_datetime_to_dbus(self.last_checked_ok,
501
 
                                       variant_level=1)
502
 
                     if self.last_checked_ok is not None
503
 
                     else dbus.Boolean (False, variant_level=1)),
504
 
                dbus.String("timeout"):
505
 
                    dbus.UInt64(self.timeout_milliseconds(),
506
 
                                variant_level=1),
507
 
                dbus.String("interval"):
508
 
                    dbus.UInt64(self.interval_milliseconds(),
509
 
                                variant_level=1),
510
 
                dbus.String("checker"):
511
 
                    dbus.String(self.checker_command,
512
 
                                variant_level=1),
513
 
                dbus.String("checker_running"):
514
 
                    dbus.Boolean(self.checker is not None,
515
 
                                 variant_level=1),
516
 
                dbus.String("object_path"):
517
 
                    dbus.ObjectPath(self.dbus_object_path,
518
 
                                    variant_level=1)
519
 
                }, signature="sv")
520
 
    
521
 
    # IsStillValid - method
522
 
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
523
 
                    (still_valid))
524
 
    IsStillValid.__name__ = "IsStillValid"
525
 
    
526
 
    # PropertyChanged - signal
527
 
    @dbus.service.signal(_interface, signature="sv")
528
 
    def PropertyChanged(self, property, value):
529
 
        "D-Bus signal"
530
 
        pass
531
 
    
532
 
    # SetChecker - method
533
 
    @dbus.service.method(_interface, in_signature="s")
534
 
    def SetChecker(self, checker):
535
 
        "D-Bus setter method"
536
 
        self.checker_command = checker
537
 
        # Emit D-Bus signal
538
 
        self.PropertyChanged(dbus.String(u"checker"),
539
 
                             dbus.String(self.checker_command,
540
 
                                         variant_level=1))
541
 
    
542
 
    # SetHost - method
543
 
    @dbus.service.method(_interface, in_signature="s")
544
 
    def SetHost(self, host):
545
 
        "D-Bus setter method"
546
 
        self.host = host
547
 
        # Emit D-Bus signal
548
 
        self.PropertyChanged(dbus.String(u"host"),
549
 
                             dbus.String(self.host, variant_level=1))
550
 
    
551
 
    # SetInterval - method
552
 
    @dbus.service.method(_interface, in_signature="t")
553
 
    def SetInterval(self, milliseconds):
554
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
555
 
        # Emit D-Bus signal
556
 
        self.PropertyChanged(dbus.String(u"interval"),
557
 
                             (dbus.UInt64(self.interval_milliseconds(),
558
 
                                          variant_level=1)))
559
 
    
560
 
    # SetSecret - method
561
 
    @dbus.service.method(_interface, in_signature="ay",
562
 
                         byte_arrays=True)
563
 
    def SetSecret(self, secret):
564
 
        "D-Bus setter method"
565
 
        self.secret = str(secret)
566
 
    
567
 
    # SetTimeout - method
568
 
    @dbus.service.method(_interface, in_signature="t")
569
 
    def SetTimeout(self, milliseconds):
570
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
571
 
        # Emit D-Bus signal
572
 
        self.PropertyChanged(dbus.String(u"timeout"),
573
 
                             (dbus.UInt64(self.timeout_milliseconds(),
574
 
                                          variant_level=1)))
575
 
    
576
 
    # Enable - method
577
 
    Enable = dbus.service.method(_interface)(enable)
578
 
    Enable.__name__ = "Enable"
579
 
    
580
 
    # StartChecker - method
581
 
    @dbus.service.method(_interface)
582
 
    def StartChecker(self):
583
 
        "D-Bus method"
584
 
        self.start_checker()
585
 
    
586
 
    # Disable - method
587
 
    @dbus.service.method(_interface)
588
 
    def Disable(self):
589
 
        "D-Bus method"
590
 
        self.disable()
591
 
    
592
 
    # StopChecker - method
593
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
594
 
    StopChecker.__name__ = "StopChecker"
595
 
    
596
 
    del _interface
597
387
 
598
388
 
599
389
def peer_certificate(session):
600
390
    "Return the peer's OpenPGP certificate as a bytestring"
601
391
    # If not an OpenPGP certificate...
602
 
    if (gnutls.library.functions
603
 
        .gnutls_certificate_type_get(session._c_object)
604
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
392
    if gnutls.library.functions.gnutls_certificate_type_get\
 
393
            (session._c_object) \
 
394
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
605
395
        # ...do the normal thing
606
396
        return session.peer_certificate
607
 
    list_size = ctypes.c_uint(1)
608
 
    cert_list = (gnutls.library.functions
609
 
                 .gnutls_certificate_get_peers
610
 
                 (session._c_object, ctypes.byref(list_size)))
611
 
    if not bool(cert_list) and list_size.value != 0:
612
 
        raise gnutls.errors.GNUTLSError("error getting peer"
613
 
                                        " certificate")
 
397
    list_size = ctypes.c_uint()
 
398
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
399
        (session._c_object, ctypes.byref(list_size))
614
400
    if list_size.value == 0:
615
401
        return None
616
402
    cert = cert_list[0]
620
406
def fingerprint(openpgp):
621
407
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
622
408
    # New GnuTLS "datum" with the OpenPGP public key
623
 
    datum = (gnutls.library.types
624
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
625
 
                                         ctypes.POINTER
626
 
                                         (ctypes.c_ubyte)),
627
 
                             ctypes.c_uint(len(openpgp))))
 
409
    datum = gnutls.library.types.gnutls_datum_t\
 
410
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
411
                     ctypes.POINTER(ctypes.c_ubyte)),
 
412
         ctypes.c_uint(len(openpgp)))
628
413
    # New empty GnuTLS certificate
629
414
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
630
 
    (gnutls.library.functions
631
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
415
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
416
        (ctypes.byref(crt))
632
417
    # Import the OpenPGP public key into the certificate
633
 
    (gnutls.library.functions
634
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
635
 
                                gnutls.library.constants
636
 
                                .GNUTLS_OPENPGP_FMT_RAW))
 
418
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
419
                    (crt, ctypes.byref(datum),
 
420
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
637
421
    # Verify the self signature in the key
638
422
    crtverify = ctypes.c_uint()
639
 
    (gnutls.library.functions
640
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
423
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
424
        (crt, 0, ctypes.byref(crtverify))
641
425
    if crtverify.value != 0:
642
426
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
643
427
        raise gnutls.errors.CertificateSecurityError("Verify failed")
645
429
    buf = ctypes.create_string_buffer(20)
646
430
    buf_len = ctypes.c_size_t()
647
431
    # Get the fingerprint from the certificate into the buffer
648
 
    (gnutls.library.functions
649
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
650
 
                                         ctypes.byref(buf_len)))
 
432
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
433
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
651
434
    # Deinit the certificate
652
435
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
653
436
    # Convert the buffer to a Python bytestring
664
447
    
665
448
    def handle(self):
666
449
        logger.info(u"TCP connection from: %s",
667
 
                    unicode(self.client_address))
668
 
        session = (gnutls.connection
669
 
                   .ClientSession(self.request,
670
 
                                  gnutls.connection
671
 
                                  .X509Credentials()))
 
450
                     unicode(self.client_address))
 
451
        session = gnutls.connection.ClientSession\
 
452
                  (self.request, gnutls.connection.X509Credentials())
672
453
        
673
454
        line = self.request.makefile().readline()
674
455
        logger.debug(u"Protocol version: %r", line)
685
466
        # using OpenPGP certificates.
686
467
        
687
468
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
688
 
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
689
 
        #                     "+DHE-DSS"))
690
 
        # Use a fallback default, since this MUST be set.
691
 
        priority = self.server.settings.get("priority", "NORMAL")
692
 
        (gnutls.library.functions
693
 
         .gnutls_priority_set_direct(session._c_object,
694
 
                                     priority, None))
 
469
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
470
        #                "+DHE-DSS"))
 
471
        priority = "NORMAL"             # Fallback default, since this
 
472
                                        # MUST be set.
 
473
        if self.server.settings["priority"]:
 
474
            priority = self.server.settings["priority"]
 
475
        gnutls.library.functions.gnutls_priority_set_direct\
 
476
            (session._c_object, priority, None)
695
477
        
696
478
        try:
697
479
            session.handshake()
700
482
            # Do not run session.bye() here: the session is not
701
483
            # established.  Just abandon the request.
702
484
            return
703
 
        logger.debug(u"Handshake succeeded")
704
485
        try:
705
486
            fpr = fingerprint(peer_certificate(session))
706
487
        except (TypeError, gnutls.errors.GNUTLSError), error:
708
489
            session.bye()
709
490
            return
710
491
        logger.debug(u"Fingerprint: %s", fpr)
711
 
        
 
492
        client = None
712
493
        for c in self.server.clients:
713
494
            if c.fingerprint == fpr:
714
495
                client = c
715
496
                break
716
 
        else:
 
497
        if not client:
717
498
            logger.warning(u"Client not found for fingerprint: %s",
718
499
                           fpr)
719
500
            session.bye()
726
507
                           vars(client))
727
508
            session.bye()
728
509
            return
729
 
        ## This won't work here, since we're in a fork.
730
 
        # client.checked_ok()
731
510
        sent_size = 0
732
511
        while sent_size < len(client.secret):
733
512
            sent = session.send(client.secret[sent_size:])
738
517
        session.bye()
739
518
 
740
519
 
741
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
742
 
                     SocketServer.TCPServer, object):
743
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port.
 
520
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
521
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
744
522
    Attributes:
745
523
        settings:       Server settings
746
524
        clients:        Set() of Client objects
754
532
        if "clients" in kwargs:
755
533
            self.clients = kwargs["clients"]
756
534
            del kwargs["clients"]
757
 
        if "use_ipv6" in kwargs:
758
 
            if not kwargs["use_ipv6"]:
759
 
                self.address_family = socket.AF_INET
760
 
            del kwargs["use_ipv6"]
761
535
        self.enabled = False
762
536
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
763
537
    def server_bind(self):
777
551
                                 u" bind to interface %s",
778
552
                                 self.settings["interface"])
779
553
                else:
780
 
                    raise
 
554
                    raise error
781
555
        # Only bind(2) the socket if we really need to.
782
556
        if self.server_address[0] or self.server_address[1]:
783
557
            if not self.server_address[0]:
784
 
                if self.address_family == socket.AF_INET6:
785
 
                    any_address = "::" # in6addr_any
786
 
                else:
787
 
                    any_address = socket.INADDR_ANY
788
 
                self.server_address = (any_address,
 
558
                in6addr_any = "::"
 
559
                self.server_address = (in6addr_any,
789
560
                                       self.server_address[1])
790
561
            elif not self.server_address[1]:
791
562
                self.server_address = (self.server_address[0],
807
578
 
808
579
def string_to_delta(interval):
809
580
    """Parse a string and return a datetime.timedelta
810
 
    
 
581
 
811
582
    >>> string_to_delta('7d')
812
583
    datetime.timedelta(7)
813
584
    >>> string_to_delta('60s')
865
636
    elif state == avahi.ENTRY_GROUP_FAILURE:
866
637
        logger.critical(u"Avahi: Error in group state changed %s",
867
638
                        unicode(error))
868
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
639
        raise AvahiGroupError("State changed: %s", str(error))
869
640
 
870
641
def if_nametoindex(interface):
871
642
    """Call the C function if_nametoindex(), or equivalent"""
872
643
    global if_nametoindex
873
644
    try:
874
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
875
 
                          (ctypes.util.find_library("c"))
876
 
                          .if_nametoindex)
 
645
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
646
            (ctypes.util.find_library("c")).if_nametoindex
877
647
    except (OSError, AttributeError):
878
648
        if "struct" not in sys.modules:
879
649
            import struct
882
652
        def if_nametoindex(interface):
883
653
            "Get an interface index the hard way, i.e. using fcntl()"
884
654
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
885
 
            with closing(socket.socket()) as s:
886
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
887
 
                                    struct.pack("16s16x", interface))
 
655
            s = socket.socket()
 
656
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
657
                                struct.pack("16s16x", interface))
 
658
            s.close()
888
659
            interface_index = struct.unpack("I", ifreq[16:20])[0]
889
660
            return interface_index
890
661
    return if_nametoindex(interface)
914
685
 
915
686
 
916
687
def main():
917
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
688
    parser = OptionParser(version = "%%prog %s" % version)
918
689
    parser.add_option("-i", "--interface", type="string",
919
690
                      metavar="IF", help="Bind to interface IF")
920
691
    parser.add_option("-a", "--address", type="string",
921
692
                      help="Address to listen for requests on")
922
693
    parser.add_option("-p", "--port", type="int",
923
694
                      help="Port number to receive requests on")
924
 
    parser.add_option("--check", action="store_true",
 
695
    parser.add_option("--check", action="store_true", default=False,
925
696
                      help="Run self-test")
926
697
    parser.add_option("--debug", action="store_true",
927
698
                      help="Debug mode; run in foreground and log to"
934
705
                      default="/etc/mandos", metavar="DIR",
935
706
                      help="Directory to search for configuration"
936
707
                      " files")
937
 
    parser.add_option("--no-dbus", action="store_false",
938
 
                      dest="use_dbus",
939
 
                      help="Do not provide D-Bus system bus"
940
 
                      " interface")
941
 
    parser.add_option("--no-ipv6", action="store_false",
942
 
                      dest="use_ipv6", help="Do not use IPv6")
943
708
    options = parser.parse_args()[0]
944
709
    
945
710
    if options.check:
955
720
                        "priority":
956
721
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
957
722
                        "servicename": "Mandos",
958
 
                        "use_dbus": "True",
959
 
                        "use_ipv6": "True",
960
723
                        }
961
724
    
962
725
    # Parse config file for server-global settings
965
728
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
966
729
    # Convert the SafeConfigParser object to a dict
967
730
    server_settings = server_config.defaults()
968
 
    # Use the appropriate methods on the non-string config options
969
 
    server_settings["debug"] = server_config.getboolean("DEFAULT",
970
 
                                                        "debug")
971
 
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
972
 
                                                           "use_dbus")
973
 
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
974
 
                                                           "use_ipv6")
975
 
    if server_settings["port"]:
976
 
        server_settings["port"] = server_config.getint("DEFAULT",
977
 
                                                       "port")
 
731
    # Use getboolean on the boolean config option
 
732
    server_settings["debug"] = server_config.getboolean\
 
733
                               ("DEFAULT", "debug")
978
734
    del server_config
979
735
    
980
736
    # Override the settings from the config file with command line
981
737
    # options, if set.
982
738
    for option in ("interface", "address", "port", "debug",
983
 
                   "priority", "servicename", "configdir",
984
 
                   "use_dbus", "use_ipv6"):
 
739
                   "priority", "servicename", "configdir"):
985
740
        value = getattr(options, option)
986
741
        if value is not None:
987
742
            server_settings[option] = value
988
743
    del options
989
744
    # Now we have our good server settings in "server_settings"
990
745
    
991
 
    # For convenience
992
746
    debug = server_settings["debug"]
993
 
    use_dbus = server_settings["use_dbus"]
994
 
    use_ipv6 = server_settings["use_ipv6"]
995
747
    
996
748
    if not debug:
997
749
        syslogger.setLevel(logging.WARNING)
998
750
        console.setLevel(logging.WARNING)
999
751
    
1000
752
    if server_settings["servicename"] != "Mandos":
1001
 
        syslogger.setFormatter(logging.Formatter
 
753
        syslogger.setFormatter(logging.Formatter\
1002
754
                               ('Mandos (%s): %%(levelname)s:'
1003
755
                                ' %%(message)s'
1004
756
                                % server_settings["servicename"]))
1006
758
    # Parse config file with clients
1007
759
    client_defaults = { "timeout": "1h",
1008
760
                        "interval": "5m",
1009
 
                        "checker": "fping -q -- %%(host)s",
 
761
                        "checker": "fping -q -- %(host)s",
1010
762
                        "host": "",
1011
763
                        }
1012
764
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1018
770
                                 server_settings["port"]),
1019
771
                                TCP_handler,
1020
772
                                settings=server_settings,
1021
 
                                clients=clients, use_ipv6=use_ipv6)
 
773
                                clients=clients)
1022
774
    pidfilename = "/var/run/mandos.pid"
1023
775
    try:
1024
776
        pidfile = open(pidfilename, "w")
1025
 
    except IOError:
 
777
    except IOError, error:
1026
778
        logger.error("Could not open file %r", pidfilename)
1027
779
    
1028
 
    try:
1029
 
        uid = pwd.getpwnam("_mandos").pw_uid
1030
 
        gid = pwd.getpwnam("_mandos").pw_gid
1031
 
    except KeyError:
1032
 
        try:
1033
 
            uid = pwd.getpwnam("mandos").pw_uid
1034
 
            gid = pwd.getpwnam("mandos").pw_gid
1035
 
        except KeyError:
1036
 
            try:
1037
 
                uid = pwd.getpwnam("nobody").pw_uid
1038
 
                gid = pwd.getpwnam("nogroup").pw_gid
1039
 
            except KeyError:
1040
 
                uid = 65534
1041
 
                gid = 65534
1042
 
    try:
 
780
    uid = 65534
 
781
    gid = 65534
 
782
    try:
 
783
        uid = pwd.getpwnam("mandos").pw_uid
 
784
    except KeyError:
 
785
        try:
 
786
            uid = pwd.getpwnam("nobody").pw_uid
 
787
        except KeyError:
 
788
            pass
 
789
    try:
 
790
        gid = pwd.getpwnam("mandos").pw_gid
 
791
    except KeyError:
 
792
        try:
 
793
            gid = pwd.getpwnam("nogroup").pw_gid
 
794
        except KeyError:
 
795
            pass
 
796
    try:
 
797
        os.setuid(uid)
1043
798
        os.setgid(gid)
1044
 
        os.setuid(uid)
1045
799
    except OSError, error:
1046
800
        if error[0] != errno.EPERM:
1047
801
            raise error
1048
802
    
1049
 
    # Enable all possible GnuTLS debugging
1050
 
    if debug:
1051
 
        # "Use a log level over 10 to enable all debugging options."
1052
 
        # - GnuTLS manual
1053
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
1054
 
        
1055
 
        @gnutls.library.types.gnutls_log_func
1056
 
        def debug_gnutls(level, string):
1057
 
            logger.debug("GnuTLS: %s", string[:-1])
1058
 
        
1059
 
        (gnutls.library.functions
1060
 
         .gnutls_global_set_log_function(debug_gnutls))
1061
 
    
1062
803
    global service
1063
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1064
804
    service = AvahiService(name = server_settings["servicename"],
1065
 
                           servicetype = "_mandos._tcp",
1066
 
                           protocol = protocol)
 
805
                           servicetype = "_mandos._tcp", )
1067
806
    if server_settings["interface"]:
1068
 
        service.interface = (if_nametoindex
1069
 
                             (server_settings["interface"]))
 
807
        service.interface = if_nametoindex\
 
808
                            (server_settings["interface"])
1070
809
    
1071
810
    global main_loop
1072
811
    global bus
1079
818
                                           avahi.DBUS_PATH_SERVER),
1080
819
                            avahi.DBUS_INTERFACE_SERVER)
1081
820
    # End of Avahi example code
1082
 
    if use_dbus:
1083
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
821
    
 
822
    def remove_from_clients(client):
 
823
        clients.remove(client)
 
824
        if not clients:
 
825
            logger.critical(u"No clients left, exiting")
 
826
            sys.exit()
1084
827
    
1085
828
    clients.update(Set(Client(name = section,
 
829
                              stop_hook = remove_from_clients,
1086
830
                              config
1087
 
                              = dict(client_config.items(section)),
1088
 
                              use_dbus = use_dbus)
 
831
                              = dict(client_config.items(section)))
1089
832
                       for section in client_config.sections()))
1090
833
    if not clients:
1091
 
        logger.warning(u"No clients defined")
 
834
        logger.critical(u"No clients defined")
 
835
        sys.exit(1)
1092
836
    
1093
837
    if debug:
1094
838
        # Redirect stdin so all checkers get /dev/null
1126
870
        
1127
871
        while clients:
1128
872
            client = clients.pop()
1129
 
            client.disable_hook = None
1130
 
            client.disable()
 
873
            client.stop_hook = None
 
874
            client.stop()
1131
875
    
1132
876
    atexit.register(cleanup)
1133
877
    
1136
880
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1137
881
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1138
882
    
1139
 
    if use_dbus:
1140
 
        class MandosServer(dbus.service.Object):
1141
 
            """A D-Bus proxy object"""
1142
 
            def __init__(self):
1143
 
                dbus.service.Object.__init__(self, bus, "/")
1144
 
            _interface = u"se.bsnet.fukt.Mandos"
1145
 
            
1146
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1147
 
            def ClientAdded(self, objpath, properties):
1148
 
                "D-Bus signal"
1149
 
                pass
1150
 
            
1151
 
            @dbus.service.signal(_interface, signature="os")
1152
 
            def ClientRemoved(self, objpath, name):
1153
 
                "D-Bus signal"
1154
 
                pass
1155
 
            
1156
 
            @dbus.service.method(_interface, out_signature="ao")
1157
 
            def GetAllClients(self):
1158
 
                "D-Bus method"
1159
 
                return dbus.Array(c.dbus_object_path for c in clients)
1160
 
            
1161
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1162
 
            def GetAllClientsWithProperties(self):
1163
 
                "D-Bus method"
1164
 
                return dbus.Dictionary(
1165
 
                    ((c.dbus_object_path, c.GetAllProperties())
1166
 
                     for c in clients),
1167
 
                    signature="oa{sv}")
1168
 
            
1169
 
            @dbus.service.method(_interface, in_signature="o")
1170
 
            def RemoveClient(self, object_path):
1171
 
                "D-Bus method"
1172
 
                for c in clients:
1173
 
                    if c.dbus_object_path == object_path:
1174
 
                        clients.remove(c)
1175
 
                        # Don't signal anything except ClientRemoved
1176
 
                        c.use_dbus = False
1177
 
                        c.disable()
1178
 
                        # Emit D-Bus signal
1179
 
                        self.ClientRemoved(object_path, c.name)
1180
 
                        return
1181
 
                raise KeyError
1182
 
            
1183
 
            del _interface
1184
 
        
1185
 
        mandos_server = MandosServer()
1186
 
    
1187
883
    for client in clients:
1188
 
        if use_dbus:
1189
 
            # Emit D-Bus signal
1190
 
            mandos_server.ClientAdded(client.dbus_object_path,
1191
 
                                      client.GetAllProperties())
1192
 
        client.enable()
 
884
        client.start()
1193
885
    
1194
886
    tcp_server.enable()
1195
887
    tcp_server.server_activate()
1196
888
    
1197
889
    # Find out what port we got
1198
890
    service.port = tcp_server.socket.getsockname()[1]
1199
 
    if use_ipv6:
1200
 
        logger.info(u"Now listening on address %r, port %d,"
1201
 
                    " flowinfo %d, scope_id %d"
1202
 
                    % tcp_server.socket.getsockname())
1203
 
    else:                       # IPv4
1204
 
        logger.info(u"Now listening on address %r, port %d"
1205
 
                    % tcp_server.socket.getsockname())
 
891
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
892
                u" scope_id %d" % tcp_server.socket.getsockname())
1206
893
    
1207
894
    #service.interface = tcp_server.socket.getsockname()[3]
1208
895
    
1218
905
        
1219
906
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1220
907
                             lambda *args, **kwargs:
1221
 
                             (tcp_server.handle_request
1222
 
                              (*args[2:], **kwargs) or True))
 
908
                             tcp_server.handle_request\
 
909
                             (*args[2:], **kwargs) or True)
1223
910
        
1224
911
        logger.debug(u"Starting main loop")
1225
912
        main_loop.run()
1226
913
    except AvahiError, error:
1227
 
        logger.critical(u"AvahiError: %s", error)
 
914
        logger.critical(u"AvahiError: %s" + unicode(error))
1228
915
        sys.exit(1)
1229
916
    except KeyboardInterrupt:
1230
917
        if debug:
1231
 
            print >> sys.stderr
1232
 
        logger.debug("Server received KeyboardInterrupt")
1233
 
    logger.debug("Server exiting")
 
918
            print
1234
919
 
1235
920
if __name__ == '__main__':
1236
921
    main()