/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-09-12 19:12:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080912191240-edjlcll43eoijkx0
* Makefile (install): Use "install-client-nokey".
  (install-server): Create "/etc/default" and "/usr/sbin", too.
  (install-client): Do not depend on "$(INITRAMFSTOOLS)/hooks/.".
                    Renamed to "install-client-nokey".  Split out
                    post-installation-stuff to new "install-client"
                    target.

* mandos-clients.conf.xml: White space adjustments.
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -

* overview.xml: Improved grammar.

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
 
            and (os.WEXITSTATUS(condition) == 0)):
 
299
        if os.WIFEXITED(condition) \
 
300
               and (os.WEXITSTATUS(condition) == 0):
329
301
            logger.info(u"Checker for %(name)s succeeded",
330
302
                        vars(self))
331
 
            if self.use_dbus:
332
 
                # Emit D-Bus signal
333
 
                self.CheckerCompleted(dbus.Boolean(True),
334
 
                                      dbus.UInt16(condition),
335
 
                                      dbus.String(command))
336
 
            self.bump_timeout()
 
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)
337
308
        elif not os.WIFEXITED(condition):
338
309
            logger.warning(u"Checker for %(name)s crashed?",
339
310
                           vars(self))
340
 
            if self.use_dbus:
341
 
                # Emit D-Bus signal
342
 
                self.CheckerCompleted(dbus.Boolean(False),
343
 
                                      dbus.UInt16(condition),
344
 
                                      dbus.String(command))
345
311
        else:
346
312
            logger.info(u"Checker for %(name)s failed",
347
313
                        vars(self))
348
 
            if self.use_dbus:
349
 
                # Emit D-Bus signal
350
 
                self.CheckerCompleted(dbus.Boolean(False),
351
 
                                      dbus.UInt16(condition),
352
 
                                      dbus.String(command))
353
 
    
354
 
    def bump_timeout(self):
355
 
        """Bump up the timeout for this client.
356
 
        This should only be called when the client has been seen,
357
 
        alive and well.
358
 
        """
359
 
        self.last_checked_ok = datetime.datetime.utcnow()
360
 
        gobject.source_remove(self.disable_initiator_tag)
361
 
        self.disable_initiator_tag = (gobject.timeout_add
362
 
                                      (self.timeout_milliseconds(),
363
 
                                       self.disable))
364
 
        if self.use_dbus:
365
 
            # Emit D-Bus signal
366
 
            self.PropertyChanged(
367
 
                dbus.String(u"last_checked_ok"),
368
 
                (_datetime_to_dbus(self.last_checked_ok,
369
 
                                   variant_level=1)))
370
 
    
371
314
    def start_checker(self):
