/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-01-31 10:33:17 UTC
  • mfrom: (24.1.129 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090131103317-wzqvyr532sjcjt7u
Merge from Björn:

* mandos-ctl: New option "--remove-client".  Only default to listing
              clients if no clients were given on the command line.
* plugins.d/mandos-client.c: Lower kernel log level while bringing up
                             network interface.  New option "--delay"
                             to control the maximum delay to wait for
                             running interface.
* plugins.d/mandos-client.xml (SYNOPSIS, OPTIONS): New option
                                                   "--delay".

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
15
 
# Copyright © 2008 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
35
35
 
36
36
import SocketServer
37
37
import socket
38
 
from optparse import OptionParser
 
38
import optparse
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
66
66
import ctypes
67
67
import ctypes.util
68
68
 
69
 
version = "1.0.2"
 
69
version = "1.0.5"
70
70
 
71
71
logger = logging.Logger('mandos')
72
72
syslogger = (logging.handlers.SysLogHandler
82
82
logger.addHandler(console)
83
83
 
84
84
class AvahiError(Exception):
85
 
    def __init__(self, value):
 
85
    def __init__(self, value, *args, **kwargs):
86
86
        self.value = value
87
 
        super(AvahiError, self).__init__()
88
 
    def __str__(self):
89
 
        return repr(self.value)
 
87
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
88
    def __unicode__(self):
 
89
        return unicode(repr(self.value))
90
90
 
91
91
class AvahiServiceError(AvahiError):
92
92
    pass
129
129
            logger.critical(u"No suitable Zeroconf service name found"
130
130
                            u" after %i retries, exiting.",
131
131
                            self.rename_count)
132
 
            raise AvahiServiceError("Too many renames")
 
132
            raise AvahiServiceError(u"Too many renames")
133
133
        self.name = server.GetAlternativeServiceName(self.name)
134
134
        logger.info(u"Changing Zeroconf service name to %r ...",
135
135
                    str(self.name))
170
170
# End of Avahi example code
171
171
 
172
172
 
 
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
 
173
178
class Client(dbus.service.Object):
174
179
    """A representation of a client host served by this server.
175
180
    Attributes:
176
 
    name:      string; from the config file, used in log messages
 
181
    name:       string; from the config file, used in log messages and
 
182
                        D-Bus identifiers
177
183
    fingerprint: string (40 or 32 hexadecimal digits); used to
178
184
                 uniquely identify the client
179
 
    secret:    bytestring; sent verbatim (over TLS) to client
180
 
    host:      string; available for use by the checker command
181
 
    created:   datetime.datetime(); (UTC) object creation
182
 
    started:   datetime.datetime(); (UTC) last started
 
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()
183
190
    last_checked_ok: datetime.datetime(); (UTC) or None
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.
 
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.
191
198
    checker_initiator_tag: a gobject event source tag, or None
192
 
    stop_initiator_tag:    - '' -
 
199
    disable_initiator_tag:    - '' -
193
200
    checker_callback_tag:  - '' -
194
201
    checker_command: string; External command which is run to check if
195
202
                     client lives.  %() expansions are done at
196
203
                     runtime with vars(self) as dict, so that for
197
204
                     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: - '' -
 
205
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
206
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
203
207
    """
204
 
    def _set_timeout(self, timeout):
205
 
        "Setter function for the '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
 
        # Emit D-Bus signal
213
 
        self.TimeoutChanged(self._timeout_milliseconds)
214
 
    timeout = property(lambda self: self._timeout, _set_timeout)
215
 
    del _set_timeout
216
 
    
217
 
    def _set_interval(self, interval):
218
 
        "Setter function for the 'interval' attribute"
219
 
        self._interval = interval
220
 
        self._interval_milliseconds = ((self.interval.days
221
 
                                        * 24 * 60 * 60 * 1000)
222
 
                                       + (self.interval.seconds
223
 
                                          * 1000)
224
 
                                       + (self.interval.microseconds
225
 
                                          // 1000))
226
 
        # Emit D-Bus signal
227
 
        self.IntervalChanged(self._interval_milliseconds)
228
 
    interval = property(lambda self: self._interval, _set_interval)
229
 
    del _set_interval
230
 
    
231
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
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):
232
222
        """Note: the 'checker' key in 'config' sets the
233
223
        'checker_command' attribute and *not* the 'checker'
234
224
        attribute."""
235
 
        dbus.service.Object.__init__(self, bus,
236
 
                                     "/Mandos/clients/%s"
237
 
                                     % name.replace(".", "_"))
 
225
        self.name = name
238
226
        if config is None:
239
227
            config = {}
240
 
        self.name = name
241
228
        logger.debug(u"Creating client %r", self.name)
 
229
        self.use_dbus = False   # During __init__
242
230
        # Uppercase and remove spaces from fingerprint for later
243
231
        # comparison purposes with return value from the fingerprint()
244
232
        # function
257
245
                            % self.name)
258
246
        self.host = config.get("host", "")
259
247
        self.created = datetime.datetime.utcnow()
260
 
        self.started = None
 
248
        self.enabled = False
 
249
        self.last_enabled = None
261
250
        self.last_checked_ok = None
262
251
        self.timeout = string_to_delta(config["timeout"])
263
252
        self.interval = string_to_delta(config["interval"])
264
 
        self.stop_hook = stop_hook
 
253
        self.disable_hook = disable_hook
265
254
        self.checker = None
266
255
        self.checker_initiator_tag = None
267
 
        self.stop_initiator_tag = None
 
256
        self.disable_initiator_tag = None
268
257
        self.checker_callback_tag = None
269
 
        self.check_command = config["checker"]
 
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)
270
269
    
271
 
    def start(self):
 
270
    def enable(self):
272
271
        """Start this client's checker and timeout hooks"""
273
 
        self.started = datetime.datetime.utcnow()
 
272
        self.last_enabled = datetime.datetime.utcnow()
274
273
        # Schedule a new checker to be started an 'interval' from now,
275
274
        # and every interval from then on.
276
275
        self.checker_initiator_tag = (gobject.timeout_add
277
 
                                      (self._interval_milliseconds,
 
276
                                      (self.interval_milliseconds(),
278
277
                                       self.start_checker))
279
278
        # Also start a new checker *right now*.
280
279
        self.start_checker()
281
 
        # Schedule a stop() when 'timeout' has passed
282
 
        self.stop_initiator_tag = (gobject.timeout_add
283
 
                                   (self._timeout_milliseconds,
284
 
                                    self.stop))
285
 
        # Emit D-Bus signal
286
 
        self.StateChanged(True)
 
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)))
287
292
    
288
 
    def stop(self):
289
 
        """Stop this client."""
290
 
        if getattr(self, "started", None) is not None:
291
 
            logger.info(u"Stopping client %s", self.name)
292
 
        else:
 
293
    def disable(self):
 
294
        """Disable this client."""
 
295
        if not getattr(self, "enabled", False):
293
296
            return False
294
 
        if getattr(self, "stop_initiator_tag", False):
295
 
            gobject.source_remove(self.stop_initiator_tag)
296
 
            self.stop_initiator_tag = None
 
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
297
301
        if getattr(self, "checker_initiator_tag", False):
298
302
            gobject.source_remove(self.checker_initiator_tag)
299
303
            self.checker_initiator_tag = None
300
304
        self.stop_checker()
301
 
        if self.stop_hook:
302
 
            self.stop_hook(self)
303
 
        self.started = None
304
 
        # Emit D-Bus signal
305
 
        self.StateChanged(False)
 
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))
306
312
        # Do not run this again if called by a gobject.timeout_add
307
313
        return False
308
314
    
309
315
    def __del__(self):
310
 
        self.stop_hook = None
311
 
        self.stop()
 
316
        self.disable_hook = None
 
317
        self.disable()
312
318
    
313
 
    def checker_callback(self, pid, condition):
 
319
    def checker_callback(self, pid, condition, command):
314
320
        """The checker has completed, so take appropriate actions."""
315
321
        self.checker_callback_tag = None
316
322
        self.checker = None
317
 
        if (os.WIFEXITED(condition) 
318
 
            and (os.WEXITSTATUS(condition) == 0)):
319
 
            logger.info(u"Checker for %(name)s succeeded",
320
 
                        vars(self))
 
323
        if self.use_dbus:
321
324
            # Emit D-Bus signal
322
 
            self.CheckerCompleted(True)
323
 
            self.bump_timeout()
324
 
        elif not os.WIFEXITED(condition):
 
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:
325
342
            logger.warning(u"Checker for %(name)s crashed?",
326
343
                           vars(self))
327
 
            # Emit D-Bus signal
328
 
            self.CheckerCompleted(False)
329
 
        else:
330
 
            logger.info(u"Checker for %(name)s failed",
331
 
                        vars(self))
332
 
            # Emit D-Bus signal
333
 
            self.CheckerCompleted(False)
 
344
            if self.use_dbus:
 
345
                # Emit D-Bus signal
 
346
                self.CheckerCompleted(dbus.Int16(-1),
 
347
                                      dbus.Int64(condition),
 
348
                                      dbus.String(command))
334
349
    
335
 
    def bump_timeout(self):
 
350
    def checked_ok(self):
336
351
        """Bump up the timeout for this client.
337
352
        This should only be called when the client has been seen,
338
353
        alive and well.
339
354
        """
340
355
        self.last_checked_ok = datetime.datetime.utcnow()
341
 
        gobject.source_remove(self.stop_initiator_tag)
342
 
        self.stop_initiator_tag = (gobject.timeout_add
343
 
                                   (self._timeout_milliseconds,
344
 
                                    self.stop))
 
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)))
345
366
    
346
367
    def start_checker(self):
347
368
        """Start a new checker subprocess if one is not running.
357
378
        # is as it should be.
358
379
        if self.checker is None:
359
380
            try:
360
 
                # In case check_command has exactly one % operator
361
 
                command = self.check_command % self.host
 
381
                # In case checker_command has exactly one % operator
 
382
                command = self.checker_command % self.host
362
383
            except TypeError:
363
384
                # Escape attributes for the shell
364
385
                escaped_attrs = dict((key, re.escape(str(val)))
365
386
                                     for key, val in
366
387
                                     vars(self).iteritems())
367
388
                try:
368
 
                    command = self.check_command % escaped_attrs
 
389
                    command = self.checker_command % escaped_attrs
369
390
                except TypeError, error:
370
391
                    logger.error(u'Could not format string "%s":'
371
 
                                 u' %s', self.check_command, error)
 
392
                                 u' %s', self.checker_command, error)
372
393
                    return True # Try again later
373
394
            try:
374
395
                logger.info(u"Starting checker %r for %s",
380
401
                self.checker = subprocess.Popen(command,
381
402
                                                close_fds=True,
382
403
                                                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))
383
410
                self.checker_callback_tag = (gobject.child_watch_add
384
411
                                             (self.checker.pid,
385
 
                                              self.checker_callback))
386
 
                # Emit D-Bus signal
387
 
                self.CheckerStarted(command)
 
412
                                              self.checker_callback,
 
413
                                              data=command))
388
414
            except OSError, error:
389
415
                logger.error(u"Failed to start subprocess: %s",
390
416
                             error)
408
434
            if error.errno != errno.ESRCH: # No such process
409
435
                raise
410
436
        self.checker = None
 
437
        if self.use_dbus:
 
438
            self.PropertyChanged(dbus.String(u"checker_running"),
 
439
                                 dbus.Boolean(False, variant_level=1))
411
440
    
412
441
    def still_valid(self):
413
442
        """Has the timeout not yet passed for this client?"""
414
 
        if not self.started:
 
443
        if not getattr(self, "enabled", False):
415
444
            return False
416
445
        now = datetime.datetime.utcnow()
417
446
        if self.last_checked_ok is None:
420
449
            return now < (self.last_checked_ok + self.timeout)
421
450
    
422
451
    ## D-Bus methods & signals
423
 
    _interface = u"org.mandos_system.Mandos.Client"
424
 
    
425
 
    def _datetime_to_dbus_struct(dt):
426
 
        return dbus.Struct(dt.year, dt.month, dt.day, dt.hour,
427
 
                           dt.minute, dt.second, dt.microsecond,
428
 
                           signature="nyyyyyu")
429
 
    
430
 
    # BumpTimeout - method
431
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
432
 
    BumpTimeout.__name__ = "BumpTimeout"
433
 
    
434
 
    # IntervalChanged - signal
435
 
    @dbus.service.signal(_interface, signature="t")
436
 
    def IntervalChanged(self, t):
437
 
        "D-Bus signal"
438
 
        pass
 
452
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
453
    
 
454
    # CheckedOK - method
 
455
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
456
    CheckedOK.__name__ = "CheckedOK"
439
457
    
440
458
    # CheckerCompleted - signal
441
 
    @dbus.service.signal(_interface, signature="b")
442
 
    def CheckerCompleted(self, success):
 
459
    @dbus.service.signal(_interface, signature="nxs")
 
460
    def CheckerCompleted(self, exitcode, waitstatus, command):
443
461
        "D-Bus signal"
444
462
        pass
445
463
    
446
 
    # CheckerIsRunning - method
447
 
    @dbus.service.method(_interface, out_signature="b")
448
 
    def CheckerIsRunning(self):
449
 
        "D-Bus getter method"
450
 
        return self.checker is not None
451
 
    
452
464
    # CheckerStarted - signal
453
465
    @dbus.service.signal(_interface, signature="s")
454
466
    def CheckerStarted(self, command):
455
467
        "D-Bus signal"
456
468
        pass
457
469
    
458
 
    # GetChecker - method
459
 
    @dbus.service.method(_interface, out_signature="s")
460
 
    def GetChecker(self):
461
 
        "D-Bus getter method"
462
 
        return self.checker_command
463
 
    
464
 
    # GetCreated - method
465
 
    @dbus.service.method(_interface, out_signature="(nyyyyyu)")
466
 
    def GetCreated(self):
467
 
        "D-Bus getter method"
468
 
        return datetime_to_dbus_struct(self.created)
469
 
    
470
 
    # GetFingerprint - method
471
 
    @dbus.service.method(_interface, out_signature="s")
472
 
    def GetFingerprint(self):
473
 
        "D-Bus getter method"
474
 
        return self.fingerprint
475
 
    
476
 
    # GetHost - method
477
 
    @dbus.service.method(_interface, out_signature="s")
478
 
    def GetHost(self):
479
 
        "D-Bus getter method"
480
 
        return self.host
481
 
    
482
 
    # GetInterval - method
483
 
    @dbus.service.method(_interface, out_signature="t")
484
 
    def GetInterval(self):
485
 
        "D-Bus getter method"
486
 
        return self._interval_milliseconds
487
 
    
488
 
    # GetName - method
489
 
    @dbus.service.method(_interface, out_signature="s")
490
 
    def GetName(self):
491
 
        "D-Bus getter method"
492
 
        return self.name
493
 
    
494
 
    # GetStarted - method
495
 
    @dbus.service.method(_interface, out_signature="(nyyyyyu)")
496
 
    def GetStarted(self):
497
 
        "D-Bus getter method"
498
 
        if self.started is not None:
499
 
            return datetime_to_dbus_struct(self.started)
500
 
        else:
501
 
            return dbus.Struct(0, 0, 0, 0, 0, 0, 0,
502
 
                               signature="nyyyyyu")
503
 
    
504
 
    # GetTimeout - method
505
 
    @dbus.service.method(_interface, out_signature="t")
506
 
    def GetTimeout(self):
507
 
        "D-Bus getter method"
508
 
        return self._timeout_milliseconds
 
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
509
522
    
510
523
    # SetChecker - method
511
524
    @dbus.service.method(_interface, in_signature="s")
512
525
    def SetChecker(self, checker):
513
526
        "D-Bus setter method"
514
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))
515
532
    
516
533
    # SetHost - method
517
534
    @dbus.service.method(_interface, in_signature="s")
518
535
    def SetHost(self, host):
519
536
        "D-Bus setter method"
520
537
        self.host = host
 
538
        # Emit D-Bus signal
 
539
        self.PropertyChanged(dbus.String(u"host"),
 
540
                             dbus.String(self.host, variant_level=1))
521
541
    
522
542
    # SetInterval - method
523
543
    @dbus.service.method(_interface, in_signature="t")
524
544
    def SetInterval(self, milliseconds):
525
 
        self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
526
 
    
527
 
    # SetTimeout - method
528
 
    @dbus.service.method(_interface, in_signature="t")
529
 
    def SetTimeout(self, milliseconds):
530
 
        self.timeout = datetime.timedelta(0, 0, 0, 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)))
531
550
    
532
551
    # SetSecret - method
533
552
    @dbus.service.method(_interface, in_signature="ay",
536
555
        "D-Bus setter method"
537
556
        self.secret = str(secret)
538
557
    
539
 
    # Start - method
540
 
    Start = dbus.service.method(_interface)(start)
541
 
    Start.__name__ = "Start"
 
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"
542
570
    
543
571
    # StartChecker - method
544
 
    StartChecker = dbus.service.method(_interface)(start_checker)
545
 
    StartChecker.__name__ = "StartChecker"
546
 
    
547
 
    # StateChanged - signal
548
 
    @dbus.service.signal(_interface, signature="b")
549
 
    def StateChanged(self, started):
550
 
        "D-Bus signal"
551
 
        pass
552
 
    
553
 
    # StillValid - method
554
 
    StillValid = (dbus.service.method(_interface, out_signature="b")
555
 
                  (still_valid))
556
 
    StillValid.__name__ = "StillValid"
557
 
    
558
 
    # Stop - method
559
 
    Stop = dbus.service.method(_interface)(stop)
560
 
    Stop.__name__ = "Stop"
 
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()
561
582
    
562
583
    # StopChecker - method
563
584
    StopChecker = dbus.service.method(_interface)(stop_checker)
564
585
    StopChecker.__name__ = "StopChecker"
565
586
    
566
 
    # TimeoutChanged - signal
567
 
    @dbus.service.signal(_interface, signature="t")
568
 
    def TimeoutChanged(self, t):
569
 
        "D-Bus signal"
570
 
        pass
571
 
    
572
 
    del _datetime_to_dbus_struct
573
587
    del _interface
574
588
 
575
589
 
581
595
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
582
596
        # ...do the normal thing
583
597
        return session.peer_certificate
584
 
    list_size = ctypes.c_uint()
 
598
    list_size = ctypes.c_uint(1)
585
599
    cert_list = (gnutls.library.functions
586
600
                 .gnutls_certificate_get_peers
587
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")
588
605
    if list_size.value == 0:
589
606
        return None
590
607
    cert = cert_list[0]
674
691
            # Do not run session.bye() here: the session is not
675
692
            # established.  Just abandon the request.
676
693
            return
 
694
        logger.debug(u"Handshake succeeded")
677
695
        try:
678
696
            fpr = fingerprint(peer_certificate(session))
679
697
        except (TypeError, gnutls.errors.GNUTLSError), error:
681
699
            session.bye()
682
700
            return
683
701
        logger.debug(u"Fingerprint: %s", fpr)
 
702
        
684
703
        for c in self.server.clients:
685
704
            if c.fingerprint == fpr:
686
705
                client = c
699
718
            session.bye()
700
719
            return
701
720
        ## This won't work here, since we're in a fork.
702
 
        # client.bump_timeout()
 
721
        # client.checked_ok()
703
722
        sent_size = 0
704
723
        while sent_size < len(client.secret):
705
724
            sent = session.send(client.secret[sent_size:])
772
791
 
773
792
def string_to_delta(interval):
774
793
    """Parse a string and return a datetime.timedelta
775
 
 
 
794
    
776
795
    >>> string_to_delta('7d')
777
796
    datetime.timedelta(7)
778
797
    >>> string_to_delta('60s')
830
849
    elif state == avahi.ENTRY_GROUP_FAILURE:
831
850
        logger.critical(u"Avahi: Error in group state changed %s",
832
851
                        unicode(error))
833
 
        raise AvahiGroupError("State changed: %s", str(error))
 
852
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
834
853
 
835
854
def if_nametoindex(interface):
836
855
    """Call the C function if_nametoindex(), or equivalent"""
879
898
 
880
899
 
881
900
def main():
882
 
    parser = OptionParser(version = "%%prog %s" % version)
 
901
    parser = optparse.OptionParser(version = "%%prog %s" % version)
883
902
    parser.add_option("-i", "--interface", type="string",
884
903
                      metavar="IF", help="Bind to interface IF")
885
904
    parser.add_option("-a", "--address", type="string",
886
905
                      help="Address to listen for requests on")
887
906
    parser.add_option("-p", "--port", type="int",
888
907
                      help="Port number to receive requests on")
889
 
    parser.add_option("--check", action="store_true", default=False,
 
908
    parser.add_option("--check", action="store_true",
890
909
                      help="Run self-test")
891
910
    parser.add_option("--debug", action="store_true",
892
911
                      help="Debug mode; run in foreground and log to"
899
918
                      default="/etc/mandos", metavar="DIR",
900
919
                      help="Directory to search for configuration"
901
920
                      " files")
 
921
    parser.add_option("--no-dbus", action="store_false",
 
922
                      dest="use_dbus",
 
923
                      help="Do not provide D-Bus system bus"
 
924
                      " interface")
902
925
    options = parser.parse_args()[0]
903
926
    
904
927
    if options.check:
914
937
                        "priority":
915
938
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
916
939
                        "servicename": "Mandos",
 
940
                        "use_dbus": "True",
917
941
                        }
918
942
    
919
943
    # Parse config file for server-global settings
922
946
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
923
947
    # Convert the SafeConfigParser object to a dict
924
948
    server_settings = server_config.defaults()
925
 
    # Use getboolean on the boolean config option
926
 
    server_settings["debug"] = (server_config.getboolean
927
 
                                ("DEFAULT", "debug"))
 
949
    # Use the appropriate methods on the non-string config options
 
950
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
951
                                                        "debug")
 
952
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
953
                                                           "use_dbus")
 
954
    if server_settings["port"]:
 
955
        server_settings["port"] = server_config.getint("DEFAULT",
 
956
                                                       "port")
928
957
    del server_config
929
958
    
930
959
    # Override the settings from the config file with command line
931
960
    # options, if set.
932
961
    for option in ("interface", "address", "port", "debug",
933
 
                   "priority", "servicename", "configdir"):
 
962
                   "priority", "servicename", "configdir",
 
963
                   "use_dbus"):
934
964
        value = getattr(options, option)
935
965
        if value is not None:
936
966
            server_settings[option] = value
937
967
    del options
938
968
    # Now we have our good server settings in "server_settings"
939
969
    
 
970
    # For convenience
940
971
    debug = server_settings["debug"]
 
972
    use_dbus = server_settings["use_dbus"]
 
973
 
 
974
    def sigsegvhandler(signum, frame):
 
975
        raise RuntimeError('Segmentation fault')
941
976
    
942
977
    if not debug:
943
978
        syslogger.setLevel(logging.WARNING)
944
979
        console.setLevel(logging.WARNING)
 
980
    else:
 
981
        signal.signal(signal.SIGSEGV, sigsegvhandler)
945
982
    
946
983
    if server_settings["servicename"] != "Mandos":
947
984
        syslogger.setFormatter(logging.Formatter
952
989
    # Parse config file with clients
953
990
    client_defaults = { "timeout": "1h",
954
991
                        "interval": "5m",
955
 
                        "checker": "fping -q -- %(host)s",
 
992
                        "checker": "fping -q -- %%(host)s",
956
993
                        "host": "",
957
994
                        }
958
995
    client_config = ConfigParser.SafeConfigParser(client_defaults)
971
1008
    except IOError, error:
972
1009
        logger.error("Could not open file %r", pidfilename)
973
1010
    
974
 
    uid = 65534
975
 
    gid = 65534
976
 
    try:
977
 
        uid = pwd.getpwnam("mandos").pw_uid
978
 
    except KeyError:
979
 
        try:
980
 
            uid = pwd.getpwnam("nobody").pw_uid
981
 
        except KeyError:
982
 
            pass
983
 
    try:
984
 
        gid = pwd.getpwnam("mandos").pw_gid
985
 
    except KeyError:
986
 
        try:
987
 
            gid = pwd.getpwnam("nogroup").pw_gid
988
 
        except KeyError:
989
 
            pass
990
 
    try:
 
1011
    try:
 
1012
        uid = pwd.getpwnam("_mandos").pw_uid
 
1013
        gid = pwd.getpwnam("_mandos").pw_gid
 
1014
    except KeyError:
 
1015
        try:
 
1016
            uid = pwd.getpwnam("mandos").pw_uid
 
1017
            gid = pwd.getpwnam("mandos").pw_gid
 
1018
        except KeyError:
 
1019
            try:
 
1020
                uid = pwd.getpwnam("nobody").pw_uid
 
1021
                gid = pwd.getpwnam("nogroup").pw_gid
 
1022
            except KeyError:
 
1023
                uid = 65534
 
1024
                gid = 65534
 
1025
    try:
 
1026
        os.setgid(gid)
991
1027
        os.setuid(uid)
992
 
        os.setgid(gid)
993
1028
    except OSError, error:
994
1029
        if error[0] != errno.EPERM:
995
1030
            raise error
996
1031
    
 
1032
    # Enable all possible GnuTLS debugging
 
1033
    if debug:
 
1034
        # "Use a log level over 10 to enable all debugging options."
 
1035
        # - GnuTLS manual
 
1036
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1037
        
 
1038
        @gnutls.library.types.gnutls_log_func
 
1039
        def debug_gnutls(level, string):
 
1040
            logger.debug("GnuTLS: %s", string[:-1])
 
1041
        
 
1042
        (gnutls.library.functions
 
1043
         .gnutls_global_set_log_function(debug_gnutls))
 
1044
    
997
1045
    global service
998
1046
    service = AvahiService(name = server_settings["servicename"],
999
1047
                           servicetype = "_mandos._tcp", )
1012
1060
                                           avahi.DBUS_PATH_SERVER),
1013
1061
                            avahi.DBUS_INTERFACE_SERVER)
1014
1062
    # End of Avahi example code
1015
 
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
1016
 
    
1017
 
    def remove_from_clients(client):
1018
 
        clients.remove(client)
1019
 
        if not clients:
1020
 
            logger.critical(u"No clients left, exiting")
1021
 
            sys.exit()
 
1063
    if use_dbus:
 
1064
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1022
1065
    
1023
1066
    clients.update(Set(Client(name = section,
1024
 
                              stop_hook = remove_from_clients,
1025
1067
                              config
1026
 
                              = dict(client_config.items(section)))
 
1068
                              = dict(client_config.items(section)),
 
1069
                              use_dbus = use_dbus)
1027
1070
                       for section in client_config.sections()))
1028
1071
    if not clients:
1029
 
        logger.critical(u"No clients defined")
1030
 
        sys.exit(1)
 
1072
        logger.warning(u"No clients defined")
1031
1073
    
1032
1074
    if debug:
1033
1075
        # Redirect stdin so all checkers get /dev/null
1065
1107
        
1066
1108
        while clients:
1067
1109
            client = clients.pop()
1068
 
            client.stop_hook = None
1069
 
            client.stop()
 
1110
            client.disable_hook = None
 
1111
            client.disable()
1070
1112
    
1071
1113
    atexit.register(cleanup)
1072
1114
    
1075
1117
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1076
1118
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1077
1119
    
 
1120
    if use_dbus:
 
1121
        class MandosServer(dbus.service.Object):
 
1122
            """A D-Bus proxy object"""
 
1123
            def __init__(self):
 
1124
                dbus.service.Object.__init__(self, bus, "/")
 
1125
            _interface = u"se.bsnet.fukt.Mandos"
 
1126
            
 
1127
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1128
            def ClientAdded(self, objpath, properties):
 
1129
                "D-Bus signal"
 
1130
                pass
 
1131
            
 
1132
            @dbus.service.signal(_interface, signature="os")
 
1133
            def ClientRemoved(self, objpath, name):
 
1134
                "D-Bus signal"
 
1135
                pass
 
1136
            
 
1137
            @dbus.service.method(_interface, out_signature="ao")
 
1138
            def GetAllClients(self):
 
1139
                "D-Bus method"
 
1140
                return dbus.Array(c.dbus_object_path for c in clients)
 
1141
            
 
1142
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1143
            def GetAllClientsWithProperties(self):
 
1144
                "D-Bus method"
 
1145
                return dbus.Dictionary(
 
1146
                    ((c.dbus_object_path, c.GetAllProperties())
 
1147
                     for c in clients),
 
1148
                    signature="oa{sv}")
 
1149
            
 
1150
            @dbus.service.method(_interface, in_signature="o")
 
1151
            def RemoveClient(self, object_path):
 
1152
                "D-Bus method"
 
1153
                for c in clients:
 
1154
                    if c.dbus_object_path == object_path:
 
1155
                        clients.remove(c)
 
1156
                        # Don't signal anything except ClientRemoved
 
1157
                        c.use_dbus = False
 
1158
                        c.disable()
 
1159
                        # Emit D-Bus signal
 
1160
                        self.ClientRemoved(object_path, c.name)
 
1161
                        return
 
1162
                raise KeyError
 
1163
            
 
1164
            del _interface
 
1165
        
 
1166
        mandos_server = MandosServer()
 
1167
    
1078
1168
    for client in clients:
1079
 
        client.start()
 
1169
        if use_dbus:
 
1170
            # Emit D-Bus signal
 
1171
            mandos_server.ClientAdded(client.dbus_object_path,
 
1172
                                      client.GetAllProperties())
 
1173
        client.enable()
1080
1174
    
1081
1175
    tcp_server.enable()
1082
1176
    tcp_server.server_activate()
1106
1200
        logger.debug(u"Starting main loop")
1107
1201
        main_loop.run()
1108
1202
    except AvahiError, error:
1109
 
        logger.critical(u"AvahiError: %s" + unicode(error))
 
1203
        logger.critical(u"AvahiError: %s", error)
1110
1204
        sys.exit(1)
1111
1205
    except KeyboardInterrupt:
1112
1206
        if debug: