/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

* plugin-runner.c: Whitespace changes only.

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