372
315
        """Start a new checker subprocess if one is not running.
373
316
        If a checker already exists, leave it running and do
382
325
        # is as it should be.
383
326
        if self.checker is None:
384
327
            try:
385
 
                # In case checker_command has exactly one % operator
386
 
                command = self.checker_command % self.host
 
328
                # In case check_command has exactly one % operator
 
329
                command = self.check_command % self.host
387
330
            except TypeError:
388
331
                # Escape attributes for the shell
389
332
                escaped_attrs = dict((key, re.escape(str(val)))
390
333
                                     for key, val in
391
334
                                     vars(self).iteritems())
392
335
                try:
393
 
                    command = self.checker_command % escaped_attrs
 
336
                    command = self.check_command % escaped_attrs
394
337
                except TypeError, error:
395
338
                    logger.error(u'Could not format string "%s":'
396
 
                                 u' %s', self.checker_command, error)
 
339
                                 u' %s', self.check_command, error)
397
340
                    return True # Try again later
398
341
            try:
399
342
                logger.info(u"Starting checker %r for %s",
405
348
                self.checker = subprocess.Popen(command,
406
349
                                                close_fds=True,
407
350
                                                shell=True, cwd="/")
408
 
                if self.use_dbus:
409
 
                    # Emit D-Bus signal
410
 
                    self.CheckerStarted(command)
411
 
                    self.PropertyChanged(
412
 
                        dbus.String("checker_running"),
413
 
                        dbus.Boolean(True, variant_level=1))
414
 
                self.checker_callback_tag = (gobject.child_watch_add
415
 
                                             (self.checker.pid,
416
 
                                              self.checker_callback,
417
 
                                              data=command))
 
351
                self.checker_callback_tag = gobject.child_watch_add\
 
352
                                            (self.checker.pid,
 
353
                                             self.checker_callback)
418
354
            except OSError, error:
419
355
                logger.error(u"Failed to start subprocess: %s",
420
356
                             error)
421
357
        # Re-run this periodically if run by gobject.timeout_add
422
358
        return True
423
 
    
424
359
    def stop_checker(self):
425
360
        """Force the checker process, if any, to stop."""
426
361
        if self.checker_callback_tag:
438
373
            if error.errno != errno.ESRCH: # No such process
439
374
                raise
440
375
        self.checker = None
441
 
        if self.use_dbus:
442
 
            self.PropertyChanged(dbus.String(u"checker_running"),
443
 
                                 dbus.Boolean(False, variant_level=1))
444
 
    
445
376
    def still_valid(self):
446
377
        """Has the timeout not yet passed for this client?"""
447
 
        if not getattr(self, "enabled", False):
448
 
            return False
449
 
        now = datetime.datetime.utcnow()
 
378
        now = datetime.datetime.now()
450
379
        if self.last_checked_ok is None:
451
380
            return now < (self.created + self.timeout)
452
381
        else:
453
382
            return now < (self.last_checked_ok + self.timeout)
454
 
    
455
 
    ## D-Bus methods & signals
456
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
457
 
    
458
 
    # BumpTimeout - method
459
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
460
 
    BumpTimeout.__name__ = "BumpTimeout"
461
 
    
462
 
    # CheckerCompleted - signal
463
 
    @dbus.service.signal(_interface, signature="bqs")
464
 
    def CheckerCompleted(self, success, condition, command):
465
 
        "D-Bus signal"
466
 
        pass
467
 
    
468
 
    # CheckerStarted - signal
469
 
    @dbus.service.signal(_interface, signature="s")
470
 
    def CheckerStarted(self, command):
471
 
        "D-Bus signal"
472
 
        pass
473
 
    
474
 
    # GetAllProperties - method
475
 
    @dbus.service.method(_interface, out_signature="a{sv}")
476
 
    def GetAllProperties(self):
477
 
        "D-Bus method"
478
 
        return dbus.Dictionary({
479
 
                dbus.String("name"):
480
 
                    dbus.String(self.name, variant_level=1),
481
 
                dbus.String("fingerprint"):
482
 
                    dbus.String(self.fingerprint, variant_level=1),
483
 
                dbus.String("host"):
484
 
                    dbus.String(self.host, variant_level=1),
485
 
                dbus.String("created"):
486
 
                    _datetime_to_dbus(self.created, variant_level=1),
487
 
                dbus.String("last_enabled"):
488
 
                    (_datetime_to_dbus(self.last_enabled,
489
 
                                       variant_level=1)
490
 
                     if self.last_enabled is not None
491
 
                     else dbus.Boolean(False, variant_level=1)),
492
 
                dbus.String("enabled"):
493
 
                    dbus.Boolean(self.enabled, variant_level=1),
494
 
                dbus.String("last_checked_ok"):
495
 
                    (_datetime_to_dbus(self.last_checked_ok,
496
 
                                       variant_level=1)
497
 
                     if self.last_checked_ok is not None
498
 
                     else dbus.Boolean (False, variant_level=1)),
499
 
                dbus.String("timeout"):
500
 
                    dbus.UInt64(self.timeout_milliseconds(),
501
 
                                variant_level=1),
502
 
                dbus.String("interval"):
503
 
                    dbus.UInt64(self.interval_milliseconds(),
504
 
                                variant_level=1),
505
 
                dbus.String("checker"):
506
 
                    dbus.String(self.checker_command,
507
 
                                variant_level=1),
508
 
                dbus.String("checker_running"):
509
 
                    dbus.Boolean(self.checker is not None,
510
 
                                 variant_level=1),
511
 
                dbus.String("object_path"):
512
 
                    dbus.ObjectPath(self.dbus_object_path,
513
 
                                    variant_level=1)
514
 
                }, signature="sv")
515
 
    
516
 
    # IsStillValid - method
517
 
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
518
 
                    (still_valid))
519
 
    IsStillValid.__name__ = "IsStillValid"
520
 
    
521
 
    # PropertyChanged - signal
522
 
    @dbus.service.signal(_interface, signature="sv")
523
 
    def PropertyChanged(self, property, value):
524
 
        "D-Bus signal"
525
 
        pass
526
 
    
527
 
    # SetChecker - method
528
 
    @dbus.service.method(_interface, in_signature="s")
529
 
    def SetChecker(self, checker):
530
 
        "D-Bus setter method"
531
 
        self.checker_command = checker
532
 
        # Emit D-Bus signal
533
 
        self.PropertyChanged(dbus.String(u"checker"),
534
 
                             dbus.String(self.checker_command,
535
 
                                         variant_level=1))
536
 
    
537
 
    # SetHost - method
538
 
    @dbus.service.method(_interface, in_signature="s")
539
 
    def SetHost(self, host):
540
 
        "D-Bus setter method"
541
 
        self.host = host
542
 
        # Emit D-Bus signal
543
 
        self.PropertyChanged(dbus.String(u"host"),
544
 
                             dbus.String(self.host, variant_level=1))
545
 
    
546
 
    # SetInterval - method
547
 
    @dbus.service.method(_interface, in_signature="t")
548
 
    def SetInterval(self, milliseconds):
549
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
550
 
        # Emit D-Bus signal
551
 
        self.PropertyChanged(dbus.String(u"interval"),
552
 
                             (dbus.UInt64(self.interval_milliseconds(),
553
 
                                          variant_level=1)))
554
 
    
555
 
    # SetSecret - method
556
 
    @dbus.service.method(_interface, in_signature="ay",
557
 
                         byte_arrays=True)
558
 
    def SetSecret(self, secret):
559
 
        "D-Bus setter method"
560
 
        self.secret = str(secret)
561
 
    
562
 
    # SetTimeout - method
563
 
    @dbus.service.method(_interface, in_signature="t")
564
 
    def SetTimeout(self, milliseconds):
565
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
566
 
        # Emit D-Bus signal
567
 
        self.PropertyChanged(dbus.String(u"timeout"),
568
 
                             (dbus.UInt64(self.timeout_milliseconds(),
569
 
                                          variant_level=1)))
570
 
    
571
 
    # Enable - method
572
 
    Enable = dbus.service.method(_interface)(enable)
573
 
    Enable.__name__ = "Enable"
574
 
    
575
 
    # StartChecker - method
576
 
    @dbus.service.method(_interface)
577
 
    def StartChecker(self):
578
 
        "D-Bus method"
579
 
        self.start_checker()
580
 
    
581
 
    # Disable - method
582
 
    @dbus.service.method(_interface)
583
 
    def Disable(self):
584
 
        "D-Bus method"
585
 
        self.disable()
586
 
    
587
 
    # StopChecker - method
588
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
589
 
    StopChecker.__name__ = "StopChecker"
590
 
    
591
 
    del _interface
592
383
 
593
384
 
594
385
def peer_certificate(session):
595
386
    "Return the peer's OpenPGP certificate as a bytestring"
596
387
    # If not an OpenPGP certificate...
597
 
    if (gnutls.library.functions
598
 
        .gnutls_certificate_type_get(session._c_object)
599
 
        != 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:
600
391
        # ...do the normal thing
601
392
        return session.peer_certificate
602
393
    list_size = ctypes.c_uint()
603
 
    cert_list = (gnutls.library.functions
604
 
                 .gnutls_certificate_get_peers
605
 
                 (session._c_object, ctypes.byref(list_size)))
 
394
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
395
        (session._c_object, ctypes.byref(list_size))
606
396
    if list_size.value == 0:
607
397
        return None
608
398
    cert = cert_list[0]
612
402
def fingerprint(openpgp):
613
403
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
614
404
    # New GnuTLS "datum" with the OpenPGP public key
615
 
    datum = (gnutls.library.types
616
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
617
 
                                         ctypes.POINTER
618
 
                                         (ctypes.c_ubyte)),
619
 
                             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)))
620
409
    # New empty GnuTLS certificate
621
410
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
622
 
    (gnutls.library.functions
623
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
411
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
412
        (ctypes.byref(crt))
624
413
    # Import the OpenPGP public key into the certificate
625
 
    (gnutls.library.functions
626
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
627
 
                                gnutls.library.constants
628
 
                                .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)
629
417
    # Verify the self signature in the key
630
 
    crtverify = ctypes.c_uint()
631
 
    (gnutls.library.functions
632
 
     .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))
633
421
    if crtverify.value != 0:
634
422
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
635
423
        raise gnutls.errors.CertificateSecurityError("Verify failed")
636
424
    # New buffer for the fingerprint
637
 
    buf = ctypes.create_string_buffer(20)
638
 
    buf_len = ctypes.c_size_t()
 
425
    buffer = ctypes.create_string_buffer(20)
 
426
    buffer_length = ctypes.c_size_t()
639
427
    # Get the fingerprint from the certificate into the buffer
640
 
    (gnutls.library.functions
641
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
642
 
                                         ctypes.byref(buf_len)))
 
428
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
429
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
643
430
    # Deinit the certificate
644
431
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
645
432
    # Convert the buffer to a Python bytestring
646
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
433
    fpr = ctypes.string_at(buffer, buffer_length.value)
647
434
    # Convert the bytestring to hexadecimal notation
648
435
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
649
436
    return hex_fpr
650
437
 
651
438
 
652
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
439
class tcp_handler(SocketServer.BaseRequestHandler, object):
653
440
    """A TCP request handler class.
654
441
    Instantiated by IPv6_TCPServer for each request to handle it.
655
442
    Note: This will run in its own forked process."""
656
443
    
657
444
    def handle(self):
658
445
        logger.info(u"TCP connection from: %s",
659
 
                    unicode(self.client_address))
660
 
        session = (gnutls.connection
661
 
                   .ClientSession(self.request,
662
 
                                  gnutls.connection
663
 
                                  .X509Credentials()))
 
446
                     unicode(self.client_address))
 
447
        session = gnutls.connection.ClientSession\
 
448
                  (self.request, gnutls.connection.X509Credentials())
664
449
        
665
450
        line = self.request.makefile().readline()
666
451
        logger.debug(u"Protocol version: %r", line)
679
464
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
680
465
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
681
466
        #                "+DHE-DSS"))
682
 
        # Use a fallback default, since this MUST be set.
683
 
        priority = self.server.settings.get("priority", "NORMAL")
684
 
        (gnutls.library.functions
685
 
         .gnutls_priority_set_direct(session._c_object,
686
 
                                     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);
687
473
        
688
474
        try:
689
475
            session.handshake()
699
485
            session.bye()
700
486
            return
701
487
        logger.debug(u"Fingerprint: %s", fpr)
 
488
        client = None
702
489
        for c in self.server.clients:
703
490
            if c.fingerprint == fpr:
704
491
                client = c
705
492
                break
706
 
        else:
 
493
        if not client:
707
494
            logger.warning(u"Client not found for fingerprint: %s",
708
495
                           fpr)
709
496
            session.bye()
716
503
                           vars(client))
717
504
            session.bye()
718
505
            return
719
 
        ## This won't work here, since we're in a fork.
720
 
        # client.bump_timeout()
721
506
        sent_size = 0
722
507
        while sent_size < len(client.secret):
723
508
            sent = session.send(client.secret[sent_size:])
728
513
        session.bye()
729
514
 
730
515
 
731
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
732
 
                     SocketServer.TCPServer, object):
 
516
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
733
517
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
734
518
    Attributes:
735
519
        settings:       Server settings
745
529
            self.clients = kwargs["clients"]
746
530
            del kwargs["clients"]
747
531
        self.enabled = False
748
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
532
        return super(type(self), self).__init__(*args, **kwargs)
749
533
    def server_bind(self):
750
534
        """This overrides the normal server_bind() function
