/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

merge

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