/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-09-19 17:30:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080919173043-oar4cbayx4ow122x
* debian/control (mandos, mandos-client): Depend on "adduser".
  (mandos): Removed unused substitution variables.

* debian/mandos-client.postinst (update_initramfs, create_key): Do not
                                                                use
                                                                "type".
  (add_mandos_user): Do not call the user "Mandos password daemon".

* debian/mandos.postinst (add_mandos_user): - '' -

* debian/mandos-client.postrm (purge): Do not use "type".  Do not
                                       remove config directories; this
                                       is done automatically.

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