751
535
        to bind to an interface if one was specified, and also NOT to
780
564
#                                            if_nametoindex
781
565
#                                            (self.settings
782
566
#                                             ["interface"]))
783
 
            return super(IPv6_TCPServer, self).server_bind()
 
567
            return super(type(self), self).server_bind()
784
568
    def server_activate(self):
785
569
        if self.enabled:
786
 
            return super(IPv6_TCPServer, self).server_activate()
 
570
            return super(type(self), self).server_activate()
787
571
    def enable(self):
788
572
        self.enabled = True
789
573
 
807
591
    timevalue = datetime.timedelta(0)
808
592
    for s in interval.split():
809
593
        try:
810
 
            suffix = unicode(s[-1])
811
 
            value = int(s[:-1])
 
594
            suffix=unicode(s[-1])
 
595
            value=int(s[:-1])
812
596
            if suffix == u"d":
813
597
                delta = datetime.timedelta(value)
814
598
            elif suffix == u"s":
848
632
    elif state == avahi.ENTRY_GROUP_FAILURE:
849
633
        logger.critical(u"Avahi: Error in group state changed %s",
850
634
                        unicode(error))
851
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
635
        raise AvahiGroupError("State changed: %s", str(error))
852
636
 
853
637
def if_nametoindex(interface):
854
638
    """Call the C function if_nametoindex(), or equivalent"""
855
639
    global if_nametoindex
856
640
    try:
857
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
858
 
                          (ctypes.util.find_library("c"))
859
 
                          .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
860
645
    except (OSError, AttributeError):
861
646
        if "struct" not in sys.modules:
862
647
            import struct
865
650
        def if_nametoindex(interface):
866
651
            "Get an interface index the hard way, i.e. using fcntl()"
867
652
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
868
 
            with closing(socket.socket()) as s:
869
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
870
 
                                    struct.pack("16s16x", interface))
 
653
            s = socket.socket()
 
654
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
655
                                struct.pack("16s16x", interface))
 
656
            s.close()
871
657
            interface_index = struct.unpack("I", ifreq[16:20])[0]
872
658
            return interface_index
873
659
    return if_nametoindex(interface)
897
683
 
898
684
 
899
685
def main():
900
 
    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)
901
690
    parser.add_option("-i", "--interface", type="string",
902
691
                      metavar="IF", help="Bind to interface IF")
903
692
    parser.add_option("-a", "--address", type="string",
904
693
                      help="Address to listen for requests on")
905
694
    parser.add_option("-p", "--port", type="int",
906
695
                      help="Port number to receive requests on")
907
 
    parser.add_option("--check", action="store_true",
 
696
    parser.add_option("--check", action="store_true", default=False,
908
697
                      help="Run self-test")
909
698
    parser.add_option("--debug", action="store_true",
910
699
                      help="Debug mode; run in foreground and log to"
917
706
                      default="/etc/mandos", metavar="DIR",
918
707
                      help="Directory to search for configuration"
919
708
                      " files")
920
 
    parser.add_option("--no-dbus", action="store_false",
921
 
                      dest="use_dbus",
922
 
                      help="Do not provide D-Bus system bus"
923
 
                      " interface")
924
 
    options = parser.parse_args()[0]
 
709
    (options, args) = parser.parse_args()
925
710
    
926
711
    if options.check:
927
712
        import doctest
936
721
                        "priority":
937
722
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
938
723
                        "servicename": "Mandos",
939
 
                        "use_dbus": "True",
940
724
                        }
941
725
    
942
726
    # Parse config file for server-global settings
945
729
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
946
730
    # Convert the SafeConfigParser object to a dict
947
731
    server_settings = server_config.defaults()
948
 
    # Use getboolean on the boolean config options
949
 
    server_settings["debug"] = (server_config.getboolean
950
 
                                ("DEFAULT", "debug"))
951
 
    server_settings["use_dbus"] = (server_config.getboolean
952
 
                                   ("DEFAULT", "use_dbus"))
 
732
    # Use getboolean on the boolean config option
 
733
    server_settings["debug"] = server_config.getboolean\
 
734
                               ("DEFAULT", "debug")
953
735
    del server_config
954
736
    
955
737
    # Override the settings from the config file with command line
956
738
    # options, if set.
957
739
    for option in ("interface", "address", "port", "debug",
958
 
                   "priority", "servicename", "configdir",
959
 
                   "use_dbus"):
 
740
                   "priority", "servicename", "configdir"):
960
741
        value = getattr(options, option)
961
742
        if value is not None:
962
743
            server_settings[option] = value
963
744
    del options
964
745
    # Now we have our good server settings in "server_settings"
965
746
    
966
 
    # For convenience
967
747
    debug = server_settings["debug"]
968
 
    use_dbus = server_settings["use_dbus"]
969
748
    
970
749
    if not debug:
971
750
        syslogger.setLevel(logging.WARNING)
972
751
        console.setLevel(logging.WARNING)
973
752
    
974
753
    if server_settings["servicename"] != "Mandos":
975
 
        syslogger.setFormatter(logging.Formatter
 
754
        syslogger.setFormatter(logging.Formatter\
976
755
                               ('Mandos (%s): %%(levelname)s:'
977
756
                                ' %%(message)s'
978
757
                                % server_settings["servicename"]))
980
759
    # Parse config file with clients
981
760
    client_defaults = { "timeout": "1h",
982
761
                        "interval": "5m",
983
 
                        "checker": "fping -q -- %%(host)s",
 
762
                        "checker": "fping -q -- %(host)s",
984
763
                        "host": "",
985
764
                        }
986
765
    client_config = ConfigParser.SafeConfigParser(client_defaults)
990
769
    clients = Set()
991
770
    tcp_server = IPv6_TCPServer((server_settings["address"],
992
771
                                 server_settings["port"]),
993
 
                                TCP_handler,
 
772
                                tcp_handler,
994
773
                                settings=server_settings,
995
774
                                clients=clients)
996
775
    pidfilename = "/var/run/mandos.pid"
999
778
    except IOError, error:
1000
779
        logger.error("Could not open file %r", pidfilename)
1001
780
    
1002
 
    try:
1003
 
        uid = pwd.getpwnam("_mandos").pw_uid
1004
 
        gid = pwd.getpwnam("_mandos").pw_gid
1005
 
    except KeyError:
1006
 
        try:
1007
 
            uid = pwd.getpwnam("mandos").pw_uid
1008
 
            gid = pwd.getpwnam("mandos").pw_gid
1009
 
        except KeyError:
1010
 
            try:
1011
 
                uid = pwd.getpwnam("nobody").pw_uid
1012
 
                gid = pwd.getpwnam("nogroup").pw_gid
1013
 
            except KeyError:
1014
 
                uid = 65534
1015
 
                gid = 65534
 
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
1016
797
    try:
1017
798
        os.setuid(uid)
1018
799
        os.setgid(gid)
1022
803
    
1023
804
    global service
1024
805
    service = AvahiService(name = server_settings["servicename"],
1025
 
                           servicetype = "_mandos._tcp", )
 
806
                           type = "_mandos._tcp", );
1026
807
    if server_settings["interface"]:
1027
 
        service.interface = (if_nametoindex
1028
 
                             (server_settings["interface"]))
 
808
        service.interface = if_nametoindex\
 
809
                            (server_settings["interface"])
1029
810
    
1030
811
    global main_loop
1031
812
    global bus
1038
819
                                           avahi.DBUS_PATH_SERVER),
1039
820
                            avahi.DBUS_INTERFACE_SERVER)
1040
821
    # End of Avahi example code
1041
 
    if use_dbus:
1042
 
        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()
1043
828
    
1044
829
    clients.update(Set(Client(name = section,
 
830
                              stop_hook = remove_from_clients,
1045
831
                              config
1046
 
                              = dict(client_config.items(section)),
1047
 
                              use_dbus = use_dbus)
 
832
                              = dict(client_config.items(section)))
1048
833
                       for section in client_config.sections()))
1049
834
    if not clients:
1050
 
        logger.warning(u"No clients defined")
 
835
        logger.critical(u"No clients defined")
 
836
        sys.exit(1)
1051
837
    
1052
838
    if debug:
1053
839
        # Redirect stdin so all checkers get /dev/null
1066
852
        pidfile.write(str(pid) + "\n")
1067
853
        pidfile.close()
1068
854
        del pidfile
1069
 
    except IOError:
 
855
    except IOError, err:
1070
856
        logger.error(u"Could not write to file %r with PID %d",
1071
857
                     pidfilename, pid)
1072
858
    except NameError:
1085
871
        
1086
872
        while clients:
1087
873
            client = clients.pop()
1088
 
            client.disable_hook = None
1089
 
            client.disable()
 
874
            client.stop_hook = None
 
875
            client.stop()
1090
876
    
1091
877
    atexit.register(cleanup)
1092
878
    
1095
881
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1096
882
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1097
883
    
1098
 
    if use_dbus:
1099
 
        class MandosServer(dbus.service.Object):
1100
 
            """A D-Bus proxy object"""
1101
 
            def __init__(self):
1102
 
                dbus.service.Object.__init__(self, bus, "/")
1103
 
            _interface = u"se.bsnet.fukt.Mandos"
1104
 
            
1105
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1106
 
            def ClientAdded(self, objpath, properties):
1107
 
                "D-Bus signal"
1108
 
                pass
1109
 
            
1110
 
            @dbus.service.signal(_interface, signature="os")
1111
 
            def ClientRemoved(self, objpath, name):
1112
 
                "D-Bus signal"
1113
 
                pass
1114
 
            
1115
 
            @dbus.service.method(_interface, out_signature="ao")
1116
 
            def GetAllClients(self):
1117
 
                return dbus.Array(c.dbus_object_path for c in clients)
1118
 
            
1119
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1120
 
            def GetAllClientsWithProperties(self):
1121
 
                return dbus.Dictionary(
1122
 
                    ((c.dbus_object_path, c.GetAllProperties())
1123
 
                     for c in clients),
1124
 
                    signature="oa{sv}")
1125
 
            
1126
 
            @dbus.service.method(_interface, in_signature="o")
1127
 
            def RemoveClient(self, object_path):
1128
 
                for c in clients:
1129
 
                    if c.dbus_object_path == object_path:
1130
 
                        clients.remove(c)
1131
 
                        # Don't signal anything except ClientRemoved
1132
 
                        c.use_dbus = False
1133
 
                        c.disable()
1134
 
                        # Emit D-Bus signal
1135
 
                        self.ClientRemoved(object_path, c.name)
1136
 
                        return
1137
 
                raise KeyError
1138
 
            
1139
 
            del _interface
1140
 
        
1141
 
        mandos_server = MandosServer()
1142
 
    
1143
884
    for client in clients:
1144
 
        if use_dbus:
1145
 
            # Emit D-Bus signal
1146
 
            mandos_server.ClientAdded(client.dbus_object_path,
1147
 
                                      client.GetAllProperties())
1148
 
        client.enable()
 
885
        client.start()
1149
886
    
1150
887
    tcp_server.enable()
1151
888
    tcp_server.server_activate()
1169
906
        
1170
907
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1171
908
                             lambda *args, **kwargs:
1172
 
                             (tcp_server.handle_request
1173
 
                              (*args[2:], **kwargs) or True))
 
909
                             tcp_server.handle_request\
 
910
                             (*args[2:], **kwargs) or True)
1174
911
        
1175
912
        logger.debug(u"Starting main loop")
 
913
        main_loop_started = True
1176
914
        main_loop.run()
1177
915
    except AvahiError, error:
1178
 
        logger.critical(u"AvahiError: %s", error)
 
916
        logger.critical(u"AvahiError: %s" + unicode(error))
1179
917
        sys.exit(1)
1180
918
    except KeyboardInterrupt:
1181
919
        if debug: