/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
                                     return a dbus.String containing
                                     an ISO 8601 formatted date+time.
  (Client.__init__): Renamed keyword argument "stop_hook" to
                     "disabled_hook".  All callers changed.
  (Client.started): Renamed to "enabled"; all users changed.
  (Client.last_started): Renamed to "last_enabled"; all users changed.
  (Client.stop_hook): Renamed to "disabled_hook"; all users changed.
  (Client.stop_initiator_tag): Renamed to "disable_initiator_tag"; all
                               users changed.
  (Client.start): Renamed to "enable".  All callers changed.
  (Client.stop): Renamed to "disable".  All callers changed.
  (Client.GetAllProperties): Property "last_started" renamed to
                             "last_enabled" and "started" renamed to
                             "enabled".
  (Client.Start): Renamed to "Enable".
  (Client.Stop): Renamed to "Disable".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn
 
15
# Copyright © 2008 Björn Påhlsson
15
16
# 
16
17
# This program is free software: you can redistribute it and/or modify
17
18
# it under the terms of the GNU General Public License as published by
30
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
32
# 
32
33
 
33
 
from __future__ import division
 
34
from __future__ import division, with_statement, absolute_import
34
35
 
35
36
import SocketServer
36
37
import socket
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
 
59
from contextlib import closing
58
60
 
59
61
import dbus
 
62
import dbus.service
60
63
import gobject
61
64
import avahi
62
65
from dbus.mainloop.glib import DBusGMainLoop
63
66
import ctypes
64
67
import ctypes.util
65
68
 
66
 
version = "1.0"
 
69
version = "1.0.2"
67
70
 
68
71
logger = logging.Logger('mandos')
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'))
 
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'))
74
77
logger.addHandler(syslogger)
75
78
 
76
79
console = logging.StreamHandler()
109
112
                  a sensible number of times
110
113
    """
111
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
112
 
                 servicetype = None, port = None, TXT = None, domain = "",
113
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
114
117
        self.interface = interface
115
118
        self.name = name
116
119
        self.type = servicetype
117
120
        self.port = port
118
 
        if TXT is None:
119
 
            self.TXT = []
120
 
        else:
121
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
122
122
        self.domain = domain
123
123
        self.host = host
124
124
        self.rename_count = 0
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\
151
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (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
 
class Client(object):
 
173
def _datetime_to_dbus(dt, variant_level=0):
 
174
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
175
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
176
 
 
177
 
 
178
class Client(dbus.service.Object):
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
177
182
    fingerprint: string (40 or 32 hexadecimal digits); used to
178
183
                 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(); 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.
 
184
    secret:     bytestring; sent verbatim (over TLS) to client
 
185
    host:       string; available for use by the checker command
 
186
    created:    datetime.datetime(); (UTC) object creation
 
187
    last_enabled: datetime.datetime(); (UTC)
 
188
    enabled:    bool()
 
189
    last_checked_ok: datetime.datetime(); (UTC) or None
 
190
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
191
                                      until this client is invalid
 
192
    interval:   datetime.timedelta(); How often to start a new checker
 
193
    disable_hook:  If set, called by disable() as disable_hook(self)
 
194
    checker:    subprocess.Popen(); a running checker process used
 
195
                                    to see if the client lives.
 
196
                                    'None' if no process is running.
190
197
    checker_initiator_tag: a gobject event source tag, or None
191
 
    stop_initiator_tag:    - '' -
 
198
    disable_initiator_tag:    - '' -
192
199
    checker_callback_tag:  - '' -
193
200
    checker_command: string; External command which is run to check if
194
201
                     client lives.  %() expansions are done at
195
202
                     runtime with vars(self) as dict, so that for
196
203
                     instance %(name)s can be used in the command.
 
204
    dbus_object_path: dbus.ObjectPath
197
205
    Private attibutes:
198
206
    _timeout: Real variable for 'timeout'
199
207
    _interval: Real variable for 'interval'
201
209
    _interval_milliseconds: - '' -
202
210
    """
203
211
    def _set_timeout(self, timeout):
204
 
        "Setter function for 'timeout' attribute"
 
212
        "Setter function for the 'timeout' attribute"
205
213
        self._timeout = timeout
206
214
        self._timeout_milliseconds = ((self.timeout.days
207
215
                                       * 24 * 60 * 60 * 1000)
208
216
                                      + (self.timeout.seconds * 1000)
209
217
                                      + (self.timeout.microseconds
210
218
                                         // 1000))
211
 
    timeout = property(lambda self: self._timeout,
212
 
                       _set_timeout)
 
219
        # Emit D-Bus signal
 
220
        self.PropertyChanged(dbus.String(u"timeout"),
 
221
                             (dbus.UInt64(self._timeout_milliseconds,
 
222
                                          variant_level=1)))
 
223
    timeout = property(lambda self: self._timeout, _set_timeout)
213
224
    del _set_timeout
 
225
    
214
226
    def _set_interval(self, interval):
215
 
        "Setter function for 'interval' attribute"
 
227
        "Setter function for the 'interval' attribute"
216
228
        self._interval = interval
217
229
        self._interval_milliseconds = ((self.interval.days
218
230
                                        * 24 * 60 * 60 * 1000)
220
232
                                          * 1000)
221
233
                                       + (self.interval.microseconds
222
234
                                          // 1000))
223
 
    interval = property(lambda self: self._interval,
224
 
                        _set_interval)
 
235
        # Emit D-Bus signal
 
236
        self.PropertyChanged(dbus.String(u"interval"),
 
237
                             (dbus.UInt64(self._interval_milliseconds,
 
238
                                          variant_level=1)))
 
239
    interval = property(lambda self: self._interval, _set_interval)
225
240
    del _set_interval
226
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
241
    
 
242
    def __init__(self, name = None, disable_hook=None, config=None):
227
243
        """Note: the 'checker' key in 'config' sets the
228
244
        'checker_command' attribute and *not* the 'checker'
229
245
        attribute."""
 
246
        self.dbus_object_path = (dbus.ObjectPath
 
247
                                 ("/Mandos/clients/"
 
248
                                  + name.replace(".", "_")))
 
249
        dbus.service.Object.__init__(self, bus,
 
250
                                     self.dbus_object_path)
230
251
        if config is None:
231
252
            config = {}
232
253
        self.name = name
234
255
        # Uppercase and remove spaces from fingerprint for later
235
256
        # comparison purposes with return value from the fingerprint()
236
257
        # function
237
 
        self.fingerprint = config["fingerprint"].upper()\
238
 
                           .replace(u" ", u"")
 
258
        self.fingerprint = (config["fingerprint"].upper()
 
259
                            .replace(u" ", u""))
239
260
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
240
261
        if "secret" in config:
241
262
            self.secret = config["secret"].decode(u"base64")
242
263
        elif "secfile" in config:
243
 
            secfile = open(config["secfile"])
244
 
            self.secret = secfile.read()
245
 
            secfile.close()
 
264
            with closing(open(os.path.expanduser
 
265
                              (os.path.expandvars
 
266
                               (config["secfile"])))) as secfile:
 
267
                self.secret = secfile.read()
246
268
        else:
247
269
            raise TypeError(u"No secret or secfile for client %s"
248
270
                            % self.name)
249
271
        self.host = config.get("host", "")
250
 
        self.created = datetime.datetime.now()
 
272
        self.created = datetime.datetime.utcnow()
 
273
        self.enabled = False
 
274
        self.last_enabled = None
251
275
        self.last_checked_ok = None
252
276
        self.timeout = string_to_delta(config["timeout"])
253
277
        self.interval = string_to_delta(config["interval"])
254
 
        self.stop_hook = stop_hook
 
278
        self.disable_hook = disable_hook
255
279
        self.checker = None
256
280
        self.checker_initiator_tag = None
257
 
        self.stop_initiator_tag = None
 
281
        self.disable_initiator_tag = None
258
282
        self.checker_callback_tag = None
259
 
        self.check_command = config["checker"]
260
 
    def start(self):
 
283
        self.checker_command = config["checker"]
 
284
    
 
285
    def enable(self):
261
286
        """Start this client's checker and timeout hooks"""
 
287
        self.last_enabled = datetime.datetime.utcnow()
262
288
        # Schedule a new checker to be started an 'interval' from now,
263
289
        # and every interval from then on.
264
 
        self.checker_initiator_tag = gobject.timeout_add\
265
 
                                     (self._interval_milliseconds,
266
 
                                      self.start_checker)
 
290
        self.checker_initiator_tag = (gobject.timeout_add
 
291
                                      (self._interval_milliseconds,
 
292
                                       self.start_checker))
267
293
        # Also start a new checker *right now*.
268
294
        self.start_checker()
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:
 
295
        # Schedule a disable() when 'timeout' has passed
 
296
        self.disable_initiator_tag = (gobject.timeout_add
 
297
                                   (self._timeout_milliseconds,
 
298
                                    self.disable))
 
299
        self.enabled = True
 
300
        # Emit D-Bus signal
 
301
        self.PropertyChanged(dbus.String(u"enabled"),
 
302
                             dbus.Boolean(True, variant_level=1))
 
303
        self.PropertyChanged(dbus.String(u"last_enabled"),
 
304
                             (_datetime_to_dbus(self.last_enabled,
 
305
                                                variant_level=1)))
 
306
    
 
307
    def disable(self):
 
308
        """Disable this client."""
 
309
        if not getattr(self, "enabled", False):
282
310
            return False
283
 
        if getattr(self, "stop_initiator_tag", False):
284
 
            gobject.source_remove(self.stop_initiator_tag)
285
 
            self.stop_initiator_tag = None
 
311
        logger.info(u"Disabling client %s", self.name)
 
312
        if getattr(self, "disable_initiator_tag", False):
 
313
            gobject.source_remove(self.disable_initiator_tag)
 
314
            self.disable_initiator_tag = None
286
315
        if getattr(self, "checker_initiator_tag", False):
287
316
            gobject.source_remove(self.checker_initiator_tag)
288
317
            self.checker_initiator_tag = None
289
318
        self.stop_checker()
290
 
        if self.stop_hook:
291
 
            self.stop_hook(self)
 
319
        if self.disable_hook:
 
320
            self.disable_hook(self)
 
321
        self.enabled = False
 
322
        # Emit D-Bus signal
 
323
        self.PropertyChanged(dbus.String(u"enabled"),
 
324
                             dbus.Boolean(False, variant_level=1))
292
325
        # Do not run this again if called by a gobject.timeout_add
293
326
        return False
 
327
    
294
328
    def __del__(self):
295
 
        self.stop_hook = None
296
 
        self.stop()
297
 
    def checker_callback(self, pid, condition):
 
329
        self.disable_hook = None
 
330
        self.disable()
 
331
    
 
332
    def checker_callback(self, pid, condition, command):
298
333
        """The checker has completed, so take appropriate actions."""
299
 
        now = datetime.datetime.now()
300
334
        self.checker_callback_tag = None
301
335
        self.checker = None
302
 
        if os.WIFEXITED(condition) \
303
 
               and (os.WEXITSTATUS(condition) == 0):
 
336
        # Emit D-Bus signal
 
337
        self.PropertyChanged(dbus.String(u"checker_running"),
 
338
                             dbus.Boolean(False, variant_level=1))
 
339
        if (os.WIFEXITED(condition)
 
340
            and (os.WEXITSTATUS(condition) == 0)):
304
341
            logger.info(u"Checker for %(name)s succeeded",
305
342
                        vars(self))
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)
 
343
            # Emit D-Bus signal
 
344
            self.CheckerCompleted(dbus.Boolean(True),
 
345
                                  dbus.UInt16(condition),
 
346
                                  dbus.String(command))
 
347
            self.bump_timeout()
311
348
        elif not os.WIFEXITED(condition):
312
349
            logger.warning(u"Checker for %(name)s crashed?",
313
350
                           vars(self))
 
351
            # Emit D-Bus signal
 
352
            self.CheckerCompleted(dbus.Boolean(False),
 
353
                                  dbus.UInt16(condition),
 
354
                                  dbus.String(command))
314
355
        else:
315
356
            logger.info(u"Checker for %(name)s failed",
316
357
                        vars(self))
 
358
            # Emit D-Bus signal
 
359
            self.CheckerCompleted(dbus.Boolean(False),
 
360
                                  dbus.UInt16(condition),
 
361
                                  dbus.String(command))
 
362
    
 
363
    def bump_timeout(self):
 
364
        """Bump up the timeout for this client.
 
365
        This should only be called when the client has been seen,
 
366
        alive and well.
 
367
        """
 
368
        self.last_checked_ok = datetime.datetime.utcnow()
 
369
        gobject.source_remove(self.disable_initiator_tag)
 
370
        self.disable_initiator_tag = (gobject.timeout_add
 
371
                                      (self._timeout_milliseconds,
 
372
                                       self.disable))
 
373
        self.PropertyChanged(dbus.String(u"last_checked_ok"),
 
374
                             (_datetime_to_dbus(self.last_checked_ok,
 
375
                                                variant_level=1)))
 
376
    
317
377
    def start_checker(self):
318
378
        """Start a new checker subprocess if one is not running.
319
379
        If a checker already exists, leave it running and do
328
388
        # is as it should be.
329
389
        if self.checker is None:
330
390
            try:
331
 
                # In case check_command has exactly one % operator
332
 
                command = self.check_command % self.host
 
391
                # In case checker_command has exactly one % operator
 
392
                command = self.checker_command % self.host
333
393
            except TypeError:
334
394
                # Escape attributes for the shell
335
395
                escaped_attrs = dict((key, re.escape(str(val)))
336
396
                                     for key, val in
337
397
                                     vars(self).iteritems())
338
398
                try:
339
 
                    command = self.check_command % escaped_attrs
 
399
                    command = self.checker_command % escaped_attrs
340
400
                except TypeError, error:
341
401
                    logger.error(u'Could not format string "%s":'
342
 
                                 u' %s', self.check_command, error)
 
402
                                 u' %s', self.checker_command, error)
343
403
                    return True # Try again later
344
404
            try:
345
405
                logger.info(u"Starting checker %r for %s",
351
411
                self.checker = subprocess.Popen(command,
352
412
                                                close_fds=True,
353
413
                                                shell=True, cwd="/")
354
 
                self.checker_callback_tag = gobject.child_watch_add\
355
 
                                            (self.checker.pid,
356
 
                                             self.checker_callback)
 
414
                # Emit D-Bus signal
 
415
                self.CheckerStarted(command)
 
416
                self.PropertyChanged(dbus.String("checker_running"),
 
417
                                     dbus.Boolean(True, variant_level=1))
 
418
                self.checker_callback_tag = (gobject.child_watch_add
 
419
                                             (self.checker.pid,
 
420
                                              self.checker_callback,
 
421
                                              data=command))
357
422
            except OSError, error:
358
423
                logger.error(u"Failed to start subprocess: %s",
359
424
                             error)
360
425
        # Re-run this periodically if run by gobject.timeout_add
361
426
        return True
 
427
    
362
428
    def stop_checker(self):
363
429
        """Force the checker process, if any, to stop."""
364
430
        if self.checker_callback_tag:
376
442
            if error.errno != errno.ESRCH: # No such process
377
443
                raise
378
444
        self.checker = None
 
445
        self.PropertyChanged(dbus.String(u"checker_running"),
 
446
                             dbus.Boolean(False, variant_level=1))
 
447
    
379
448
    def still_valid(self):
380
449
        """Has the timeout not yet passed for this client?"""
381
 
        now = datetime.datetime.now()
 
450
        if not getattr(self, "enabled", False):
 
451
            return False
 
452
        now = datetime.datetime.utcnow()
382
453
        if self.last_checked_ok is None:
383
454
            return now < (self.created + self.timeout)
384
455
        else:
385
456
            return now < (self.last_checked_ok + self.timeout)
 
457
    
 
458
    ## D-Bus methods & signals
 
459
    _interface = u"org.mandos_system.Mandos.Client"
 
460
    
 
461
    # BumpTimeout - method
 
462
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
 
463
    BumpTimeout.__name__ = "BumpTimeout"
 
464
    
 
465
    # CheckerCompleted - signal
 
466
    @dbus.service.signal(_interface, signature="bqs")
 
467
    def CheckerCompleted(self, success, condition, command):
 
468
        "D-Bus signal"
 
469
        pass
 
470
    
 
471
    # CheckerStarted - signal
 
472
    @dbus.service.signal(_interface, signature="s")
 
473
    def CheckerStarted(self, command):
 
474
        "D-Bus signal"
 
475
        pass
 
476
    
 
477
    # GetAllProperties - method
 
478
    @dbus.service.method(_interface, out_signature="a{sv}")
 
479
    def GetAllProperties(self):
 
480
        "D-Bus method"
 
481
        return dbus.Dictionary({
 
482
                dbus.String("name"):
 
483
                    dbus.String(self.name, variant_level=1),
 
484
                dbus.String("fingerprint"):
 
485
                    dbus.String(self.fingerprint, variant_level=1),
 
486
                dbus.String("host"):
 
487
                    dbus.String(self.host, variant_level=1),
 
488
                dbus.String("created"):
 
489
                    _datetime_to_dbus(self.created, variant_level=1),
 
490
                dbus.String("last_enabled"):
 
491
                    (_datetime_to_dbus(self.last_enabled,
 
492
                                       variant_level=1)
 
493
                     if self.last_enabled is not None
 
494
                     else dbus.Boolean(False, variant_level=1)),
 
495
                dbus.String("enabled"):
 
496
                    dbus.Boolean(self.enabled, variant_level=1),
 
497
                dbus.String("last_checked_ok"):
 
498
                    (_datetime_to_dbus(self.last_checked_ok,
 
499
                                       variant_level=1)
 
500
                     if self.last_checked_ok is not None
 
501
                     else dbus.Boolean (False, variant_level=1)),
 
502
                dbus.String("timeout"):
 
503
                    dbus.UInt64(self._timeout_milliseconds,
 
504
                                variant_level=1),
 
505
                dbus.String("interval"):
 
506
                    dbus.UInt64(self._interval_milliseconds,
 
507
                                variant_level=1),
 
508
                dbus.String("checker"):
 
509
                    dbus.String(self.checker_command,
 
510
                                variant_level=1),
 
511
                dbus.String("checker_running"):
 
512
                    dbus.Boolean(self.checker is not None,
 
513
                                 variant_level=1),
 
514
                }, signature="sv")
 
515
    
 
516
    # IsStillValid - method
 
517
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
518
                    (still_valid))
 
519
    IsStillValid.__name__ = "IsStillValid"
 
520
    
 
521
    # PropertyChanged - signal
 
522
    @dbus.service.signal(_interface, signature="sv")
 
523
    def PropertyChanged(self, property, value):
 
524
        "D-Bus signal"
 
525
        pass
 
526
    
 
527
    # SetChecker - method
 
528
    @dbus.service.method(_interface, in_signature="s")
 
529
    def SetChecker(self, checker):
 
530
        "D-Bus setter method"
 
531
        self.checker_command = checker
 
532
    
 
533
    # SetHost - method
 
534
    @dbus.service.method(_interface, in_signature="s")
 
535
    def SetHost(self, host):
 
536
        "D-Bus setter method"
 
537
        self.host = host
 
538
    
 
539
    # SetInterval - method
 
540
    @dbus.service.method(_interface, in_signature="t")
 
541
    def SetInterval(self, milliseconds):
 
542
        self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
 
543
    
 
544
    # SetSecret - method
 
545
    @dbus.service.method(_interface, in_signature="ay",
 
546
                         byte_arrays=True)
 
547
    def SetSecret(self, secret):
 
548
        "D-Bus setter method"
 
549
        self.secret = str(secret)
 
550
    
 
551
    # SetTimeout - method
 
552
    @dbus.service.method(_interface, in_signature="t")
 
553
    def SetTimeout(self, milliseconds):
 
554
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
555
    
 
556
    # Enable - method
 
557
    Enable = dbus.service.method(_interface)(enable)
 
558
    Enable.__name__ = "Enable"
 
559
    
 
560
    # StartChecker - method
 
561
    @dbus.service.method(_interface)
 
562
    def StartChecker(self):
 
563
        "D-Bus method"
 
564
        self.start_checker()
 
565
    
 
566
    # Disable - method
 
567
    @dbus.service.method(_interface)
 
568
    def Disable(self):
 
569
        "D-Bus method"
 
570
        self.disable()
 
571
    
 
572
    # StopChecker - method
 
573
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
574
    StopChecker.__name__ = "StopChecker"
 
575
    
 
576
    del _interface
386
577
 
387
578
 
388
579
def peer_certificate(session):
389
580
    "Return the peer's OpenPGP certificate as a bytestring"
390
581
    # If not an OpenPGP certificate...
391
 
    if gnutls.library.functions.gnutls_certificate_type_get\
392
 
            (session._c_object) \
393
 
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
 
582
    if (gnutls.library.functions
 
583
        .gnutls_certificate_type_get(session._c_object)
 
584
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
394
585
        # ...do the normal thing
395
586
        return session.peer_certificate
396
587
    list_size = ctypes.c_uint()
397
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
398
 
        (session._c_object, ctypes.byref(list_size))
 
588
    cert_list = (gnutls.library.functions
 
589
                 .gnutls_certificate_get_peers
 
590
                 (session._c_object, ctypes.byref(list_size)))
399
591
    if list_size.value == 0:
400
592
        return None
401
593
    cert = cert_list[0]
405
597
def fingerprint(openpgp):
406
598
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
407
599
    # New GnuTLS "datum" with the OpenPGP public key
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)))
 
600
    datum = (gnutls.library.types
 
601
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
602
                                         ctypes.POINTER
 
603
                                         (ctypes.c_ubyte)),
 
604
                             ctypes.c_uint(len(openpgp))))
412
605
    # New empty GnuTLS certificate
413
606
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
414
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
415
 
        (ctypes.byref(crt))
 
607
    (gnutls.library.functions
 
608
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
416
609
    # Import the OpenPGP public key into the certificate
417
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
418
 
                    (crt, ctypes.byref(datum),
419
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
610
    (gnutls.library.functions
 
611
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
612
                                gnutls.library.constants
 
613
                                .GNUTLS_OPENPGP_FMT_RAW))
420
614
    # Verify the self signature in the key
421
615
    crtverify = ctypes.c_uint()
422
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
423
 
        (crt, 0, ctypes.byref(crtverify))
 
616
    (gnutls.library.functions
 
617
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
424
618
    if crtverify.value != 0:
425
619
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
426
620
        raise gnutls.errors.CertificateSecurityError("Verify failed")
428
622
    buf = ctypes.create_string_buffer(20)
429
623
    buf_len = ctypes.c_size_t()
430
624
    # Get the fingerprint from the certificate into the buffer
431
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
625
    (gnutls.library.functions
 
626
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
627
                                         ctypes.byref(buf_len)))
433
628
    # Deinit the certificate
434
629
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
435
630
    # Convert the buffer to a Python bytestring
446
641
    
447
642
    def handle(self):
448
643
        logger.info(u"TCP connection from: %s",
449
 
                     unicode(self.client_address))
450
 
        session = gnutls.connection.ClientSession\
451
 
                  (self.request, gnutls.connection.X509Credentials())
 
644
                    unicode(self.client_address))
 
645
        session = (gnutls.connection
 
646
                   .ClientSession(self.request,
 
647
                                  gnutls.connection
 
648
                                  .X509Credentials()))
452
649
        
453
650
        line = self.request.makefile().readline()
454
651
        logger.debug(u"Protocol version: %r", line)
467
664
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
468
665
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
469
666
        #                "+DHE-DSS"))
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)
 
667
        # Use a fallback default, since this MUST be set.
 
668
        priority = self.server.settings.get("priority", "NORMAL")
 
669
        (gnutls.library.functions
 
670
         .gnutls_priority_set_direct(session._c_object,
 
671
                                     priority, None))
476
672
        
477
673
        try:
478
674
            session.handshake()
488
684
            session.bye()
489
685
            return
490
686
        logger.debug(u"Fingerprint: %s", fpr)
491
 
        client = None
492
687
        for c in self.server.clients:
493
688
            if c.fingerprint == fpr:
494
689
                client = c
495
690
                break
496
 
        if not client:
 
691
        else:
497
692
            logger.warning(u"Client not found for fingerprint: %s",
498
693
                           fpr)
499
694
            session.bye()
506
701
                           vars(client))
507
702
            session.bye()
508
703
            return
 
704
        ## This won't work here, since we're in a fork.
 
705
        # client.bump_timeout()
509
706
        sent_size = 0
510
707
        while sent_size < len(client.secret):
511
708
            sent = session.send(client.secret[sent_size:])
516
713
        session.bye()
517
714
 
518
715
 
519
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
716
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
717
                     SocketServer.TCPServer, object):
520
718
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
521
719
    Attributes:
522
720
        settings:       Server settings
641
839
    """Call the C function if_nametoindex(), or equivalent"""
642
840
    global if_nametoindex
643
841
    try:
644
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
645
 
            (ctypes.util.find_library("c")).if_nametoindex
 
842
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
843
                          (ctypes.util.find_library("c"))
 
844
                          .if_nametoindex)
646
845
    except (OSError, AttributeError):
647
846
        if "struct" not in sys.modules:
648
847
            import struct
651
850
        def if_nametoindex(interface):
652
851
            "Get an interface index the hard way, i.e. using fcntl()"
653
852
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
654
 
            s = socket.socket()
655
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
656
 
                                struct.pack("16s16x", interface))
657
 
            s.close()
 
853
            with closing(socket.socket()) as s:
 
854
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
855
                                    struct.pack("16s16x", interface))
658
856
            interface_index = struct.unpack("I", ifreq[16:20])[0]
659
857
            return interface_index
660
858
    return if_nametoindex(interface)
728
926
    # Convert the SafeConfigParser object to a dict
729
927
    server_settings = server_config.defaults()
730
928
    # Use getboolean on the boolean config option
731
 
    server_settings["debug"] = server_config.getboolean\
732
 
                               ("DEFAULT", "debug")
 
929
    server_settings["debug"] = (server_config.getboolean
 
930
                                ("DEFAULT", "debug"))
733
931
    del server_config
734
932
    
735
933
    # Override the settings from the config file with command line
749
947
        console.setLevel(logging.WARNING)
750
948
    
751
949
    if server_settings["servicename"] != "Mandos":
752
 
        syslogger.setFormatter(logging.Formatter\
 
950
        syslogger.setFormatter(logging.Formatter
753
951
                               ('Mandos (%s): %%(levelname)s:'
754
952
                                ' %%(message)s'
755
953
                                % server_settings["servicename"]))
776
974
    except IOError, error:
777
975
        logger.error("Could not open file %r", pidfilename)
778
976
    
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
 
977
    try:
 
978
        uid = pwd.getpwnam("_mandos").pw_uid
 
979
    except KeyError:
 
980
        try:
 
981
            uid = pwd.getpwnam("mandos").pw_uid
 
982
        except KeyError:
 
983
            try:
 
984
                uid = pwd.getpwnam("nobody").pw_uid
 
985
            except KeyError:
 
986
                uid = 65534
 
987
    try:
 
988
        gid = pwd.getpwnam("_mandos").pw_gid
 
989
    except KeyError:
 
990
        try:
 
991
            gid = pwd.getpwnam("mandos").pw_gid
 
992
        except KeyError:
 
993
            try:
 
994
                gid = pwd.getpwnam("nogroup").pw_gid
 
995
            except KeyError:
 
996
                gid = 65534
795
997
    try:
796
998
        os.setuid(uid)
797
999
        os.setgid(gid)
803
1005
    service = AvahiService(name = server_settings["servicename"],
804
1006
                           servicetype = "_mandos._tcp", )
805
1007
    if server_settings["interface"]:
806
 
        service.interface = if_nametoindex\
807
 
                            (server_settings["interface"])
 
1008
        service.interface = (if_nametoindex
 
1009
                             (server_settings["interface"]))
808
1010
    
809
1011
    global main_loop
810
1012
    global bus
817
1019
                                           avahi.DBUS_PATH_SERVER),
818
1020
                            avahi.DBUS_INTERFACE_SERVER)
819
1021
    # End of Avahi example code
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()
 
1022
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
826
1023
    
827
1024
    clients.update(Set(Client(name = section,
828
 
                              stop_hook = remove_from_clients,
829
1025
                              config
830
1026
                              = dict(client_config.items(section)))
831
1027
                       for section in client_config.sections()))
869
1065
        
870
1066
        while clients:
871
1067
            client = clients.pop()
872
 
            client.stop_hook = None
873
 
            client.stop()
 
1068
            client.disable_hook = None
 
1069
            client.disable()
874
1070
    
875
1071
    atexit.register(cleanup)
876
1072
    
879
1075
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
880
1076
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
881
1077
    
 
1078
    class MandosServer(dbus.service.Object):
 
1079
        """A D-Bus proxy object"""
 
1080
        def __init__(self):
 
1081
            dbus.service.Object.__init__(self, bus,
 
1082
                                         "/Mandos")
 
1083
        _interface = u"org.mandos_system.Mandos"
 
1084
        
 
1085
        @dbus.service.signal(_interface, signature="oa{sv}")
 
1086
        def ClientAdded(self, objpath, properties):
 
1087
            "D-Bus signal"
 
1088
            pass
 
1089
        
 
1090
        @dbus.service.signal(_interface, signature="o")
 
1091
        def ClientRemoved(self, objpath):
 
1092
            "D-Bus signal"
 
1093
            pass
 
1094
        
 
1095
        @dbus.service.method(_interface, out_signature="ao")
 
1096
        def GetAllClients(self):
 
1097
            return dbus.Array(c.dbus_object_path for c in clients)
 
1098
        
 
1099
        @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1100
        def GetAllClientsWithProperties(self):
 
1101
            return dbus.Dictionary(
 
1102
                ((c.dbus_object_path, c.GetAllProperties())
 
1103
                 for c in clients),
 
1104
                signature="oa{sv}")
 
1105
        
 
1106
        @dbus.service.method(_interface, in_signature="o")
 
1107
        def RemoveClient(self, object_path):
 
1108
            for c in clients:
 
1109
                if c.dbus_object_path == object_path:
 
1110
                    c.disable()
 
1111
                    clients.remove(c)
 
1112
                    return
 
1113
            raise KeyError
 
1114
        
 
1115
        del _interface
 
1116
    
 
1117
    mandos_server = MandosServer()
 
1118
    
882
1119
    for client in clients:
883
 
        client.start()
 
1120
        # Emit D-Bus signal
 
1121
        mandos_server.ClientAdded(client.dbus_object_path,
 
1122
                                  client.GetAllProperties())
 
1123
        client.enable()
884
1124
    
885
1125
    tcp_server.enable()
886
1126
    tcp_server.server_activate()
904
1144
        
905
1145
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
906
1146
                             lambda *args, **kwargs:
907
 
                             tcp_server.handle_request\
908
 
                             (*args[2:], **kwargs) or True)
 
1147
                             (tcp_server.handle_request
 
1148
                              (*args[2:], **kwargs) or True))
909
1149
        
910
1150
        logger.debug(u"Starting main loop")
911
1151
        main_loop.run()