/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 from trunk, but disable the unfinished D-Bus feature:

* Makefile (PROGS): Removed "mandos-list".
  (mandos-list): Removed.
* mandos (main): Hide "--no-dbus" option.  Hard-code "use_dbus" to
                 "False".
* mandos-list: Removed.
* mandos.xml (SYNOPSIS): Removed "--no-dbus" option.
  (OPTIONS): - '' -
  (D-BUS INTERFACE): Removed section.

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 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
15
16
# 
16
17
# This program is free software: you can redistribute it and/or modify
17
18
# it under the terms of the GNU General Public License as published by
34
35
 
35
36
import SocketServer
36
37
import socket
37
 
from optparse import OptionParser
 
38
import optparse
38
39
import datetime
39
40
import errno
40
41
import gnutls.crypto
58
59
from contextlib import closing
59
60
 
60
61
import dbus
 
62
import dbus.service
61
63
import gobject
62
64
import avahi
63
65
from dbus.mainloop.glib import DBusGMainLoop
67
69
version = "1.0.2"
68
70
 
69
71
logger = logging.Logger('mandos')
70
 
syslogger = logging.handlers.SysLogHandler\
71
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
72
 
             address = "/dev/log")
73
 
syslogger.setFormatter(logging.Formatter\
74
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
72
syslogger = (logging.handlers.SysLogHandler
 
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
74
              address = "/dev/log"))
 
75
syslogger.setFormatter(logging.Formatter
 
76
                       ('Mandos: %(levelname)s: %(message)s'))
75
77
logger.addHandler(syslogger)
76
78
 
77
79
console = logging.StreamHandler()
80
82
logger.addHandler(console)
81
83
 
82
84
class AvahiError(Exception):
83
 
    def __init__(self, value):
 
85
    def __init__(self, value, *args, **kwargs):
84
86
        self.value = value
85
 
        super(AvahiError, self).__init__()
86
 
    def __str__(self):
87
 
        return repr(self.value)
 
87
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
88
    def __unicode__(self):
 
89
        return unicode(repr(self.value))
88
90
 
89
91
class AvahiServiceError(AvahiError):
90
92
    pass
110
112
                  a sensible number of times
111
113
    """
112
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
113
 
                 servicetype = None, port = None, TXT = None, domain = "",
114
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
115
117
        self.interface = interface
116
118
        self.name = name
117
119
        self.type = servicetype
118
120
        self.port = port
119
 
        if TXT is None:
120
 
            self.TXT = []
121
 
        else:
122
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
123
122
        self.domain = domain
124
123
        self.host = host
125
124
        self.rename_count = 0
130
129
            logger.critical(u"No suitable Zeroconf service name found"
131
130
                            u" after %i retries, exiting.",
132
131
                            self.rename_count)
133
 
            raise AvahiServiceError("Too many renames")
 
132
            raise AvahiServiceError(u"Too many renames")
134
133
        self.name = server.GetAlternativeServiceName(self.name)
135
134
        logger.info(u"Changing Zeroconf service name to %r ...",
136
135
                    str(self.name))
137
 
        syslogger.setFormatter(logging.Formatter\
 
136
        syslogger.setFormatter(logging.Formatter
138
137
                               ('Mandos (%s): %%(levelname)s:'
139
 
                               ' %%(message)s' % self.name))
 
138
                                ' %%(message)s' % self.name))
140
139
        self.remove()
141
140
        self.add()
142
141
        self.rename_count += 1
148
147
        """Derived from the Avahi example code"""
149
148
        global group
150
149
        if group is None:
151
 
            group = dbus.Interface\
152
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (avahi.DBUS_NAME,
153
152
                                    server.EntryGroupNew()),
154
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
155
154
            group.connect_to_signal('StateChanged',
156
155
                                    entry_group_state_changed)
157
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
171
170
# End of Avahi example code
172
171
 
173
172
 
174
 
class Client(object):
 
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):
175
179
    """A representation of a client host served by this server.
176
180
    Attributes:
177
 
    name:      string; from the config file, used in log messages
 
181
    name:       string; from the config file, used in log messages
178
182
    fingerprint: string (40 or 32 hexadecimal digits); used to
179
183
                 uniquely identify the client
180
 
    secret:    bytestring; sent verbatim (over TLS) to client
181
 
    host:      string; available for use by the checker command
182
 
    created:   datetime.datetime(); object creation, not client host
183
 
    last_checked_ok: datetime.datetime() or None if not yet checked OK
184
 
    timeout:   datetime.timedelta(); How long from last_checked_ok
185
 
                                     until this client is invalid
186
 
    interval:  datetime.timedelta(); How often to start a new checker
187
 
    stop_hook: If set, called by stop() as stop_hook(self)
188
 
    checker:   subprocess.Popen(); a running checker process used
189
 
                                   to see if the client lives.
190
 
                                   'None' if no process is running.
 
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.
191
197
    checker_initiator_tag: a gobject event source tag, or None
192
 
    stop_initiator_tag:    - '' -
 
198
    disable_initiator_tag:    - '' -
193
199
    checker_callback_tag:  - '' -
194
200
    checker_command: string; External command which is run to check if
195
201
                     client lives.  %() expansions are done at
196
202
                     runtime with vars(self) as dict, so that for
197
203
                     instance %(name)s can be used in the command.
198
 
    Private attibutes:
199
 
    _timeout: Real variable for 'timeout'
200
 
    _interval: Real variable for 'interval'
201
 
    _timeout_milliseconds: Used when calling gobject.timeout_add()
202
 
    _interval_milliseconds: - '' -
 
204
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
205
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
203
206
    """
204
 
    def _set_timeout(self, timeout):
205
 
        "Setter function for 'timeout' attribute"
206
 
        self._timeout = timeout
207
 
        self._timeout_milliseconds = ((self.timeout.days
208
 
                                       * 24 * 60 * 60 * 1000)
209
 
                                      + (self.timeout.seconds * 1000)
210
 
                                      + (self.timeout.microseconds
211
 
                                         // 1000))
212
 
    timeout = property(lambda self: self._timeout,
213
 
                       _set_timeout)
214
 
    del _set_timeout
215
 
    def _set_interval(self, interval):
216
 
        "Setter function for 'interval' attribute"
217
 
        self._interval = interval
218
 
        self._interval_milliseconds = ((self.interval.days
219
 
                                        * 24 * 60 * 60 * 1000)
220
 
                                       + (self.interval.seconds
221
 
                                          * 1000)
222
 
                                       + (self.interval.microseconds
223
 
                                          // 1000))
224
 
    interval = property(lambda self: self._interval,
225
 
                        _set_interval)
226
 
    del _set_interval
227
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
207
    def timeout_milliseconds(self):
 
208
        "Return the 'timeout' attribute in milliseconds"
 
209
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
210
                + (self.timeout.seconds * 1000)
 
211
                + (self.timeout.microseconds // 1000))
 
212
    
 
213
    def interval_milliseconds(self):
 
214
        "Return the 'interval' attribute in milliseconds"
 
215
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
216
                + (self.interval.seconds * 1000)
 
217
                + (self.interval.microseconds // 1000))
 
218
    
 
219
    def __init__(self, name = None, disable_hook=None, config=None,
 
220
                 use_dbus=True):
228
221
        """Note: the 'checker' key in 'config' sets the
229
222
        'checker_command' attribute and *not* the 'checker'
230
223
        attribute."""
 
224
        self.name = name
231
225
        if config is None:
232
226
            config = {}
233
 
        self.name = name
234
227
        logger.debug(u"Creating client %r", self.name)
 
228
        self.use_dbus = use_dbus
 
229
        if self.use_dbus:
 
230
            self.dbus_object_path = (dbus.ObjectPath
 
231
                                     ("/Mandos/clients/"
 
232
                                      + self.name.replace(".", "_")))
 
233
            dbus.service.Object.__init__(self, bus,
 
234
                                         self.dbus_object_path)
235
235
        # Uppercase and remove spaces from fingerprint for later
236
236
        # comparison purposes with return value from the fingerprint()
237
237
        # function
238
 
        self.fingerprint = config["fingerprint"].upper()\
239
 
                           .replace(u" ", u"")
 
238
        self.fingerprint = (config["fingerprint"].upper()
 
239
                            .replace(u" ", u""))
240
240
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
241
241
        if "secret" in config:
242
242
            self.secret = config["secret"].decode(u"base64")
243
243
        elif "secfile" in config:
244
244
            with closing(open(os.path.expanduser
245
245
                              (os.path.expandvars
246
 
                               (config["secfile"])))) \
247
 
                               as secfile:
 
246
                               (config["secfile"])))) as secfile:
248
247
                self.secret = secfile.read()
249
248
        else:
250
249
            raise TypeError(u"No secret or secfile for client %s"
251
250
                            % self.name)
252
251
        self.host = config.get("host", "")
253
 
        self.created = datetime.datetime.now()
 
252
        self.created = datetime.datetime.utcnow()
 
253
        self.enabled = False
 
254
        self.last_enabled = None
254
255
        self.last_checked_ok = None
255
256
        self.timeout = string_to_delta(config["timeout"])
256
257
        self.interval = string_to_delta(config["interval"])
257
 
        self.stop_hook = stop_hook
 
258
        self.disable_hook = disable_hook
258
259
        self.checker = None
259
260
        self.checker_initiator_tag = None
260
 
        self.stop_initiator_tag = None
 
261
        self.disable_initiator_tag = None
261
262
        self.checker_callback_tag = None
262
 
        self.check_command = config["checker"]
263
 
    def start(self):
 
263
        self.checker_command = config["checker"]
 
264
    
 
265
    def enable(self):
264
266
        """Start this client's checker and timeout hooks"""
 
267
        self.last_enabled = datetime.datetime.utcnow()
265
268
        # Schedule a new checker to be started an 'interval' from now,
266
269
        # and every interval from then on.
267
 
        self.checker_initiator_tag = gobject.timeout_add\
268
 
                                     (self._interval_milliseconds,
269
 
                                      self.start_checker)
 
270
        self.checker_initiator_tag = (gobject.timeout_add
 
271
                                      (self.interval_milliseconds(),
 
272
                                       self.start_checker))
270
273
        # Also start a new checker *right now*.
271
274
        self.start_checker()
272
 
        # Schedule a stop() when 'timeout' has passed
273
 
        self.stop_initiator_tag = gobject.timeout_add\
274
 
                                  (self._timeout_milliseconds,
275
 
                                   self.stop)
276
 
    def stop(self):
277
 
        """Stop this client.
278
 
        The possibility that a client might be restarted is left open,
279
 
        but not currently used."""
280
 
        # If this client doesn't have a secret, it is already stopped.
281
 
        if hasattr(self, "secret") and self.secret:
282
 
            logger.info(u"Stopping client %s", self.name)
283
 
            self.secret = None
284
 
        else:
 
275
        # Schedule a disable() when 'timeout' has passed
 
276
        self.disable_initiator_tag = (gobject.timeout_add
 
277
                                   (self.timeout_milliseconds(),
 
278
                                    self.disable))
 
279
        self.enabled = True
 
280
        if self.use_dbus:
 
281
            # Emit D-Bus signals
 
282
            self.PropertyChanged(dbus.String(u"enabled"),
 
283
                                 dbus.Boolean(True, variant_level=1))
 
284
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
285
                                 (_datetime_to_dbus(self.last_enabled,
 
286
                                                    variant_level=1)))
 
287
    
 
288
    def disable(self):
 
289
        """Disable this client."""
 
290
        if not getattr(self, "enabled", False):
285
291
            return False
286
 
        if getattr(self, "stop_initiator_tag", False):
287
 
            gobject.source_remove(self.stop_initiator_tag)
288
 
            self.stop_initiator_tag = None
 
292
        logger.info(u"Disabling client %s", self.name)
 
293
        if getattr(self, "disable_initiator_tag", False):
 
294
            gobject.source_remove(self.disable_initiator_tag)
 
295
            self.disable_initiator_tag = None
289
296
        if getattr(self, "checker_initiator_tag", False):
290
297
            gobject.source_remove(self.checker_initiator_tag)
291
298
            self.checker_initiator_tag = None
292
299
        self.stop_checker()
293
 
        if self.stop_hook:
294
 
            self.stop_hook(self)
 
300
        if self.disable_hook:
 
301
            self.disable_hook(self)
 
302
        self.enabled = False
 
303
        if self.use_dbus:
 
304
            # Emit D-Bus signal
 
305
            self.PropertyChanged(dbus.String(u"enabled"),
 
306
                                 dbus.Boolean(False, variant_level=1))
295
307
        # Do not run this again if called by a gobject.timeout_add
296
308
        return False
 
309
    
297
310
    def __del__(self):
298
 
        self.stop_hook = None
299
 
        self.stop()
300
 
    def checker_callback(self, pid, condition):
 
311
        self.disable_hook = None
 
312
        self.disable()
 
313
    
 
314
    def checker_callback(self, pid, condition, command):
301
315
        """The checker has completed, so take appropriate actions."""
302
316
        self.checker_callback_tag = None
303
317
        self.checker = None
304
 
        if os.WIFEXITED(condition) \
305
 
               and (os.WEXITSTATUS(condition) == 0):
 
318
        if self.use_dbus:
 
319
            # Emit D-Bus signal
 
320
            self.PropertyChanged(dbus.String(u"checker_running"),
 
321
                                 dbus.Boolean(False, variant_level=1))
 
322
        if (os.WIFEXITED(condition)
 
323
            and (os.WEXITSTATUS(condition) == 0)):
306
324
            logger.info(u"Checker for %(name)s succeeded",
307
325
                        vars(self))
 
326
            if self.use_dbus:
 
327
                # Emit D-Bus signal
 
328
                self.CheckerCompleted(dbus.Boolean(True),
 
329
                                      dbus.UInt16(condition),
 
330
                                      dbus.String(command))
308
331
            self.bump_timeout()
309
332
        elif not os.WIFEXITED(condition):
310
333
            logger.warning(u"Checker for %(name)s crashed?",
311
334
                           vars(self))
 
335
            if self.use_dbus:
 
336
                # Emit D-Bus signal
 
337
                self.CheckerCompleted(dbus.Boolean(False),
 
338
                                      dbus.UInt16(condition),
 
339
                                      dbus.String(command))
312
340
        else:
313
341
            logger.info(u"Checker for %(name)s failed",
314
342
                        vars(self))
 
343
            if self.use_dbus:
 
344
                # Emit D-Bus signal
 
345
                self.CheckerCompleted(dbus.Boolean(False),
 
346
                                      dbus.UInt16(condition),
 
347
                                      dbus.String(command))
 
348
    
315
349
    def bump_timeout(self):
316
350
        """Bump up the timeout for this client.
317
351
        This should only be called when the client has been seen,
318
352
        alive and well.
319
353
        """
320
 
        self.last_checked_ok = datetime.datetime.now()
321
 
        gobject.source_remove(self.stop_initiator_tag)
322
 
        self.stop_initiator_tag = gobject.timeout_add\
323
 
            (self._timeout_milliseconds, self.stop)
 
354
        self.last_checked_ok = datetime.datetime.utcnow()
 
355
        gobject.source_remove(self.disable_initiator_tag)
 
356
        self.disable_initiator_tag = (gobject.timeout_add
 
357
                                      (self.timeout_milliseconds(),
 
358
                                       self.disable))
 
359
        if self.use_dbus:
 
360
            # Emit D-Bus signal
 
361
            self.PropertyChanged(
 
362
                dbus.String(u"last_checked_ok"),
 
363
                (_datetime_to_dbus(self.last_checked_ok,
 
364
                                   variant_level=1)))
 
365
    
324
366
    def start_checker(self):
325
367
        """Start a new checker subprocess if one is not running.
326
368
        If a checker already exists, leave it running and do
335
377
        # is as it should be.
336
378
        if self.checker is None:
337
379
            try:
338
 
                # In case check_command has exactly one % operator
339
 
                command = self.check_command % self.host
 
380
                # In case checker_command has exactly one % operator
 
381
                command = self.checker_command % self.host
340
382
            except TypeError:
341
383
                # Escape attributes for the shell
342
384
                escaped_attrs = dict((key, re.escape(str(val)))
343
385
                                     for key, val in
344
386
                                     vars(self).iteritems())
345
387
                try:
346
 
                    command = self.check_command % escaped_attrs
 
388
                    command = self.checker_command % escaped_attrs
347
389
                except TypeError, error:
348
390
                    logger.error(u'Could not format string "%s":'
349
 
                                 u' %s', self.check_command, error)
 
391
                                 u' %s', self.checker_command, error)
350
392
                    return True # Try again later
351
393
            try:
352
394
                logger.info(u"Starting checker %r for %s",
358
400
                self.checker = subprocess.Popen(command,
359
401
                                                close_fds=True,
360
402
                                                shell=True, cwd="/")
361
 
                self.checker_callback_tag = gobject.child_watch_add\
362
 
                                            (self.checker.pid,
363
 
                                             self.checker_callback)
 
403
                if self.use_dbus:
 
404
                    # Emit D-Bus signal
 
405
                    self.CheckerStarted(command)
 
406
                    self.PropertyChanged(
 
407
                        dbus.String("checker_running"),
 
408
                        dbus.Boolean(True, variant_level=1))
 
409
                self.checker_callback_tag = (gobject.child_watch_add
 
410
                                             (self.checker.pid,
 
411
                                              self.checker_callback,
 
412
                                              data=command))
364
413
            except OSError, error:
365
414
                logger.error(u"Failed to start subprocess: %s",
366
415
                             error)
367
416
        # Re-run this periodically if run by gobject.timeout_add
368
417
        return True
 
418
    
369
419
    def stop_checker(self):
370
420
        """Force the checker process, if any, to stop."""
371
421
        if self.checker_callback_tag:
383
433
            if error.errno != errno.ESRCH: # No such process
384
434
                raise
385
435
        self.checker = None
 
436
        if self.use_dbus:
 
437
            self.PropertyChanged(dbus.String(u"checker_running"),
 
438
                                 dbus.Boolean(False, variant_level=1))
 
439
    
386
440
    def still_valid(self):
387
441
        """Has the timeout not yet passed for this client?"""
388
 
        now = datetime.datetime.now()
 
442
        if not getattr(self, "enabled", False):
 
443
            return False
 
444
        now = datetime.datetime.utcnow()
389
445
        if self.last_checked_ok is None:
390
446
            return now < (self.created + self.timeout)
391
447
        else:
392
448
            return now < (self.last_checked_ok + self.timeout)
 
449
    
 
450
    ## D-Bus methods & signals
 
451
    _interface = u"org.mandos_system.Mandos.Client"
 
452
    
 
453
    # BumpTimeout - method
 
454
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
 
455
    BumpTimeout.__name__ = "BumpTimeout"
 
456
    
 
457
    # CheckerCompleted - signal
 
458
    @dbus.service.signal(_interface, signature="bqs")
 
459
    def CheckerCompleted(self, success, condition, command):
 
460
        "D-Bus signal"
 
461
        pass
 
462
    
 
463
    # CheckerStarted - signal
 
464
    @dbus.service.signal(_interface, signature="s")
 
465
    def CheckerStarted(self, command):
 
466
        "D-Bus signal"
 
467
        pass
 
468
    
 
469
    # GetAllProperties - method
 
470
    @dbus.service.method(_interface, out_signature="a{sv}")
 
471
    def GetAllProperties(self):
 
472
        "D-Bus method"
 
473
        return dbus.Dictionary({
 
474
                dbus.String("name"):
 
475
                    dbus.String(self.name, variant_level=1),
 
476
                dbus.String("fingerprint"):
 
477
                    dbus.String(self.fingerprint, variant_level=1),
 
478
                dbus.String("host"):
 
479
                    dbus.String(self.host, variant_level=1),
 
480
                dbus.String("created"):
 
481
                    _datetime_to_dbus(self.created, variant_level=1),
 
482
                dbus.String("last_enabled"):
 
483
                    (_datetime_to_dbus(self.last_enabled,
 
484
                                       variant_level=1)
 
485
                     if self.last_enabled is not None
 
486
                     else dbus.Boolean(False, variant_level=1)),
 
487
                dbus.String("enabled"):
 
488
                    dbus.Boolean(self.enabled, variant_level=1),
 
489
                dbus.String("last_checked_ok"):
 
490
                    (_datetime_to_dbus(self.last_checked_ok,
 
491
                                       variant_level=1)
 
492
                     if self.last_checked_ok is not None
 
493
                     else dbus.Boolean (False, variant_level=1)),
 
494
                dbus.String("timeout"):
 
495
                    dbus.UInt64(self.timeout_milliseconds(),
 
496
                                variant_level=1),
 
497
                dbus.String("interval"):
 
498
                    dbus.UInt64(self.interval_milliseconds(),
 
499
                                variant_level=1),
 
500
                dbus.String("checker"):
 
501
                    dbus.String(self.checker_command,
 
502
                                variant_level=1),
 
503
                dbus.String("checker_running"):
 
504
                    dbus.Boolean(self.checker is not None,
 
505
                                 variant_level=1),
 
506
                }, signature="sv")
 
507
    
 
508
    # IsStillValid - method
 
509
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
510
                    (still_valid))
 
511
    IsStillValid.__name__ = "IsStillValid"
 
512
    
 
513
    # PropertyChanged - signal
 
514
    @dbus.service.signal(_interface, signature="sv")
 
515
    def PropertyChanged(self, property, value):
 
516
        "D-Bus signal"
 
517
        pass
 
518
    
 
519
    # SetChecker - method
 
520
    @dbus.service.method(_interface, in_signature="s")
 
521
    def SetChecker(self, checker):
 
522
        "D-Bus setter method"
 
523
        self.checker_command = checker
 
524
        # Emit D-Bus signal
 
525
        self.PropertyChanged(dbus.String(u"checker"),
 
526
                             dbus.String(self.checker_command,
 
527
                                         variant_level=1))
 
528
    
 
529
    # SetHost - method
 
530
    @dbus.service.method(_interface, in_signature="s")
 
531
    def SetHost(self, host):
 
532
        "D-Bus setter method"
 
533
        self.host = host
 
534
        # Emit D-Bus signal
 
535
        self.PropertyChanged(dbus.String(u"host"),
 
536
                             dbus.String(self.host, variant_level=1))
 
537
    
 
538
    # SetInterval - method
 
539
    @dbus.service.method(_interface, in_signature="t")
 
540
    def SetInterval(self, milliseconds):
 
541
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
542
        # Emit D-Bus signal
 
543
        self.PropertyChanged(dbus.String(u"interval"),
 
544
                             (dbus.UInt64(self.interval_milliseconds(),
 
545
                                          variant_level=1)))
 
546
    
 
547
    # SetSecret - method
 
548
    @dbus.service.method(_interface, in_signature="ay",
 
549
                         byte_arrays=True)
 
550
    def SetSecret(self, secret):
 
551
        "D-Bus setter method"
 
552
        self.secret = str(secret)
 
553
    
 
554
    # SetTimeout - method
 
555
    @dbus.service.method(_interface, in_signature="t")
 
556
    def SetTimeout(self, milliseconds):
 
557
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
558
        # Emit D-Bus signal
 
559
        self.PropertyChanged(dbus.String(u"timeout"),
 
560
                             (dbus.UInt64(self.timeout_milliseconds(),
 
561
                                          variant_level=1)))
 
562
    
 
563
    # Enable - method
 
564
    Enable = dbus.service.method(_interface)(enable)
 
565
    Enable.__name__ = "Enable"
 
566
    
 
567
    # StartChecker - method
 
568
    @dbus.service.method(_interface)
 
569
    def StartChecker(self):
 
570
        "D-Bus method"
 
571
        self.start_checker()
 
572
    
 
573
    # Disable - method
 
574
    @dbus.service.method(_interface)
 
575
    def Disable(self):
 
576
        "D-Bus method"
 
577
        self.disable()
 
578
    
 
579
    # StopChecker - method
 
580
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
581
    StopChecker.__name__ = "StopChecker"
 
582
    
 
583
    del _interface
393
584
 
394
585
 
395
586
def peer_certificate(session):
396
587
    "Return the peer's OpenPGP certificate as a bytestring"
397
588
    # If not an OpenPGP certificate...
398
 
    if gnutls.library.functions.gnutls_certificate_type_get\
399
 
            (session._c_object) \
400
 
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
 
589
    if (gnutls.library.functions
 
590
        .gnutls_certificate_type_get(session._c_object)
 
591
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
401
592
        # ...do the normal thing
402
593
        return session.peer_certificate
403
594
    list_size = ctypes.c_uint()
404
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
405
 
        (session._c_object, ctypes.byref(list_size))
 
595
    cert_list = (gnutls.library.functions
 
596
                 .gnutls_certificate_get_peers
 
597
                 (session._c_object, ctypes.byref(list_size)))
406
598
    if list_size.value == 0:
407
599
        return None
408
600
    cert = cert_list[0]
412
604
def fingerprint(openpgp):
413
605
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
414
606
    # New GnuTLS "datum" with the OpenPGP public key
415
 
    datum = gnutls.library.types.gnutls_datum_t\
416
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
417
 
                     ctypes.POINTER(ctypes.c_ubyte)),
418
 
         ctypes.c_uint(len(openpgp)))
 
607
    datum = (gnutls.library.types
 
608
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
609
                                         ctypes.POINTER
 
610
                                         (ctypes.c_ubyte)),
 
611
                             ctypes.c_uint(len(openpgp))))
419
612
    # New empty GnuTLS certificate
420
613
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
421
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
422
 
        (ctypes.byref(crt))
 
614
    (gnutls.library.functions
 
615
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
423
616
    # Import the OpenPGP public key into the certificate
424
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
425
 
                    (crt, ctypes.byref(datum),
426
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
617
    (gnutls.library.functions
 
618
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
619
                                gnutls.library.constants
 
620
                                .GNUTLS_OPENPGP_FMT_RAW))
427
621
    # Verify the self signature in the key
428
622
    crtverify = ctypes.c_uint()
429
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
430
 
        (crt, 0, ctypes.byref(crtverify))
 
623
    (gnutls.library.functions
 
624
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
431
625
    if crtverify.value != 0:
432
626
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
433
627
        raise gnutls.errors.CertificateSecurityError("Verify failed")
435
629
    buf = ctypes.create_string_buffer(20)
436
630
    buf_len = ctypes.c_size_t()
437
631
    # Get the fingerprint from the certificate into the buffer
438
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
439
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
632
    (gnutls.library.functions
 
633
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
634
                                         ctypes.byref(buf_len)))
440
635
    # Deinit the certificate
441
636
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
442
637
    # Convert the buffer to a Python bytestring
454
649
    def handle(self):
455
650
        logger.info(u"TCP connection from: %s",
456
651
                    unicode(self.client_address))
457
 
        session = gnutls.connection.ClientSession\
458
 
                  (self.request, gnutls.connection.X509Credentials())
 
652
        session = (gnutls.connection
 
653
                   .ClientSession(self.request,
 
654
                                  gnutls.connection
 
655
                                  .X509Credentials()))
459
656
        
460
657
        line = self.request.makefile().readline()
461
658
        logger.debug(u"Protocol version: %r", line)
476
673
        #                "+DHE-DSS"))
477
674
        # Use a fallback default, since this MUST be set.
478
675
        priority = self.server.settings.get("priority", "NORMAL")
479
 
        gnutls.library.functions.gnutls_priority_set_direct\
480
 
            (session._c_object, priority, None)
 
676
        (gnutls.library.functions
 
677
         .gnutls_priority_set_direct(session._c_object,
 
678
                                     priority, None))
481
679
        
482
680
        try:
483
681
            session.handshake()
493
691
            session.bye()
494
692
            return
495
693
        logger.debug(u"Fingerprint: %s", fpr)
496
 
        client = None
497
694
        for c in self.server.clients:
498
695
            if c.fingerprint == fpr:
499
696
                client = c
500
697
                break
501
 
        if not client:
 
698
        else:
502
699
            logger.warning(u"Client not found for fingerprint: %s",
503
700
                           fpr)
504
701
            session.bye()
643
840
    elif state == avahi.ENTRY_GROUP_FAILURE:
644
841
        logger.critical(u"Avahi: Error in group state changed %s",
645
842
                        unicode(error))
646
 
        raise AvahiGroupError("State changed: %s", str(error))
 
843
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
647
844
 
648
845
def if_nametoindex(interface):
649
846
    """Call the C function if_nametoindex(), or equivalent"""
650
847
    global if_nametoindex
651
848
    try:
652
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
653
 
            (ctypes.util.find_library("c")).if_nametoindex
 
849
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
850
                          (ctypes.util.find_library("c"))
 
851
                          .if_nametoindex)
654
852
    except (OSError, AttributeError):
655
853
        if "struct" not in sys.modules:
656
854
            import struct
691
889
 
692
890
 
693
891
def main():
694
 
    parser = OptionParser(version = "%%prog %s" % version)
 
892
    parser = optparse.OptionParser(version = "%%prog %s" % version)
695
893
    parser.add_option("-i", "--interface", type="string",
696
894
                      metavar="IF", help="Bind to interface IF")
697
895
    parser.add_option("-a", "--address", type="string",
698
896
                      help="Address to listen for requests on")
699
897
    parser.add_option("-p", "--port", type="int",
700
898
                      help="Port number to receive requests on")
701
 
    parser.add_option("--check", action="store_true", default=False,
 
899
    parser.add_option("--check", action="store_true",
702
900
                      help="Run self-test")
703
901
    parser.add_option("--debug", action="store_true",
704
902
                      help="Debug mode; run in foreground and log to"
711
909
                      default="/etc/mandos", metavar="DIR",
712
910
                      help="Directory to search for configuration"
713
911
                      " files")
 
912
    parser.add_option("--no-dbus", action="store_false",
 
913
                      dest="use_dbus",
 
914
                      help=optparse.SUPPRESS_HELP)
714
915
    options = parser.parse_args()[0]
715
916
    
716
917
    if options.check:
726
927
                        "priority":
727
928
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
728
929
                        "servicename": "Mandos",
 
930
                        "use_dbus": "True",
729
931
                        }
730
932
    
731
933
    # Parse config file for server-global settings
734
936
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
735
937
    # Convert the SafeConfigParser object to a dict
736
938
    server_settings = server_config.defaults()
737
 
    # Use getboolean on the boolean config option
738
 
    server_settings["debug"] = server_config.getboolean\
739
 
                               ("DEFAULT", "debug")
 
939
    # Use getboolean on the boolean config options
 
940
    server_settings["debug"] = (server_config.getboolean
 
941
                                ("DEFAULT", "debug"))
 
942
    server_settings["use_dbus"] = (server_config.getboolean
 
943
                                   ("DEFAULT", "use_dbus"))
740
944
    del server_config
741
945
    
742
946
    # Override the settings from the config file with command line
743
947
    # options, if set.
744
948
    for option in ("interface", "address", "port", "debug",
745
 
                   "priority", "servicename", "configdir"):
 
949
                   "priority", "servicename", "configdir",
 
950
                   "use_dbus"):
746
951
        value = getattr(options, option)
747
952
        if value is not None:
748
953
            server_settings[option] = value
749
954
    del options
750
955
    # Now we have our good server settings in "server_settings"
751
956
    
 
957
    # For convenience
752
958
    debug = server_settings["debug"]
 
959
    use_dbus = server_settings["use_dbus"]
 
960
    use_dbus = False
753
961
    
754
962
    if not debug:
755
963
        syslogger.setLevel(logging.WARNING)
756
964
        console.setLevel(logging.WARNING)
757
965
    
758
966
    if server_settings["servicename"] != "Mandos":
759
 
        syslogger.setFormatter(logging.Formatter\
 
967
        syslogger.setFormatter(logging.Formatter
760
968
                               ('Mandos (%s): %%(levelname)s:'
761
969
                                ' %%(message)s'
762
970
                                % server_settings["servicename"]))
783
991
    except IOError, error:
784
992
        logger.error("Could not open file %r", pidfilename)
785
993
    
786
 
    uid = 65534
787
 
    gid = 65534
788
 
    try:
789
 
        uid = pwd.getpwnam("mandos").pw_uid
790
 
    except KeyError:
791
 
        try:
792
 
            uid = pwd.getpwnam("nobody").pw_uid
793
 
        except KeyError:
794
 
            pass
795
 
    try:
796
 
        gid = pwd.getpwnam("mandos").pw_gid
797
 
    except KeyError:
798
 
        try:
799
 
            gid = pwd.getpwnam("nogroup").pw_gid
800
 
        except KeyError:
801
 
            pass
 
994
    try:
 
995
        uid = pwd.getpwnam("_mandos").pw_uid
 
996
    except KeyError:
 
997
        try:
 
998
            uid = pwd.getpwnam("mandos").pw_uid
 
999
        except KeyError:
 
1000
            try:
 
1001
                uid = pwd.getpwnam("nobody").pw_uid
 
1002
            except KeyError:
 
1003
                uid = 65534
 
1004
    try:
 
1005
        gid = pwd.getpwnam("_mandos").pw_gid
 
1006
    except KeyError:
 
1007
        try:
 
1008
            gid = pwd.getpwnam("mandos").pw_gid
 
1009
        except KeyError:
 
1010
            try:
 
1011
                gid = pwd.getpwnam("nogroup").pw_gid
 
1012
            except KeyError:
 
1013
                gid = 65534
802
1014
    try:
803
1015
        os.setuid(uid)
804
1016
        os.setgid(gid)
810
1022
    service = AvahiService(name = server_settings["servicename"],
811
1023
                           servicetype = "_mandos._tcp", )
812
1024
    if server_settings["interface"]:
813
 
        service.interface = if_nametoindex\
814
 
                            (server_settings["interface"])
 
1025
        service.interface = (if_nametoindex
 
1026
                             (server_settings["interface"]))
815
1027
    
816
1028
    global main_loop
817
1029
    global bus
824
1036
                                           avahi.DBUS_PATH_SERVER),
825
1037
                            avahi.DBUS_INTERFACE_SERVER)
826
1038
    # End of Avahi example code
827
 
    
828
 
    def remove_from_clients(client):
829
 
        clients.remove(client)
830
 
        if not clients:
831
 
            logger.critical(u"No clients left, exiting")
832
 
            sys.exit()
 
1039
    if use_dbus:
 
1040
        bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
 
1041
                                        bus)
833
1042
    
834
1043
    clients.update(Set(Client(name = section,
835
 
                              stop_hook = remove_from_clients,
836
1044
                              config
837
 
                              = dict(client_config.items(section)))
 
1045
                              = dict(client_config.items(section)),
 
1046
                              use_dbus = use_dbus)
838
1047
                       for section in client_config.sections()))
839
1048
    if not clients:
840
 
        logger.critical(u"No clients defined")
841
 
        sys.exit(1)
 
1049
        logger.warning(u"No clients defined")
842
1050
    
843
1051
    if debug:
844
1052
        # Redirect stdin so all checkers get /dev/null
876
1084
        
877
1085
        while clients:
878
1086
            client = clients.pop()
879
 
            client.stop_hook = None
880
 
            client.stop()
 
1087
            client.disable_hook = None
 
1088
            client.disable()
881
1089
    
882
1090
    atexit.register(cleanup)
883
1091
    
886
1094
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
887
1095
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
888
1096
    
 
1097
    if use_dbus:
 
1098
        class MandosServer(dbus.service.Object):
 
1099
            """A D-Bus proxy object"""
 
1100
            def __init__(self):
 
1101
                dbus.service.Object.__init__(self, bus,
 
1102
                                             "/Mandos")
 
1103
            _interface = u"org.mandos_system.Mandos"
 
1104
 
 
1105
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1106
            def ClientAdded(self, objpath, properties):
 
1107
                "D-Bus signal"
 
1108
                pass
 
1109
 
 
1110
            @dbus.service.signal(_interface, signature="o")
 
1111
            def ClientRemoved(self, objpath):
 
1112
                "D-Bus signal"
 
1113
                pass
 
1114
 
 
1115
            @dbus.service.method(_interface, out_signature="ao")
 
1116
            def GetAllClients(self):
 
1117
                return dbus.Array(c.dbus_object_path for c in clients)
 
1118
 
 
1119
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1120
            def GetAllClientsWithProperties(self):
 
1121
                return dbus.Dictionary(
 
1122
                    ((c.dbus_object_path, c.GetAllProperties())
 
1123
                     for c in clients),
 
1124
                    signature="oa{sv}")
 
1125
 
 
1126
            @dbus.service.method(_interface, in_signature="o")
 
1127
            def RemoveClient(self, object_path):
 
1128
                for c in clients:
 
1129
                    if c.dbus_object_path == object_path:
 
1130
                        clients.remove(c)
 
1131
                        # Don't signal anything except ClientRemoved
 
1132
                        c.use_dbus = False
 
1133
                        c.disable()
 
1134
                        # Emit D-Bus signal
 
1135
                        self.ClientRemoved(object_path)
 
1136
                        return
 
1137
                raise KeyError
 
1138
            @dbus.service.method(_interface)
 
1139
            def Quit(self):
 
1140
                main_loop.quit()
 
1141
 
 
1142
            del _interface
 
1143
    
 
1144
        mandos_server = MandosServer()
 
1145
    
889
1146
    for client in clients:
890
 
        client.start()
 
1147
        if use_dbus:
 
1148
            # Emit D-Bus signal
 
1149
            mandos_server.ClientAdded(client.dbus_object_path,
 
1150
                                      client.GetAllProperties())
 
1151
        client.enable()
891
1152
    
892
1153
    tcp_server.enable()
893
1154
    tcp_server.server_activate()
911
1172
        
912
1173
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
913
1174
                             lambda *args, **kwargs:
914
 
                             tcp_server.handle_request\
915
 
                             (*args[2:], **kwargs) or True)
 
1175
                             (tcp_server.handle_request
 
1176
                              (*args[2:], **kwargs) or True))
916
1177
        
917
1178
        logger.debug(u"Starting main loop")
918
1179
        main_loop.run()
919
1180
    except AvahiError, error:
920
 
        logger.critical(u"AvahiError: %s" + unicode(error))
 
1181
        logger.critical(u"AvahiError: %s", error)
921
1182
        sys.exit(1)
922
1183
    except KeyboardInterrupt:
923
1184
        if debug: