/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-12 19:22:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080812192234-8bm17713ltih9ud1
* initramfs-tools-hook: New.
* initramfs-tools-hook-conf: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008 Teddy Hogeborn
15
 
# Copyright © 2008 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
25
24
#     GNU General Public License for more details.
26
25
27
26
# You should have received a copy of the GNU General Public License
28
 
# along with this program.  If not, see
29
 
# <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
28
31
29
# Contact the authors at <mandos@fukt.bsnet.se>.
32
30
33
31
 
34
 
from __future__ import division, with_statement, absolute_import
 
32
from __future__ import division
35
33
 
36
34
import SocketServer
37
35
import socket
 
36
import select
38
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
 
import pwd
59
 
from contextlib import closing
60
57
 
61
58
import dbus
62
 
import dbus.service
63
59
import gobject
64
60
import avahi
65
61
from dbus.mainloop.glib import DBusGMainLoop
66
62
import ctypes
67
 
import ctypes.util
68
63
 
69
 
version = "1.0.2"
 
64
version = "1.0"
70
65
 
71
66
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'))
 
67
syslogger = logging.handlers.SysLogHandler\
 
68
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
69
             address = "/dev/log")
 
70
syslogger.setFormatter(logging.Formatter\
 
71
                        ('Mandos: %(levelname)s: %(message)s'))
77
72
logger.addHandler(syslogger)
78
73
 
79
74
console = logging.StreamHandler()
84
79
class AvahiError(Exception):
85
80
    def __init__(self, value):
86
81
        self.value = value
87
 
        super(AvahiError, self).__init__()
88
82
    def __str__(self):
89
83
        return repr(self.value)
90
84
 
112
106
                  a sensible number of times
113
107
    """
114
108
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
 
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
109
                 type = None, port = None, TXT = None, domain = "",
 
110
                 host = "", max_renames = 32768):
117
111
        self.interface = interface
118
112
        self.name = name
119
 
        self.type = servicetype
 
113
        self.type = type
120
114
        self.port = port
121
 
        self.TXT = TXT if TXT is not None else []
 
115
        if TXT is None:
 
116
            self.TXT = []
 
117
        else:
 
118
            self.TXT = TXT
122
119
        self.domain = domain
123
120
        self.host = host
124
121
        self.rename_count = 0
125
 
        self.max_renames = max_renames
126
122
    def rename(self):
127
123
        """Derived from the Avahi example code"""
128
124
        if self.rename_count >= self.max_renames:
129
 
            logger.critical(u"No suitable Zeroconf service name found"
130
 
                            u" after %i retries, exiting.",
131
 
                            self.rename_count)
 
125
            logger.critical(u"No suitable service name found after %i"
 
126
                            u" retries, exiting.", rename_count)
132
127
            raise AvahiServiceError("Too many renames")
133
 
        self.name = server.GetAlternativeServiceName(self.name)
134
 
        logger.info(u"Changing Zeroconf service name to %r ...",
135
 
                    str(self.name))
136
 
        syslogger.setFormatter(logging.Formatter
 
128
        name = server.GetAlternativeServiceName(name)
 
129
        logger.error(u"Changing name to %r ...", name)
 
130
        syslogger.setFormatter(logging.Formatter\
137
131
                               ('Mandos (%s): %%(levelname)s:'
138
 
                                ' %%(message)s' % self.name))
 
132
                               ' %%(message)s' % name))
139
133
        self.remove()
140
134
        self.add()
141
135
        self.rename_count += 1
147
141
        """Derived from the Avahi example code"""
148
142
        global group
149
143
        if group is None:
150
 
            group = dbus.Interface(bus.get_object
151
 
                                   (avahi.DBUS_NAME,
 
144
            group = dbus.Interface\
 
145
                    (bus.get_object(avahi.DBUS_NAME,
152
146
                                    server.EntryGroupNew()),
153
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
147
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
148
            group.connect_to_signal('StateChanged',
155
149
                                    entry_group_state_changed)
156
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
150
        logger.debug(u"Adding service '%s' of type '%s' ...",
157
151
                     service.name, service.type)
158
152
        group.AddService(
159
153
                self.interface,         # interface
170
164
# End of Avahi example code
171
165
 
172
166
 
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):
 
167
class Client(object):
179
168
    """A representation of a client host served by this server.
180
169
    Attributes:
181
 
    name:       string; from the config file, used in log messages
 
170
    name:      string; from the config file, used in log messages
182
171
    fingerprint: string (40 or 32 hexadecimal digits); used to
183
172
                 uniquely identify the client
184
 
    secret:     bytestring; sent verbatim (over TLS) to client
185
 
    host:       string; available for use by the checker command
186
 
    created:    datetime.datetime(); (UTC) object creation
187
 
    last_enabled: datetime.datetime(); (UTC)
188
 
    enabled:    bool()
189
 
    last_checked_ok: datetime.datetime(); (UTC) or None
190
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
191
 
                                      until this client is invalid
192
 
    interval:   datetime.timedelta(); How often to start a new checker
193
 
    disable_hook:  If set, called by disable() as disable_hook(self)
194
 
    checker:    subprocess.Popen(); a running checker process used
195
 
                                    to see if the client lives.
196
 
                                    'None' if no process is running.
 
173
    secret:    bytestring; sent verbatim (over TLS) to client
 
174
    host:      string; available for use by the checker command
 
175
    created:   datetime.datetime(); object creation, not client host
 
176
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
177
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
178
                                     until this client is invalid
 
179
    interval:  datetime.timedelta(); How often to start a new checker
 
180
    stop_hook: If set, called by stop() as stop_hook(self)
 
181
    checker:   subprocess.Popen(); a running checker process used
 
182
                                   to see if the client lives.
 
183
                                   'None' if no process is running.
197
184
    checker_initiator_tag: a gobject event source tag, or None
198
 
    disable_initiator_tag:    - '' -
 
185
    stop_initiator_tag:    - '' -
199
186
    checker_callback_tag:  - '' -
200
187
    checker_command: string; External command which is run to check if
201
188
                     client lives.  %() expansions are done at
202
189
                     runtime with vars(self) as dict, so that for
203
190
                     instance %(name)s can be used in the command.
204
 
    dbus_object_path: dbus.ObjectPath
205
191
    Private attibutes:
206
192
    _timeout: Real variable for 'timeout'
207
193
    _interval: Real variable for 'interval'
209
195
    _interval_milliseconds: - '' -
210
196
    """
211
197
    def _set_timeout(self, timeout):
212
 
        "Setter function for the 'timeout' attribute"
 
198
        "Setter function for 'timeout' attribute"
213
199
        self._timeout = timeout
214
200
        self._timeout_milliseconds = ((self.timeout.days
215
201
                                       * 24 * 60 * 60 * 1000)
216
202
                                      + (self.timeout.seconds * 1000)
217
203
                                      + (self.timeout.microseconds
218
204
                                         // 1000))
219
 
        # Emit D-Bus signal
220
 
        self.PropertyChanged(dbus.String(u"timeout"),
221
 
                             (dbus.UInt64(self._timeout_milliseconds,
222
 
                                          variant_level=1)))
223
 
    timeout = property(lambda self: self._timeout, _set_timeout)
 
205
    timeout = property(lambda self: self._timeout,
 
206
                       _set_timeout)
224
207
    del _set_timeout
225
 
    
226
208
    def _set_interval(self, interval):
227
 
        "Setter function for the 'interval' attribute"
 
209
        "Setter function for 'interval' attribute"
228
210
        self._interval = interval
229
211
        self._interval_milliseconds = ((self.interval.days
230
212
                                        * 24 * 60 * 60 * 1000)
232
214
                                          * 1000)
233
215
                                       + (self.interval.microseconds
234
216
                                          // 1000))
235
 
        # Emit D-Bus signal
236
 
        self.PropertyChanged(dbus.String(u"interval"),
237
 
                             (dbus.UInt64(self._interval_milliseconds,
238
 
                                          variant_level=1)))
239
 
    interval = property(lambda self: self._interval, _set_interval)
 
217
    interval = property(lambda self: self._interval,
 
218
                        _set_interval)
240
219
    del _set_interval
241
 
    
242
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
220
    def __init__(self, name = None, stop_hook=None, config={}):
243
221
        """Note: the 'checker' key in 'config' sets the
244
222
        'checker_command' attribute and *not* the 'checker'
245
223
        attribute."""
246
 
        self.dbus_object_path = (dbus.ObjectPath
247
 
                                 ("/Mandos/clients/"
248
 
                                  + name.replace(".", "_")))
249
 
        dbus.service.Object.__init__(self, bus,
250
 
                                     self.dbus_object_path)
251
 
        if config is None:
252
 
            config = {}
253
224
        self.name = name
254
225
        logger.debug(u"Creating client %r", self.name)
255
226
        # Uppercase and remove spaces from fingerprint for later
256
227
        # comparison purposes with return value from the fingerprint()
257
228
        # function
258
 
        self.fingerprint = (config["fingerprint"].upper()
259
 
                            .replace(u" ", u""))
 
229
        self.fingerprint = config["fingerprint"].upper()\
 
230
                           .replace(u" ", u"")
260
231
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
261
232
        if "secret" in config:
262
233
            self.secret = config["secret"].decode(u"base64")
263
234
        elif "secfile" in config:
264
 
            with closing(open(os.path.expanduser
265
 
                              (os.path.expandvars
266
 
                               (config["secfile"])))) as secfile:
267
 
                self.secret = secfile.read()
 
235
            sf = open(config["secfile"])
 
236
            self.secret = sf.read()
 
237
            sf.close()
268
238
        else:
269
239
            raise TypeError(u"No secret or secfile for client %s"
270
240
                            % self.name)
271
241
        self.host = config.get("host", "")
272
 
        self.created = datetime.datetime.utcnow()
273
 
        self.enabled = False
274
 
        self.last_enabled = None
 
242
        self.created = datetime.datetime.now()
275
243
        self.last_checked_ok = None
276
244
        self.timeout = string_to_delta(config["timeout"])
277
245
        self.interval = string_to_delta(config["interval"])
278
 
        self.disable_hook = disable_hook
 
246
        self.stop_hook = stop_hook
279
247
        self.checker = None
280
248
        self.checker_initiator_tag = None
281
 
        self.disable_initiator_tag = None
 
249
        self.stop_initiator_tag = None
282
250
        self.checker_callback_tag = None
283
 
        self.checker_command = config["checker"]
284
 
    
285
 
    def enable(self):
 
251
        self.check_command = config["checker"]
 
252
    def start(self):
286
253
        """Start this client's checker and timeout hooks"""
287
 
        self.last_enabled = datetime.datetime.utcnow()
288
254
        # Schedule a new checker to be started an 'interval' from now,
289
255
        # and every interval from then on.
290
 
        self.checker_initiator_tag = (gobject.timeout_add
291
 
                                      (self._interval_milliseconds,
292
 
                                       self.start_checker))
 
256
        self.checker_initiator_tag = gobject.timeout_add\
 
257
                                     (self._interval_milliseconds,
 
258
                                      self.start_checker)
293
259
        # Also start a new checker *right now*.
294
260
        self.start_checker()
295
 
        # Schedule a disable() when 'timeout' has passed
296
 
        self.disable_initiator_tag = (gobject.timeout_add
297
 
                                   (self._timeout_milliseconds,
298
 
                                    self.disable))
299
 
        self.enabled = True
300
 
        # Emit D-Bus signal
301
 
        self.PropertyChanged(dbus.String(u"enabled"),
302
 
                             dbus.Boolean(True, variant_level=1))
303
 
        self.PropertyChanged(dbus.String(u"last_enabled"),
304
 
                             (_datetime_to_dbus(self.last_enabled,
305
 
                                                variant_level=1)))
306
 
    
307
 
    def disable(self):
308
 
        """Disable this client."""
309
 
        if not getattr(self, "enabled", False):
 
261
        # Schedule a stop() when 'timeout' has passed
 
262
        self.stop_initiator_tag = gobject.timeout_add\
 
263
                                  (self._timeout_milliseconds,
 
264
                                   self.stop)
 
265
    def stop(self):
 
266
        """Stop this client.
 
267
        The possibility that a client might be restarted is left open,
 
268
        but not currently used."""
 
269
        # If this client doesn't have a secret, it is already stopped.
 
270
        if hasattr(self, "secret") and self.secret:
 
271
            logger.info(u"Stopping client %s", self.name)
 
272
            self.secret = None
 
273
        else:
310
274
            return False
311
 
        logger.info(u"Disabling client %s", self.name)
312
 
        if getattr(self, "disable_initiator_tag", False):
313
 
            gobject.source_remove(self.disable_initiator_tag)
314
 
            self.disable_initiator_tag = None
 
275
        if getattr(self, "stop_initiator_tag", False):
 
276
            gobject.source_remove(self.stop_initiator_tag)
 
277
            self.stop_initiator_tag = None
315
278
        if getattr(self, "checker_initiator_tag", False):
316
279
            gobject.source_remove(self.checker_initiator_tag)
317
280
            self.checker_initiator_tag = None
318
281
        self.stop_checker()
319
 
        if self.disable_hook:
320
 
            self.disable_hook(self)
321
 
        self.enabled = False
322
 
        # Emit D-Bus signal
323
 
        self.PropertyChanged(dbus.String(u"enabled"),
324
 
                             dbus.Boolean(False, variant_level=1))
 
282
        if self.stop_hook:
 
283
            self.stop_hook(self)
325
284
        # Do not run this again if called by a gobject.timeout_add
326
285
        return False
327
 
    
328
286
    def __del__(self):
329
 
        self.disable_hook = None
330
 
        self.disable()
331
 
    
332
 
    def checker_callback(self, pid, condition, command):
 
287
        self.stop_hook = None
 
288
        self.stop()
 
289
    def checker_callback(self, pid, condition):
333
290
        """The checker has completed, so take appropriate actions."""
 
291
        now = datetime.datetime.now()
334
292
        self.checker_callback_tag = None
335
293
        self.checker = None
336
 
        # Emit D-Bus signal
337
 
        self.PropertyChanged(dbus.String(u"checker_running"),
338
 
                             dbus.Boolean(False, variant_level=1))
339
 
        if (os.WIFEXITED(condition)
340
 
            and (os.WEXITSTATUS(condition) == 0)):
 
294
        if os.WIFEXITED(condition) \
 
295
               and (os.WEXITSTATUS(condition) == 0):
341
296
            logger.info(u"Checker for %(name)s succeeded",
342
297
                        vars(self))
343
 
            # Emit D-Bus signal
344
 
            self.CheckerCompleted(dbus.Boolean(True),
345
 
                                  dbus.UInt16(condition),
346
 
                                  dbus.String(command))
347
 
            self.bump_timeout()
 
298
            self.last_checked_ok = now
 
299
            gobject.source_remove(self.stop_initiator_tag)
 
300
            self.stop_initiator_tag = gobject.timeout_add\
 
301
                                      (self._timeout_milliseconds,
 
302
                                       self.stop)
348
303
        elif not os.WIFEXITED(condition):
349
304
            logger.warning(u"Checker for %(name)s crashed?",
350
305
                           vars(self))
351
 
            # Emit D-Bus signal
352
 
            self.CheckerCompleted(dbus.Boolean(False),
353
 
                                  dbus.UInt16(condition),
354
 
                                  dbus.String(command))
355
306
        else:
356
307
            logger.info(u"Checker for %(name)s failed",
357
308
                        vars(self))
358
 
            # Emit D-Bus signal
359
 
            self.CheckerCompleted(dbus.Boolean(False),
360
 
                                  dbus.UInt16(condition),
361
 
                                  dbus.String(command))
362
 
    
363
 
    def bump_timeout(self):
364
 
        """Bump up the timeout for this client.
365
 
        This should only be called when the client has been seen,
366
 
        alive and well.
367
 
        """
368
 
        self.last_checked_ok = datetime.datetime.utcnow()
369
 
        gobject.source_remove(self.disable_initiator_tag)
370
 
        self.disable_initiator_tag = (gobject.timeout_add
371
 
                                      (self._timeout_milliseconds,
372
 
                                       self.disable))
373
 
        self.PropertyChanged(dbus.String(u"last_checked_ok"),
374
 
                             (_datetime_to_dbus(self.last_checked_ok,
375
 
                                                variant_level=1)))
376
 
    
377
309
    def start_checker(self):
378
310
        """Start a new checker subprocess if one is not running.
379
311
        If a checker already exists, leave it running and do
388
320
        # is as it should be.
389
321
        if self.checker is None:
390
322
            try:
391
 
                # In case checker_command has exactly one % operator
392
 
                command = self.checker_command % self.host
 
323
                # In case check_command has exactly one % operator
 
324
                command = self.check_command % self.host
393
325
            except TypeError:
394
326
                # Escape attributes for the shell
395
327
                escaped_attrs = dict((key, re.escape(str(val)))
396
328
                                     for key, val in
397
329
                                     vars(self).iteritems())
398
330
                try:
399
 
                    command = self.checker_command % escaped_attrs
 
331
                    command = self.check_command % escaped_attrs
400
332
                except TypeError, error:
401
333
                    logger.error(u'Could not format string "%s":'
402
 
                                 u' %s', self.checker_command, error)
 
334
                                 u' %s', self.check_command, error)
403
335
                    return True # Try again later
404
336
            try:
405
337
                logger.info(u"Starting checker %r for %s",
406
338
                            command, self.name)
407
 
                # We don't need to redirect stdout and stderr, since
408
 
                # in normal mode, that is already done by daemon(),
409
 
                # and in debug mode we don't want to.  (Stdin is
410
 
                # always replaced by /dev/null.)
411
339
                self.checker = subprocess.Popen(command,
412
340
                                                close_fds=True,
413
341
                                                shell=True, cwd="/")
414
 
                # Emit D-Bus signal
415
 
                self.CheckerStarted(command)
416
 
                self.PropertyChanged(dbus.String("checker_running"),
417
 
                                     dbus.Boolean(True, variant_level=1))
418
 
                self.checker_callback_tag = (gobject.child_watch_add
419
 
                                             (self.checker.pid,
420
 
                                              self.checker_callback,
421
 
                                              data=command))
422
 
            except OSError, error:
 
342
                self.checker_callback_tag = gobject.child_watch_add\
 
343
                                            (self.checker.pid,
 
344
                                             self.checker_callback)
 
345
            except subprocess.OSError, error:
423
346
                logger.error(u"Failed to start subprocess: %s",
424
347
                             error)
425
348
        # Re-run this periodically if run by gobject.timeout_add
426
349
        return True
427
 
    
428
350
    def stop_checker(self):
429
351
        """Force the checker process, if any, to stop."""
430
352
        if self.checker_callback_tag:
442
364
            if error.errno != errno.ESRCH: # No such process
443
365
                raise
444
366
        self.checker = None
445
 
        self.PropertyChanged(dbus.String(u"checker_running"),
446
 
                             dbus.Boolean(False, variant_level=1))
447
 
    
448
367
    def still_valid(self):
449
368
        """Has the timeout not yet passed for this client?"""
450
 
        if not getattr(self, "enabled", False):
451
 
            return False
452
 
        now = datetime.datetime.utcnow()
 
369
        now = datetime.datetime.now()
453
370
        if self.last_checked_ok is None:
454
371
            return now < (self.created + self.timeout)
455
372
        else:
456
373
            return now < (self.last_checked_ok + self.timeout)
457
 
    
458
 
    ## D-Bus methods & signals
459
 
    _interface = u"org.mandos_system.Mandos.Client"
460
 
    
461
 
    # BumpTimeout - method
462
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
463
 
    BumpTimeout.__name__ = "BumpTimeout"
464
 
    
465
 
    # CheckerCompleted - signal
466
 
    @dbus.service.signal(_interface, signature="bqs")
467
 
    def CheckerCompleted(self, success, condition, 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
 
                }, 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
 
    
533
 
    # SetHost - method
534
 
    @dbus.service.method(_interface, in_signature="s")
535
 
    def SetHost(self, host):
536
 
        "D-Bus setter method"
537
 
        self.host = host
538
 
    
539
 
    # SetInterval - method
540
 
    @dbus.service.method(_interface, in_signature="t")
541
 
    def SetInterval(self, milliseconds):
542
 
        self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
543
 
    
544
 
    # SetSecret - method
545
 
    @dbus.service.method(_interface, in_signature="ay",
546
 
                         byte_arrays=True)
547
 
    def SetSecret(self, secret):
548
 
        "D-Bus setter method"
549
 
        self.secret = str(secret)
550
 
    
551
 
    # SetTimeout - method
552
 
    @dbus.service.method(_interface, in_signature="t")
553
 
    def SetTimeout(self, milliseconds):
554
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
555
 
    
556
 
    # Enable - method
557
 
    Enable = dbus.service.method(_interface)(enable)
558
 
    Enable.__name__ = "Enable"
559
 
    
560
 
    # StartChecker - method
561
 
    @dbus.service.method(_interface)
562
 
    def StartChecker(self):
563
 
        "D-Bus method"
564
 
        self.start_checker()
565
 
    
566
 
    # Disable - method
567
 
    @dbus.service.method(_interface)
568
 
    def Disable(self):
569
 
        "D-Bus method"
570
 
        self.disable()
571
 
    
572
 
    # StopChecker - method
573
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
574
 
    StopChecker.__name__ = "StopChecker"
575
 
    
576
 
    del _interface
577
374
 
578
375
 
579
376
def peer_certificate(session):
580
377
    "Return the peer's OpenPGP certificate as a bytestring"
581
378
    # If not an OpenPGP certificate...
582
 
    if (gnutls.library.functions
583
 
        .gnutls_certificate_type_get(session._c_object)
584
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
379
    if gnutls.library.functions.gnutls_certificate_type_get\
 
380
            (session._c_object) \
 
381
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
585
382
        # ...do the normal thing
586
383
        return session.peer_certificate
587
384
    list_size = ctypes.c_uint()
588
 
    cert_list = (gnutls.library.functions
589
 
                 .gnutls_certificate_get_peers
590
 
                 (session._c_object, ctypes.byref(list_size)))
 
385
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
386
        (session._c_object, ctypes.byref(list_size))
591
387
    if list_size.value == 0:
592
388
        return None
593
389
    cert = cert_list[0]
597
393
def fingerprint(openpgp):
598
394
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
599
395
    # New GnuTLS "datum" with the OpenPGP public key
600
 
    datum = (gnutls.library.types
601
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
602
 
                                         ctypes.POINTER
603
 
                                         (ctypes.c_ubyte)),
604
 
                             ctypes.c_uint(len(openpgp))))
 
396
    datum = gnutls.library.types.gnutls_datum_t\
 
397
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
398
                     ctypes.POINTER(ctypes.c_ubyte)),
 
399
         ctypes.c_uint(len(openpgp)))
605
400
    # New empty GnuTLS certificate
606
401
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
607
 
    (gnutls.library.functions
608
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
402
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
403
        (ctypes.byref(crt))
609
404
    # Import the OpenPGP public key into the certificate
610
 
    (gnutls.library.functions
611
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
612
 
                                gnutls.library.constants
613
 
                                .GNUTLS_OPENPGP_FMT_RAW))
614
 
    # Verify the self signature in the key
615
 
    crtverify = ctypes.c_uint()
616
 
    (gnutls.library.functions
617
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
618
 
    if crtverify.value != 0:
619
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
620
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
405
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
406
                    (crt, ctypes.byref(datum),
 
407
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
621
408
    # New buffer for the fingerprint
622
 
    buf = ctypes.create_string_buffer(20)
623
 
    buf_len = ctypes.c_size_t()
 
409
    buffer = ctypes.create_string_buffer(20)
 
410
    buffer_length = ctypes.c_size_t()
624
411
    # Get the fingerprint from the certificate into the buffer
625
 
    (gnutls.library.functions
626
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
627
 
                                         ctypes.byref(buf_len)))
 
412
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
413
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
628
414
    # Deinit the certificate
629
415
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
630
416
    # Convert the buffer to a Python bytestring
631
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
417
    fpr = ctypes.string_at(buffer, buffer_length.value)
632
418
    # Convert the bytestring to hexadecimal notation
633
419
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
634
420
    return hex_fpr
635
421
 
636
422
 
637
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
423
class tcp_handler(SocketServer.BaseRequestHandler, object):
638
424
    """A TCP request handler class.
639
425
    Instantiated by IPv6_TCPServer for each request to handle it.
640
426
    Note: This will run in its own forked process."""
641
427
    
642
428
    def handle(self):
643
429
        logger.info(u"TCP connection from: %s",
644
 
                    unicode(self.client_address))
645
 
        session = (gnutls.connection
646
 
                   .ClientSession(self.request,
647
 
                                  gnutls.connection
648
 
                                  .X509Credentials()))
 
430
                     unicode(self.client_address))
 
431
        session = gnutls.connection.ClientSession\
 
432
                  (self.request, gnutls.connection.X509Credentials())
649
433
        
650
434
        line = self.request.makefile().readline()
651
435
        logger.debug(u"Protocol version: %r", line)
664
448
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
665
449
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
666
450
        #                "+DHE-DSS"))
667
 
        # Use a fallback default, since this MUST be set.
668
 
        priority = self.server.settings.get("priority", "NORMAL")
669
 
        (gnutls.library.functions
670
 
         .gnutls_priority_set_direct(session._c_object,
671
 
                                     priority, None))
 
451
        priority = "NORMAL"             # Fallback default, since this
 
452
                                        # MUST be set.
 
453
        if self.server.settings["priority"]:
 
454
            priority = self.server.settings["priority"]
 
455
        gnutls.library.functions.gnutls_priority_set_direct\
 
456
            (session._c_object, priority, None);
672
457
        
673
458
        try:
674
459
            session.handshake()
684
469
            session.bye()
685
470
            return
686
471
        logger.debug(u"Fingerprint: %s", fpr)
 
472
        client = None
687
473
        for c in self.server.clients:
688
474
            if c.fingerprint == fpr:
689
475
                client = c
690
476
                break
691
 
        else:
 
477
        if not client:
692
478
            logger.warning(u"Client not found for fingerprint: %s",
693
479
                           fpr)
694
480
            session.bye()
701
487
                           vars(client))
702
488
            session.bye()
703
489
            return
704
 
        ## This won't work here, since we're in a fork.
705
 
        # client.bump_timeout()
706
490
        sent_size = 0
707
491
        while sent_size < len(client.secret):
708
492
            sent = session.send(client.secret[sent_size:])
713
497
        session.bye()
714
498
 
715
499
 
716
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
717
 
                     SocketServer.TCPServer, object):
 
500
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
718
501
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
719
502
    Attributes:
720
503
        settings:       Server settings
721
504
        clients:        Set() of Client objects
722
 
        enabled:        Boolean; whether this server is activated yet
723
505
    """
724
506
    address_family = socket.AF_INET6
725
507
    def __init__(self, *args, **kwargs):
729
511
        if "clients" in kwargs:
730
512
            self.clients = kwargs["clients"]
731
513
            del kwargs["clients"]
732
 
        self.enabled = False
733
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
514
        return super(type(self), self).__init__(*args, **kwargs)
734
515
    def server_bind(self):
735
516
        """This overrides the normal server_bind() function
736
517
        to bind to an interface if one was specified, and also NOT to
765
546
#                                            if_nametoindex
766
547
#                                            (self.settings
767
548
#                                             ["interface"]))
768
 
            return super(IPv6_TCPServer, self).server_bind()
769
 
    def server_activate(self):
770
 
        if self.enabled:
771
 
            return super(IPv6_TCPServer, self).server_activate()
772
 
    def enable(self):
773
 
        self.enabled = True
 
549
            return super(type(self), self).server_bind()
774
550
 
775
551
 
776
552
def string_to_delta(interval):
786
562
    datetime.timedelta(1)
787
563
    >>> string_to_delta(u'1w')
788
564
    datetime.timedelta(7)
789
 
    >>> string_to_delta('5m 30s')
790
 
    datetime.timedelta(0, 330)
791
565
    """
792
 
    timevalue = datetime.timedelta(0)
793
 
    for s in interval.split():
794
 
        try:
795
 
            suffix = unicode(s[-1])
796
 
            value = int(s[:-1])
797
 
            if suffix == u"d":
798
 
                delta = datetime.timedelta(value)
799
 
            elif suffix == u"s":
800
 
                delta = datetime.timedelta(0, value)
801
 
            elif suffix == u"m":
802
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
803
 
            elif suffix == u"h":
804
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
805
 
            elif suffix == u"w":
806
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
807
 
            else:
808
 
                raise ValueError
809
 
        except (ValueError, IndexError):
 
566
    try:
 
567
        suffix=unicode(interval[-1])
 
568
        value=int(interval[:-1])
 
569
        if suffix == u"d":
 
570
            delta = datetime.timedelta(value)
 
571
        elif suffix == u"s":
 
572
            delta = datetime.timedelta(0, value)
 
573
        elif suffix == u"m":
 
574
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
575
        elif suffix == u"h":
 
576
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
577
        elif suffix == u"w":
 
578
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
579
        else:
810
580
            raise ValueError
811
 
        timevalue += delta
812
 
    return timevalue
 
581
    except (ValueError, IndexError):
 
582
        raise ValueError
 
583
    return delta
813
584
 
814
585
 
815
586
def server_state_changed(state):
816
587
    """Derived from the Avahi example code"""
817
588
    if state == avahi.SERVER_COLLISION:
818
 
        logger.error(u"Zeroconf server name collision")
 
589
        logger.error(u"Server name collision")
819
590
        service.remove()
820
591
    elif state == avahi.SERVER_RUNNING:
821
592
        service.add()
823
594
 
824
595
def entry_group_state_changed(state, error):
825
596
    """Derived from the Avahi example code"""
826
 
    logger.debug(u"Avahi state change: %i", state)
 
597
    logger.debug(u"state change: %i", state)
827
598
    
828
599
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
829
 
        logger.debug(u"Zeroconf service established.")
 
600
        logger.debug(u"Service established.")
830
601
    elif state == avahi.ENTRY_GROUP_COLLISION:
831
 
        logger.warning(u"Zeroconf service name collision.")
 
602
        logger.warning(u"Service name collision.")
832
603
        service.rename()
833
604
    elif state == avahi.ENTRY_GROUP_FAILURE:
834
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
605
        logger.critical(u"Error in group state changed %s",
835
606
                        unicode(error))
836
607
        raise AvahiGroupError("State changed: %s", str(error))
837
608
 
839
610
    """Call the C function if_nametoindex(), or equivalent"""
840
611
    global if_nametoindex
841
612
    try:
842
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
843
 
                          (ctypes.util.find_library("c"))
844
 
                          .if_nametoindex)
 
613
        if "ctypes.util" not in sys.modules:
 
614
            import ctypes.util
 
615
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
616
            (ctypes.util.find_library("c")).if_nametoindex
845
617
    except (OSError, AttributeError):
846
618
        if "struct" not in sys.modules:
847
619
            import struct
850
622
        def if_nametoindex(interface):
851
623
            "Get an interface index the hard way, i.e. using fcntl()"
852
624
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
853
 
            with closing(socket.socket()) as s:
854
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
855
 
                                    struct.pack("16s16x", interface))
 
625
            s = socket.socket()
 
626
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
627
                                struct.pack("16s16x", interface))
 
628
            s.close()
856
629
            interface_index = struct.unpack("I", ifreq[16:20])[0]
857
630
            return interface_index
858
631
    return if_nametoindex(interface)
882
655
 
883
656
 
884
657
def main():
 
658
    global main_loop_started
 
659
    main_loop_started = False
 
660
    
885
661
    parser = OptionParser(version = "%%prog %s" % version)
886
662
    parser.add_option("-i", "--interface", type="string",
887
663
                      metavar="IF", help="Bind to interface IF")
902
678
                      default="/etc/mandos", metavar="DIR",
903
679
                      help="Directory to search for configuration"
904
680
                      " files")
905
 
    options = parser.parse_args()[0]
 
681
    (options, args) = parser.parse_args()
906
682
    
907
683
    if options.check:
908
684
        import doctest
923
699
    server_config = ConfigParser.SafeConfigParser(server_defaults)
924
700
    del server_defaults
925
701
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
702
    server_section = "server"
926
703
    # Convert the SafeConfigParser object to a dict
927
 
    server_settings = server_config.defaults()
 
704
    server_settings = dict(server_config.items(server_section))
928
705
    # Use getboolean on the boolean config option
929
 
    server_settings["debug"] = (server_config.getboolean
930
 
                                ("DEFAULT", "debug"))
 
706
    server_settings["debug"] = server_config.getboolean\
 
707
                               (server_section, "debug")
931
708
    del server_config
932
709
    
933
710
    # Override the settings from the config file with command line
947
724
        console.setLevel(logging.WARNING)
948
725
    
949
726
    if server_settings["servicename"] != "Mandos":
950
 
        syslogger.setFormatter(logging.Formatter
 
727
        syslogger.setFormatter(logging.Formatter\
951
728
                               ('Mandos (%s): %%(levelname)s:'
952
729
                                ' %%(message)s'
953
730
                                % server_settings["servicename"]))
955
732
    # Parse config file with clients
956
733
    client_defaults = { "timeout": "1h",
957
734
                        "interval": "5m",
958
 
                        "checker": "fping -q -- %(host)s",
959
 
                        "host": "",
 
735
                        "checker": "fping -q -- %%(host)s",
960
736
                        }
961
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
962
738
    client_config.read(os.path.join(server_settings["configdir"],
963
739
                                    "clients.conf"))
964
740
    
965
 
    clients = Set()
966
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
967
 
                                 server_settings["port"]),
968
 
                                TCP_handler,
969
 
                                settings=server_settings,
970
 
                                clients=clients)
971
 
    pidfilename = "/var/run/mandos.pid"
972
 
    try:
973
 
        pidfile = open(pidfilename, "w")
974
 
    except IOError, error:
975
 
        logger.error("Could not open file %r", pidfilename)
976
 
    
977
 
    try:
978
 
        uid = pwd.getpwnam("_mandos").pw_uid
979
 
    except KeyError:
980
 
        try:
981
 
            uid = pwd.getpwnam("mandos").pw_uid
982
 
        except KeyError:
983
 
            try:
984
 
                uid = pwd.getpwnam("nobody").pw_uid
985
 
            except KeyError:
986
 
                uid = 65534
987
 
    try:
988
 
        gid = pwd.getpwnam("_mandos").pw_gid
989
 
    except KeyError:
990
 
        try:
991
 
            gid = pwd.getpwnam("mandos").pw_gid
992
 
        except KeyError:
993
 
            try:
994
 
                gid = pwd.getpwnam("nogroup").pw_gid
995
 
            except KeyError:
996
 
                gid = 65534
997
 
    try:
998
 
        os.setuid(uid)
999
 
        os.setgid(gid)
1000
 
    except OSError, error:
1001
 
        if error[0] != errno.EPERM:
1002
 
            raise error
1003
 
    
1004
741
    global service
1005
742
    service = AvahiService(name = server_settings["servicename"],
1006
 
                           servicetype = "_mandos._tcp", )
 
743
                           type = "_mandos._tcp", );
1007
744
    if server_settings["interface"]:
1008
 
        service.interface = (if_nametoindex
1009
 
                             (server_settings["interface"]))
 
745
        service.interface = if_nametoindex(server_settings["interface"])
1010
746
    
1011
747
    global main_loop
1012
748
    global bus
1015
751
    DBusGMainLoop(set_as_default=True )
1016
752
    main_loop = gobject.MainLoop()
1017
753
    bus = dbus.SystemBus()
1018
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1019
 
                                           avahi.DBUS_PATH_SERVER),
1020
 
                            avahi.DBUS_INTERFACE_SERVER)
 
754
    server = dbus.Interface(
 
755
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
756
            avahi.DBUS_INTERFACE_SERVER )
1021
757
    # End of Avahi example code
1022
 
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
 
758
    
 
759
    clients = Set()
 
760
    def remove_from_clients(client):
 
761
        clients.remove(client)
 
762
        if not clients:
 
763
            logger.critical(u"No clients left, exiting")
 
764
            sys.exit()
1023
765
    
1024
766
    clients.update(Set(Client(name = section,
 
767
                              stop_hook = remove_from_clients,
1025
768
                              config
1026
769
                              = dict(client_config.items(section)))
1027
770
                       for section in client_config.sections()))
1029
772
        logger.critical(u"No clients defined")
1030
773
        sys.exit(1)
1031
774
    
1032
 
    if debug:
1033
 
        # Redirect stdin so all checkers get /dev/null
1034
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1035
 
        os.dup2(null, sys.stdin.fileno())
1036
 
        if null > 2:
1037
 
            os.close(null)
1038
 
    else:
1039
 
        # No console logging
 
775
    if not debug:
1040
776
        logger.removeHandler(console)
1041
 
        # Close all input and output, do double fork, etc.
1042
777
        daemon()
1043
778
    
 
779
    pidfilename = "/var/run/mandos/mandos.pid"
 
780
    pid = os.getpid()
1044
781
    try:
1045
 
        pid = os.getpid()
 
782
        pidfile = open(pidfilename, "w")
1046
783
        pidfile.write(str(pid) + "\n")
1047
784
        pidfile.close()
1048
785
        del pidfile
1049
 
    except IOError:
1050
 
        logger.error(u"Could not write to file %r with PID %d",
1051
 
                     pidfilename, pid)
1052
 
    except NameError:
1053
 
        # "pidfile" was never created
1054
 
        pass
1055
 
    del pidfilename
 
786
    except IOError, err:
 
787
        logger.error(u"Could not write %s file with PID %d",
 
788
                     pidfilename, os.getpid())
1056
789
    
1057
790
    def cleanup():
1058
791
        "Cleanup function; run on exit"
1065
798
        
1066
799
        while clients:
1067
800
            client = clients.pop()
1068
 
            client.disable_hook = None
1069
 
            client.disable()
 
801
            client.stop_hook = None
 
802
            client.stop()
1070
803
    
1071
804
    atexit.register(cleanup)
1072
805
    
1075
808
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1076
809
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1077
810
    
1078
 
    class MandosServer(dbus.service.Object):
1079
 
        """A D-Bus proxy object"""
1080
 
        def __init__(self):
1081
 
            dbus.service.Object.__init__(self, bus,
1082
 
                                         "/Mandos")
1083
 
        _interface = u"org.mandos_system.Mandos"
1084
 
        
1085
 
        @dbus.service.signal(_interface, signature="oa{sv}")
1086
 
        def ClientAdded(self, objpath, properties):
1087
 
            "D-Bus signal"
1088
 
            pass
1089
 
        
1090
 
        @dbus.service.signal(_interface, signature="o")
1091
 
        def ClientRemoved(self, objpath):
1092
 
            "D-Bus signal"
1093
 
            pass
1094
 
        
1095
 
        @dbus.service.method(_interface, out_signature="ao")
1096
 
        def GetAllClients(self):
1097
 
            return dbus.Array(c.dbus_object_path for c in clients)
1098
 
        
1099
 
        @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1100
 
        def GetAllClientsWithProperties(self):
1101
 
            return dbus.Dictionary(
1102
 
                ((c.dbus_object_path, c.GetAllProperties())
1103
 
                 for c in clients),
1104
 
                signature="oa{sv}")
1105
 
        
1106
 
        @dbus.service.method(_interface, in_signature="o")
1107
 
        def RemoveClient(self, object_path):
1108
 
            for c in clients:
1109
 
                if c.dbus_object_path == object_path:
1110
 
                    c.disable()
1111
 
                    clients.remove(c)
1112
 
                    return
1113
 
            raise KeyError
1114
 
        
1115
 
        del _interface
1116
 
    
1117
 
    mandos_server = MandosServer()
1118
 
    
1119
811
    for client in clients:
1120
 
        # Emit D-Bus signal
1121
 
        mandos_server.ClientAdded(client.dbus_object_path,
1122
 
                                  client.GetAllProperties())
1123
 
        client.enable()
1124
 
    
1125
 
    tcp_server.enable()
1126
 
    tcp_server.server_activate()
1127
 
    
 
812
        client.start()
 
813
    
 
814
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
815
                                 server_settings["port"]),
 
816
                                tcp_handler,
 
817
                                settings=server_settings,
 
818
                                clients=clients)
1128
819
    # Find out what port we got
1129
820
    service.port = tcp_server.socket.getsockname()[1]
1130
821
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1144
835
        
1145
836
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1146
837
                             lambda *args, **kwargs:
1147
 
                             (tcp_server.handle_request
1148
 
                              (*args[2:], **kwargs) or True))
 
838
                             tcp_server.handle_request\
 
839
                             (*args[2:], **kwargs) or True)
1149
840
        
1150
841
        logger.debug(u"Starting main loop")
 
842
        main_loop_started = True
1151
843
        main_loop.run()
1152
844
    except AvahiError, error:
1153
845
        logger.critical(u"AvahiError: %s" + unicode(error))