/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-09-26 21:54:54 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080926215454-7kfrl0gxmisz71gw
* mandos: Remove unused "select" module.  Import "ctypes.util".
  (AvahiError.__init__): Call __init__ of superclass.
  (AvahiService.__init__): Rename keyword arg "type" to "servicetype".
  (AvahiService.rename): Bug fix: use "self.rename_count".
  (Client.__init__): Use "None" instead of "{}" as default value.
  (tcp_handler): Renamed to "TCP_handler".  All callers changed.
  (IPv6_TCPServer.__init__): Don't "return", just call the superclass
                             method.
  (if_nametoindex): Don't import "ctypes.util" here.
  (main): Removed unused variable "main_loop_started".

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 © 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
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
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
64
import ctypes.util
68
65
 
69
 
version = "1.0.5"
 
66
version = "1.0"
70
67
 
71
68
logger = logging.Logger('mandos')
72
 
syslogger = (logging.handlers.SysLogHandler
73
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
 
              address = "/dev/log"))
75
 
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos: %(levelname)s: %(message)s'))
 
69
syslogger = logging.handlers.SysLogHandler\
 
70
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
71
             address = "/dev/log")
 
72
syslogger.setFormatter(logging.Formatter\
 
73
                        ('Mandos: %(levelname)s: %(message)s'))
77
74
logger.addHandler(syslogger)
78
75
 
79
76
console = logging.StreamHandler()
82
79
logger.addHandler(console)
83
80
 
84
81
class AvahiError(Exception):
85
 
    def __init__(self, value, *args, **kwargs):
 
82
    def __init__(self, value):
86
83
        self.value = value
87
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
88
 
    def __unicode__(self):
89
 
        return unicode(repr(self.value))
 
84
        super(AvahiError, self).__init__()
 
85
    def __str__(self):
 
86
        return repr(self.value)
90
87
 
91
88
class AvahiServiceError(AvahiError):
92
89
    pass
112
109
                  a sensible number of times
113
110
    """
114
111
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
 
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
112
                 servicetype = None, port = None, TXT = None, domain = "",
 
113
                 host = "", max_renames = 32768):
117
114
        self.interface = interface
118
115
        self.name = name
119
116
        self.type = servicetype
120
117
        self.port = port
121
 
        self.TXT = TXT if TXT is not None else []
 
118
        if TXT is None:
 
119
            self.TXT = []
 
120
        else:
 
121
            self.TXT = TXT
122
122
        self.domain = domain
123
123
        self.host = host
124
124
        self.rename_count = 0
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(u"Too many renames")
 
132
            raise AvahiServiceError("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))
136
 
        syslogger.setFormatter(logging.Formatter
 
136
        syslogger.setFormatter(logging.Formatter\
137
137
                               ('Mandos (%s): %%(levelname)s:'
138
 
                                ' %%(message)s' % self.name))
 
138
                               ' %%(message)s' % self.name))
139
139
        self.remove()
140
140
        self.add()
141
141
        self.rename_count += 1
147
147
        """Derived from the Avahi example code"""
148
148
        global group
149
149
        if group is None:
150
 
            group = dbus.Interface(bus.get_object
151
 
                                   (avahi.DBUS_NAME,
 
150
            group = dbus.Interface\
 
151
                    (bus.get_object(avahi.DBUS_NAME,
152
152
                                    server.EntryGroupNew()),
153
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
154
            group.connect_to_signal('StateChanged',
155
155
                                    entry_group_state_changed)
156
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
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
 
 
178
 
class Client(dbus.service.Object):
 
173
class Client(object):
179
174
    """A representation of a client host served by this server.
180
175
    Attributes:
181
 
    name:       string; from the config file, used in log messages and
182
 
                        D-Bus identifiers
 
176
    name:      string; from the config file, used in log messages
183
177
    fingerprint: string (40 or 32 hexadecimal digits); used to
184
178
                 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.
 
179
    secret:    bytestring; sent verbatim (over TLS) to client
 
180
    host:      string; available for use by the checker command
 
181
    created:   datetime.datetime(); object creation, not client host
 
182
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
183
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
184
                                     until this client is invalid
 
185
    interval:  datetime.timedelta(); How often to start a new checker
 
186
    stop_hook: If set, called by stop() as stop_hook(self)
 
187
    checker:   subprocess.Popen(); a running checker process used
 
188
                                   to see if the client lives.
 
189
                                   'None' if no process is running.
198
190
    checker_initiator_tag: a gobject event source tag, or None
199
 
    disable_initiator_tag:    - '' -
 
191
    stop_initiator_tag:    - '' -
200
192
    checker_callback_tag:  - '' -
201
193
    checker_command: string; External command which is run to check if
202
194
                     client lives.  %() expansions are done at
203
195
                     runtime with vars(self) as dict, so that for
204
196
                     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
 
197
    Private attibutes:
 
198
    _timeout: Real variable for 'timeout'
 
199
    _interval: Real variable for 'interval'
 
200
    _timeout_milliseconds: Used when calling gobject.timeout_add()
 
201
    _interval_milliseconds: - '' -
207
202
    """
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):
 
203
    def _set_timeout(self, timeout):
 
204
        "Setter function for 'timeout' attribute"
 
205
        self._timeout = timeout
 
206
        self._timeout_milliseconds = ((self.timeout.days
 
207
                                       * 24 * 60 * 60 * 1000)
 
208
                                      + (self.timeout.seconds * 1000)
 
209
                                      + (self.timeout.microseconds
 
210
                                         // 1000))
 
211
    timeout = property(lambda self: self._timeout,
 
212
                       _set_timeout)
 
213
    del _set_timeout
 
214
    def _set_interval(self, interval):
 
215
        "Setter function for 'interval' attribute"
 
216
        self._interval = interval
 
217
        self._interval_milliseconds = ((self.interval.days
 
218
                                        * 24 * 60 * 60 * 1000)
 
219
                                       + (self.interval.seconds
 
220
                                          * 1000)
 
221
                                       + (self.interval.microseconds
 
222
                                          // 1000))
 
223
    interval = property(lambda self: self._interval,
 
224
                        _set_interval)
 
225
    del _set_interval
 
226
    def __init__(self, name = None, stop_hook=None, config=None):
222
227
        """Note: the 'checker' key in 'config' sets the
223
228
        'checker_command' attribute and *not* the 'checker'
224
229
        attribute."""
225
 
        self.name = name
226
230
        if config is None:
227
231
            config = {}
 
232
        self.name = name
228
233
        logger.debug(u"Creating client %r", self.name)
229
 
        self.use_dbus = use_dbus
230
 
        if self.use_dbus:
231
 
            self.dbus_object_path = (dbus.ObjectPath
232
 
                                     ("/Mandos/clients/"
233
 
                                      + self.name.replace(".", "_")))
234
 
            dbus.service.Object.__init__(self, bus,
235
 
                                         self.dbus_object_path)
236
234
        # Uppercase and remove spaces from fingerprint for later
237
235
        # comparison purposes with return value from the fingerprint()
238
236
        # function
239
 
        self.fingerprint = (config["fingerprint"].upper()
240
 
                            .replace(u" ", u""))
 
237
        self.fingerprint = config["fingerprint"].upper()\
 
238
                           .replace(u" ", u"")
241
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
242
240
        if "secret" in config:
243
241
            self.secret = config["secret"].decode(u"base64")
244
242
        elif "secfile" in config:
245
 
            with closing(open(os.path.expanduser
246
 
                              (os.path.expandvars
247
 
                               (config["secfile"])))) as secfile:
248
 
                self.secret = secfile.read()
 
243
            secfile = open(config["secfile"])
 
244
            self.secret = secfile.read()
 
245
            secfile.close()
249
246
        else:
250
247
            raise TypeError(u"No secret or secfile for client %s"
251
248
                            % self.name)
252
249
        self.host = config.get("host", "")
253
 
        self.created = datetime.datetime.utcnow()
254
 
        self.enabled = False
255
 
        self.last_enabled = None
 
250
        self.created = datetime.datetime.now()
256
251
        self.last_checked_ok = None
257
252
        self.timeout = string_to_delta(config["timeout"])
258
253
        self.interval = string_to_delta(config["interval"])
259
 
        self.disable_hook = disable_hook
 
254
        self.stop_hook = stop_hook
260
255
        self.checker = None
261
256
        self.checker_initiator_tag = None
262
 
        self.disable_initiator_tag = None
 
257
        self.stop_initiator_tag = None
263
258
        self.checker_callback_tag = None
264
 
        self.checker_command = config["checker"]
265
 
    
266
 
    def enable(self):
 
259
        self.check_command = config["checker"]
 
260
    def start(self):
267
261
        """Start this client's checker and timeout hooks"""
268
 
        self.last_enabled = datetime.datetime.utcnow()
269
262
        # Schedule a new checker to be started an 'interval' from now,
270
263
        # and every interval from then on.
271
 
        self.checker_initiator_tag = (gobject.timeout_add
272
 
                                      (self.interval_milliseconds(),
273
 
                                       self.start_checker))
 
264
        self.checker_initiator_tag = gobject.timeout_add\
 
265
                                     (self._interval_milliseconds,
 
266
                                      self.start_checker)
274
267
        # Also start a new checker *right now*.
275
268
        self.start_checker()
276
 
        # Schedule a disable() when 'timeout' has passed
277
 
        self.disable_initiator_tag = (gobject.timeout_add
278
 
                                   (self.timeout_milliseconds(),
279
 
                                    self.disable))
280
 
        self.enabled = True
281
 
        if self.use_dbus:
282
 
            # Emit D-Bus signals
283
 
            self.PropertyChanged(dbus.String(u"enabled"),
284
 
                                 dbus.Boolean(True, variant_level=1))
285
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
286
 
                                 (_datetime_to_dbus(self.last_enabled,
287
 
                                                    variant_level=1)))
288
 
    
289
 
    def disable(self):
290
 
        """Disable this client."""
291
 
        if not getattr(self, "enabled", False):
 
269
        # Schedule a stop() when 'timeout' has passed
 
270
        self.stop_initiator_tag = gobject.timeout_add\
 
271
                                  (self._timeout_milliseconds,
 
272
                                   self.stop)
 
273
    def stop(self):
 
274
        """Stop this client.
 
275
        The possibility that a client might be restarted is left open,
 
276
        but not currently used."""
 
277
        # If this client doesn't have a secret, it is already stopped.
 
278
        if hasattr(self, "secret") and self.secret:
 
279
            logger.info(u"Stopping client %s", self.name)
 
280
            self.secret = None
 
281
        else:
292
282
            return False
293
 
        logger.info(u"Disabling client %s", self.name)
294
 
        if getattr(self, "disable_initiator_tag", False):
295
 
            gobject.source_remove(self.disable_initiator_tag)
296
 
            self.disable_initiator_tag = None
 
283
        if getattr(self, "stop_initiator_tag", False):
 
284
            gobject.source_remove(self.stop_initiator_tag)
 
285
            self.stop_initiator_tag = None
297
286
        if getattr(self, "checker_initiator_tag", False):
298
287
            gobject.source_remove(self.checker_initiator_tag)
299
288
            self.checker_initiator_tag = None
300
289
        self.stop_checker()
301
 
        if self.disable_hook:
302
 
            self.disable_hook(self)
303
 
        self.enabled = False
304
 
        if self.use_dbus:
305
 
            # Emit D-Bus signal
306
 
            self.PropertyChanged(dbus.String(u"enabled"),
307
 
                                 dbus.Boolean(False, variant_level=1))
 
290
        if self.stop_hook:
 
291
            self.stop_hook(self)
308
292
        # Do not run this again if called by a gobject.timeout_add
309
293
        return False
310
 
    
311
294
    def __del__(self):
312
 
        self.disable_hook = None
313
 
        self.disable()
314
 
    
315
 
    def checker_callback(self, pid, condition, command):
 
295
        self.stop_hook = None
 
296
        self.stop()
 
297
    def checker_callback(self, pid, condition):
316
298
        """The checker has completed, so take appropriate actions."""
 
299
        now = datetime.datetime.now()
317
300
        self.checker_callback_tag = None
318
301
        self.checker = None
319
 
        if self.use_dbus:
320
 
            # Emit D-Bus signal
321
 
            self.PropertyChanged(dbus.String(u"checker_running"),
322
 
                                 dbus.Boolean(False, variant_level=1))
323
 
        if (os.WIFEXITED(condition)
324
 
            and (os.WEXITSTATUS(condition) == 0)):
 
302
        if os.WIFEXITED(condition) \
 
303
               and (os.WEXITSTATUS(condition) == 0):
325
304
            logger.info(u"Checker for %(name)s succeeded",
326
305
                        vars(self))
327
 
            if self.use_dbus:
328
 
                # Emit D-Bus signal
329
 
                self.CheckerCompleted(dbus.Boolean(True),
330
 
                                      dbus.UInt16(condition),
331
 
                                      dbus.String(command))
332
 
            self.bump_timeout()
 
306
            self.last_checked_ok = now
 
307
            gobject.source_remove(self.stop_initiator_tag)
 
308
            self.stop_initiator_tag = gobject.timeout_add\
 
309
                                      (self._timeout_milliseconds,
 
310
                                       self.stop)
333
311
        elif not os.WIFEXITED(condition):
334
312
            logger.warning(u"Checker for %(name)s crashed?",
335
313
                           vars(self))
336
 
            if self.use_dbus:
337
 
                # Emit D-Bus signal
338
 
                self.CheckerCompleted(dbus.Boolean(False),
339
 
                                      dbus.UInt16(condition),
340
 
                                      dbus.String(command))
341
314
        else:
342
315
            logger.info(u"Checker for %(name)s failed",
343
316
                        vars(self))
344
 
            if self.use_dbus:
345
 
                # Emit D-Bus signal
346
 
                self.CheckerCompleted(dbus.Boolean(False),
347
 
                                      dbus.UInt16(condition),
348
 
                                      dbus.String(command))
349
 
    
350
 
    def bump_timeout(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
 
    
367
317
    def start_checker(self):
368
318
        """Start a new checker subprocess if one is not running.
369
319
        If a checker already exists, leave it running and do
378
328
        # is as it should be.
379
329
        if self.checker is None:
380
330
            try:
381
 
                # In case checker_command has exactly one % operator
382
 
                command = self.checker_command % self.host
 
331
                # In case check_command has exactly one % operator
 
332
                command = self.check_command % self.host
383
333
            except TypeError:
384
334
                # Escape attributes for the shell
385
335
                escaped_attrs = dict((key, re.escape(str(val)))
386
336
                                     for key, val in
387
337
                                     vars(self).iteritems())
388
338
                try:
389
 
                    command = self.checker_command % escaped_attrs
 
339
                    command = self.check_command % escaped_attrs
390
340
                except TypeError, error:
391
341
                    logger.error(u'Could not format string "%s":'
392
 
                                 u' %s', self.checker_command, error)
 
342
                                 u' %s', self.check_command, error)
393
343
                    return True # Try again later
394
344
            try:
395
345
                logger.info(u"Starting checker %r for %s",
401
351
                self.checker = subprocess.Popen(command,
402
352
                                                close_fds=True,
403
353
                                                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))
 
354
                self.checker_callback_tag = gobject.child_watch_add\
 
355
                                            (self.checker.pid,
 
356
                                             self.checker_callback)
414
357
            except OSError, error:
415
358
                logger.error(u"Failed to start subprocess: %s",
416
359
                             error)
417
360
        # Re-run this periodically if run by gobject.timeout_add
418
361
        return True
419
 
    
420
362
    def stop_checker(self):
421
363
        """Force the checker process, if any, to stop."""
422
364
        if self.checker_callback_tag:
434
376
            if error.errno != errno.ESRCH: # No such process
435
377
                raise
436
378
        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
379
    def still_valid(self):
442
380
        """Has the timeout not yet passed for this client?"""
443
 
        if not getattr(self, "enabled", False):
444
 
            return False
445
 
        now = datetime.datetime.utcnow()
 
381
        now = datetime.datetime.now()
446
382
        if self.last_checked_ok is None:
447
383
            return now < (self.created + self.timeout)
448
384
        else:
449
385
            return now < (self.last_checked_ok + self.timeout)
450
 
    
451
 
    ## D-Bus methods & signals
452
 
    _interface = u"org.mandos_system.Mandos.Client"
453
 
    
454
 
    # BumpTimeout - method
455
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
456
 
    BumpTimeout.__name__ = "BumpTimeout"
457
 
    
458
 
    # CheckerCompleted - signal
459
 
    @dbus.service.signal(_interface, signature="bqs")
460
 
    def CheckerCompleted(self, success, condition, 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
386
 
589
387
 
590
388
def peer_certificate(session):
591
389
    "Return the peer's OpenPGP certificate as a bytestring"
592
390
    # 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):
 
391
    if gnutls.library.functions.gnutls_certificate_type_get\
 
392
            (session._c_object) \
 
393
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
596
394
        # ...do the normal thing
597
395
        return session.peer_certificate
598
396
    list_size = ctypes.c_uint()
599
 
    cert_list = (gnutls.library.functions
600
 
                 .gnutls_certificate_get_peers
601
 
                 (session._c_object, ctypes.byref(list_size)))
 
397
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
398
        (session._c_object, ctypes.byref(list_size))
602
399
    if list_size.value == 0:
603
400
        return None
604
401
    cert = cert_list[0]
608
405
def fingerprint(openpgp):
609
406
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
610
407
    # New GnuTLS "datum" with the OpenPGP public key
611
 
    datum = (gnutls.library.types
612
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
613
 
                                         ctypes.POINTER
614
 
                                         (ctypes.c_ubyte)),
615
 
                             ctypes.c_uint(len(openpgp))))
 
408
    datum = gnutls.library.types.gnutls_datum_t\
 
409
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
410
                     ctypes.POINTER(ctypes.c_ubyte)),
 
411
         ctypes.c_uint(len(openpgp)))
616
412
    # New empty GnuTLS certificate
617
413
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
618
 
    (gnutls.library.functions
619
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
414
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
415
        (ctypes.byref(crt))
620
416
    # Import the OpenPGP public key into the certificate
621
 
    (gnutls.library.functions
622
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
623
 
                                gnutls.library.constants
624
 
                                .GNUTLS_OPENPGP_FMT_RAW))
 
417
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
418
                    (crt, ctypes.byref(datum),
 
419
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
625
420
    # Verify the self signature in the key
626
421
    crtverify = ctypes.c_uint()
627
 
    (gnutls.library.functions
628
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
422
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
423
        (crt, 0, ctypes.byref(crtverify))
629
424
    if crtverify.value != 0:
630
425
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
631
426
        raise gnutls.errors.CertificateSecurityError("Verify failed")
633
428
    buf = ctypes.create_string_buffer(20)
634
429
    buf_len = ctypes.c_size_t()
635
430
    # Get the fingerprint from the certificate into the buffer
636
 
    (gnutls.library.functions
637
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
638
 
                                         ctypes.byref(buf_len)))
 
431
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
432
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
639
433
    # Deinit the certificate
640
434
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
641
435
    # Convert the buffer to a Python bytestring
652
446
    
653
447
    def handle(self):
654
448
        logger.info(u"TCP connection from: %s",
655
 
                    unicode(self.client_address))
656
 
        session = (gnutls.connection
657
 
                   .ClientSession(self.request,
658
 
                                  gnutls.connection
659
 
                                  .X509Credentials()))
 
449
                     unicode(self.client_address))
 
450
        session = gnutls.connection.ClientSession\
 
451
                  (self.request, gnutls.connection.X509Credentials())
660
452
        
661
453
        line = self.request.makefile().readline()
662
454
        logger.debug(u"Protocol version: %r", line)
675
467
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
676
468
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
677
469
        #                "+DHE-DSS"))
678
 
        # Use a fallback default, since this MUST be set.
679
 
        priority = self.server.settings.get("priority", "NORMAL")
680
 
        (gnutls.library.functions
681
 
         .gnutls_priority_set_direct(session._c_object,
682
 
                                     priority, None))
 
470
        priority = "NORMAL"             # Fallback default, since this
 
471
                                        # MUST be set.
 
472
        if self.server.settings["priority"]:
 
473
            priority = self.server.settings["priority"]
 
474
        gnutls.library.functions.gnutls_priority_set_direct\
 
475
            (session._c_object, priority, None)
683
476
        
684
477
        try:
685
478
            session.handshake()
695
488
            session.bye()
696
489
            return
697
490
        logger.debug(u"Fingerprint: %s", fpr)
 
491
        client = None
698
492
        for c in self.server.clients:
699
493
            if c.fingerprint == fpr:
700
494
                client = c
701
495
                break
702
 
        else:
 
496
        if not client:
703
497
            logger.warning(u"Client not found for fingerprint: %s",
704
498
                           fpr)
705
499
            session.bye()
712
506
                           vars(client))
713
507
            session.bye()
714
508
            return
715
 
        ## This won't work here, since we're in a fork.
716
 
        # client.bump_timeout()
717
509
        sent_size = 0
718
510
        while sent_size < len(client.secret):
719
511
            sent = session.send(client.secret[sent_size:])
724
516
        session.bye()
725
517
 
726
518
 
727
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
728
 
                     SocketServer.TCPServer, object):
 
519
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
729
520
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
730
521
    Attributes:
731
522
        settings:       Server settings
844
635
    elif state == avahi.ENTRY_GROUP_FAILURE:
845
636
        logger.critical(u"Avahi: Error in group state changed %s",
846
637
                        unicode(error))
847
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
638
        raise AvahiGroupError("State changed: %s", str(error))
848
639
 
849
640
def if_nametoindex(interface):
850
641
    """Call the C function if_nametoindex(), or equivalent"""
851
642
    global if_nametoindex
852
643
    try:
853
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
854
 
                          (ctypes.util.find_library("c"))
855
 
                          .if_nametoindex)
 
644
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
645
            (ctypes.util.find_library("c")).if_nametoindex
856
646
    except (OSError, AttributeError):
857
647
        if "struct" not in sys.modules:
858
648
            import struct
861
651
        def if_nametoindex(interface):
862
652
            "Get an interface index the hard way, i.e. using fcntl()"
863
653
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
864
 
            with closing(socket.socket()) as s:
865
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
866
 
                                    struct.pack("16s16x", interface))
 
654
            s = socket.socket()
 
655
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
656
                                struct.pack("16s16x", interface))
 
657
            s.close()
867
658
            interface_index = struct.unpack("I", ifreq[16:20])[0]
868
659
            return interface_index
869
660
    return if_nametoindex(interface)
893
684
 
894
685
 
895
686
def main():
896
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
687
    parser = OptionParser(version = "%%prog %s" % version)
897
688
    parser.add_option("-i", "--interface", type="string",
898
689
                      metavar="IF", help="Bind to interface IF")
899
690
    parser.add_option("-a", "--address", type="string",
900
691
                      help="Address to listen for requests on")
901
692
    parser.add_option("-p", "--port", type="int",
902
693
                      help="Port number to receive requests on")
903
 
    parser.add_option("--check", action="store_true",
 
694
    parser.add_option("--check", action="store_true", default=False,
904
695
                      help="Run self-test")
905
696
    parser.add_option("--debug", action="store_true",
906
697
                      help="Debug mode; run in foreground and log to"
913
704
                      default="/etc/mandos", metavar="DIR",
914
705
                      help="Directory to search for configuration"
915
706
                      " files")
916
 
    parser.add_option("--no-dbus", action="store_false",
917
 
                      dest="use_dbus",
918
 
                      help="Do not provide D-Bus system bus"
919
 
                      " interface")
920
707
    options = parser.parse_args()[0]
921
708
    
922
709
    if options.check:
932
719
                        "priority":
933
720
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
934
721
                        "servicename": "Mandos",
935
 
                        "use_dbus": "True",
936
722
                        }
937
723
    
938
724
    # Parse config file for server-global settings
941
727
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
942
728
    # Convert the SafeConfigParser object to a dict
943
729
    server_settings = server_config.defaults()
944
 
    # Use getboolean on the boolean config options
945
 
    server_settings["debug"] = (server_config.getboolean
946
 
                                ("DEFAULT", "debug"))
947
 
    server_settings["use_dbus"] = (server_config.getboolean
948
 
                                   ("DEFAULT", "use_dbus"))
 
730
    # Use getboolean on the boolean config option
 
731
    server_settings["debug"] = server_config.getboolean\
 
732
                               ("DEFAULT", "debug")
949
733
    del server_config
950
734
    
951
735
    # Override the settings from the config file with command line
952
736
    # options, if set.
953
737
    for option in ("interface", "address", "port", "debug",
954
 
                   "priority", "servicename", "configdir",
955
 
                   "use_dbus"):
 
738
                   "priority", "servicename", "configdir"):
956
739
        value = getattr(options, option)
957
740
        if value is not None:
958
741
            server_settings[option] = value
959
742
    del options
960
743
    # Now we have our good server settings in "server_settings"
961
744
    
962
 
    # For convenience
963
745
    debug = server_settings["debug"]
964
 
    use_dbus = server_settings["use_dbus"]
965
746
    
966
747
    if not debug:
967
748
        syslogger.setLevel(logging.WARNING)
968
749
        console.setLevel(logging.WARNING)
969
750
    
970
751
    if server_settings["servicename"] != "Mandos":
971
 
        syslogger.setFormatter(logging.Formatter
 
752
        syslogger.setFormatter(logging.Formatter\
972
753
                               ('Mandos (%s): %%(levelname)s:'
973
754
                                ' %%(message)s'
974
755
                                % server_settings["servicename"]))
976
757
    # Parse config file with clients
977
758
    client_defaults = { "timeout": "1h",
978
759
                        "interval": "5m",
979
 
                        "checker": "fping -q -- %%(host)s",
 
760
                        "checker": "fping -q -- %(host)s",
980
761
                        "host": "",
981
762
                        }
982
763
    client_config = ConfigParser.SafeConfigParser(client_defaults)
995
776
    except IOError, error:
996
777
        logger.error("Could not open file %r", pidfilename)
997
778
    
998
 
    try:
999
 
        uid = pwd.getpwnam("_mandos").pw_uid
1000
 
        gid = pwd.getpwnam("_mandos").pw_gid
1001
 
    except KeyError:
1002
 
        try:
1003
 
            uid = pwd.getpwnam("mandos").pw_uid
1004
 
            gid = pwd.getpwnam("mandos").pw_gid
1005
 
        except KeyError:
1006
 
            try:
1007
 
                uid = pwd.getpwnam("nobody").pw_uid
1008
 
                gid = pwd.getpwnam("nogroup").pw_gid
1009
 
            except KeyError:
1010
 
                uid = 65534
1011
 
                gid = 65534
 
779
    uid = 65534
 
780
    gid = 65534
 
781
    try:
 
782
        uid = pwd.getpwnam("mandos").pw_uid
 
783
    except KeyError:
 
784
        try:
 
785
            uid = pwd.getpwnam("nobody").pw_uid
 
786
        except KeyError:
 
787
            pass
 
788
    try:
 
789
        gid = pwd.getpwnam("mandos").pw_gid
 
790
    except KeyError:
 
791
        try:
 
792
            gid = pwd.getpwnam("nogroup").pw_gid
 
793
        except KeyError:
 
794
            pass
1012
795
    try:
1013
796
        os.setuid(uid)
1014
797
        os.setgid(gid)
1020
803
    service = AvahiService(name = server_settings["servicename"],
1021
804
                           servicetype = "_mandos._tcp", )
1022
805
    if server_settings["interface"]:
1023
 
        service.interface = (if_nametoindex
1024
 
                             (server_settings["interface"]))
 
806
        service.interface = if_nametoindex\
 
807
                            (server_settings["interface"])
1025
808
    
1026
809
    global main_loop
1027
810
    global bus
1034
817
                                           avahi.DBUS_PATH_SERVER),
1035
818
                            avahi.DBUS_INTERFACE_SERVER)
1036
819
    # End of Avahi example code
1037
 
    if use_dbus:
1038
 
        bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
1039
 
                                        bus)
 
820
    
 
821
    def remove_from_clients(client):
 
822
        clients.remove(client)
 
823
        if not clients:
 
824
            logger.critical(u"No clients left, exiting")
 
825
            sys.exit()
1040
826
    
1041
827
    clients.update(Set(Client(name = section,
 
828
                              stop_hook = remove_from_clients,
1042
829
                              config
1043
 
                              = dict(client_config.items(section)),
1044
 
                              use_dbus = use_dbus)
 
830
                              = dict(client_config.items(section)))
1045
831
                       for section in client_config.sections()))
1046
832
    if not clients:
1047
 
        logger.warning(u"No clients defined")
 
833
        logger.critical(u"No clients defined")
 
834
        sys.exit(1)
1048
835
    
1049
836
    if debug:
1050
837
        # Redirect stdin so all checkers get /dev/null
1082
869
        
1083
870
        while clients:
1084
871
            client = clients.pop()
1085
 
            client.disable_hook = None
1086
 
            client.disable()
 
872
            client.stop_hook = None
 
873
            client.stop()
1087
874
    
1088
875
    atexit.register(cleanup)
1089
876
    
1092
879
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1093
880
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1094
881
    
1095
 
    if use_dbus:
1096
 
        class MandosServer(dbus.service.Object):
1097
 
            """A D-Bus proxy object"""
1098
 
            def __init__(self):
1099
 
                dbus.service.Object.__init__(self, bus,
1100
 
                                             "/Mandos")
1101
 
            _interface = u"org.mandos_system.Mandos"
1102
 
            
1103
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1104
 
            def ClientAdded(self, objpath, properties):
1105
 
                "D-Bus signal"
1106
 
                pass
1107
 
            
1108
 
            @dbus.service.signal(_interface, signature="os")
1109
 
            def ClientRemoved(self, objpath, name):
1110
 
                "D-Bus signal"
1111
 
                pass
1112
 
            
1113
 
            @dbus.service.method(_interface, out_signature="ao")
1114
 
            def GetAllClients(self):
1115
 
                return dbus.Array(c.dbus_object_path for c in clients)
1116
 
            
1117
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1118
 
            def GetAllClientsWithProperties(self):
1119
 
                return dbus.Dictionary(
1120
 
                    ((c.dbus_object_path, c.GetAllProperties())
1121
 
                     for c in clients),
1122
 
                    signature="oa{sv}")
1123
 
            
1124
 
            @dbus.service.method(_interface, in_signature="o")
1125
 
            def RemoveClient(self, object_path):
1126
 
                for c in clients:
1127
 
                    if c.dbus_object_path == object_path:
1128
 
                        clients.remove(c)
1129
 
                        # Don't signal anything except ClientRemoved
1130
 
                        c.use_dbus = False
1131
 
                        c.disable()
1132
 
                        # Emit D-Bus signal
1133
 
                        self.ClientRemoved(object_path, c.name)
1134
 
                        return
1135
 
                raise KeyError
1136
 
            
1137
 
            @dbus.service.method(_interface, in_signature="s")
1138
 
            def RemoveClientByName(self, name):
1139
 
                for c in clients:
1140
 
                    if c.name == name:
1141
 
                        clients.remove(c)
1142
 
                        # Don't signal anything except ClientRemoved
1143
 
                        c.use_dbus = False
1144
 
                        c.disable()
1145
 
                        # Emit D-Bus signal
1146
 
                        self.ClientRemoved(c.dbus_object_path, name)
1147
 
                        return
1148
 
                raise KeyError
1149
 
            
1150
 
            @dbus.service.method(_interface)
1151
 
            def Quit(self):
1152
 
                main_loop.quit()
1153
 
            
1154
 
            del _interface
1155
 
        
1156
 
        mandos_server = MandosServer()
1157
 
    
1158
882
    for client in clients:
1159
 
        if use_dbus:
1160
 
            # Emit D-Bus signal
1161
 
            mandos_server.ClientAdded(client.dbus_object_path,
1162
 
                                      client.GetAllProperties())
1163
 
        client.enable()
 
883
        client.start()
1164
884
    
1165
885
    tcp_server.enable()
1166
886
    tcp_server.server_activate()
1184
904
        
1185
905
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1186
906
                             lambda *args, **kwargs:
1187
 
                             (tcp_server.handle_request
1188
 
                              (*args[2:], **kwargs) or True))
 
907
                             tcp_server.handle_request\
 
908
                             (*args[2:], **kwargs) or True)
1189
909
        
1190
910
        logger.debug(u"Starting main loop")
1191
911
        main_loop.run()
1192
912
    except AvahiError, error:
1193
 
        logger.critical(u"AvahiError: %s", error)
 
913
        logger.critical(u"AvahiError: %s" + unicode(error))
1194
914
        sys.exit(1)
1195
915
    except KeyboardInterrupt:
1196
916
        if debug: