/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-12-10 01:26:02 UTC
  • mfrom: (237.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20081210012602-vhz3h75xkj24t340
First version of a somewhat complete D-Bus server interface.  Also
change user/group name to "_mandos".

* debian/mandos.postinst: Rename old "mandos" user and group to
                          "_mandos"; create "_mandos" user and group
                          if none exist.
* debian/mandos-client.postinst: - '' -

* initramfs-tools-hook: Try "_mandos" before "mandos" as user and
                        group name.

* mandos (_datetime_to_dbus_struct): New; was previously local.
  (Client.started): Renamed to "last_started".  All users changed.
  (Client.started): New; boolean.
  (Client.dbus_object_path): New.
  (Client.check_command): Renamed to "checker_command".  All users
                          changed.
  (Client.__init__): Set and use "self.dbus_object_path".  Set
                     "self.started".
  (Client.start): Update "self.started".  Emit "self.PropertyChanged"
                  signals for both "started" and "last_started".
  (Client.stop): Update "self.started".  Emit "self.PropertyChanged"
                 signal for "started".
  (Client.checker_callback): Take additional "command" argument.  All
                             callers changed. Emit
                             "self.PropertyChanged" signal.
  (Client.bump_timeout): Emit "self.PropertyChanged" signal for
                         "last_checked_ok".
  (Client.start_checker): Emit "self.PropertyChanged" signal for
                          "checker_running".
  (Client.stop_checker): Emit "self.PropertyChanged" signal for
                         "checker_running".
  (Client.still_valid): Bug fix: use "getattr(self, started, False)"
                        instead of "self.started" in case this client
                        object is so new that the "started" attribute
                        has not been created yet.
  (Client.IntervalChanged, Client.CheckerIsRunning, Client.GetChecker,
  Client.GetCreated, Client.GetFingerprint, Client.GetHost,
  Client.GetInterval, Client.GetName, Client.GetStarted,
  Client.GetTimeout, Client.StateChanged, Client.TimeoutChanged):
  Removed; all callers changed.
  (Client.CheckerCompleted): Add "condition" and "command" arguments.
                             All callers changed.
  (Client.GetAllProperties, Client.PropertyChanged): New.
  (Client.StillValid): Renamed to "IsStillValid".
  (Client.StartChecker): Changed to its own function to avoid the
                         return value from "Client.start_checker()".
  (Client.Stop): Changed to its own function to avoid the return value
                 from "Client.stop()".
  (main): Try "_mandos" before "mandos" as user and group name.
          Removed inner function "remove_from_clients".  New inner
          class "MandosServer".

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
58
59
from contextlib import closing
59
60
 
60
61
import dbus
 
62
import dbus.service
61
63
import gobject
62
64
import avahi
63
65
from dbus.mainloop.glib import DBusGMainLoop
67
69
version = "1.0.2"
68
70
 
69
71
logger = logging.Logger('mandos')
70
 
syslogger = logging.handlers.SysLogHandler\
71
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
72
 
             address = "/dev/log")
73
 
syslogger.setFormatter(logging.Formatter\
74
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
72
syslogger = (logging.handlers.SysLogHandler
 
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
74
              address = "/dev/log"))
 
75
syslogger.setFormatter(logging.Formatter
 
76
                       ('Mandos: %(levelname)s: %(message)s'))
75
77
logger.addHandler(syslogger)
76
78
 
77
79
console = logging.StreamHandler()
110
112
                  a sensible number of times
111
113
    """
112
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
113
 
                 servicetype = None, port = None, TXT = None, domain = "",
114
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
115
117
        self.interface = interface
116
118
        self.name = name
117
119
        self.type = servicetype
118
120
        self.port = port
119
 
        if TXT is None:
120
 
            self.TXT = []
121
 
        else:
122
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
123
122
        self.domain = domain
124
123
        self.host = host
125
124
        self.rename_count = 0
134
133
        self.name = server.GetAlternativeServiceName(self.name)
135
134
        logger.info(u"Changing Zeroconf service name to %r ...",
136
135
                    str(self.name))
137
 
        syslogger.setFormatter(logging.Formatter\
 
136
        syslogger.setFormatter(logging.Formatter
138
137
                               ('Mandos (%s): %%(levelname)s:'
139
 
                               ' %%(message)s' % self.name))
 
138
                                ' %%(message)s' % self.name))
140
139
        self.remove()
141
140
        self.add()
142
141
        self.rename_count += 1
148
147
        """Derived from the Avahi example code"""
149
148
        global group
150
149
        if group is None:
151
 
            group = dbus.Interface\
152
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (avahi.DBUS_NAME,
153
152
                                    server.EntryGroupNew()),
154
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
155
154
            group.connect_to_signal('StateChanged',
156
155
                                    entry_group_state_changed)
157
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
171
170
# End of Avahi example code
172
171
 
173
172
 
174
 
class Client(object):
 
173
def _datetime_to_dbus_struct(dt, variant_level=0):
 
174
    """Convert a UTC datetime.datetime() to a D-Bus struct.
 
175
    The format is special to this application, since we could not find
 
176
    any other standard way."""
 
177
    return dbus.Struct((dbus.Int16(dt.year),
 
178
                        dbus.Byte(dt.month),
 
179
                        dbus.Byte(dt.day),
 
180
                        dbus.Byte(dt.hour),
 
181
                        dbus.Byte(dt.minute),
 
182
                        dbus.Byte(dt.second),
 
183
                        dbus.UInt32(dt.microsecond)),
 
184
                       signature="nyyyyyu",
 
185
                       variant_level=variant_level)
 
186
 
 
187
 
 
188
class Client(dbus.service.Object):
175
189
    """A representation of a client host served by this server.
176
190
    Attributes:
177
 
    name:      string; from the config file, used in log messages
 
191
    name:       string; from the config file, used in log messages
178
192
    fingerprint: string (40 or 32 hexadecimal digits); used to
179
193
                 uniquely identify the client
180
 
    secret:    bytestring; sent verbatim (over TLS) to client
181
 
    host:      string; available for use by the checker command
182
 
    created:   datetime.datetime(); object creation, not client host
183
 
    last_checked_ok: datetime.datetime() or None if not yet checked OK
184
 
    timeout:   datetime.timedelta(); How long from last_checked_ok
185
 
                                     until this client is invalid
186
 
    interval:  datetime.timedelta(); How often to start a new checker
187
 
    stop_hook: If set, called by stop() as stop_hook(self)
188
 
    checker:   subprocess.Popen(); a running checker process used
189
 
                                   to see if the client lives.
190
 
                                   'None' if no process is running.
 
194
    secret:     bytestring; sent verbatim (over TLS) to client
 
195
    host:       string; available for use by the checker command
 
196
    created:    datetime.datetime(); (UTC) object creation
 
197
    last_started: datetime.datetime(); (UTC)
 
198
    started:    bool()
 
199
    last_checked_ok: datetime.datetime(); (UTC) or None
 
200
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
201
                                      until this client is invalid
 
202
    interval:   datetime.timedelta(); How often to start a new checker
 
203
    stop_hook:  If set, called by stop() as stop_hook(self)
 
204
    checker:    subprocess.Popen(); a running checker process used
 
205
                                    to see if the client lives.
 
206
                                    'None' if no process is running.
191
207
    checker_initiator_tag: a gobject event source tag, or None
192
208
    stop_initiator_tag:    - '' -
193
209
    checker_callback_tag:  - '' -
195
211
                     client lives.  %() expansions are done at
196
212
                     runtime with vars(self) as dict, so that for
197
213
                     instance %(name)s can be used in the command.
 
214
    dbus_object_path: dbus.ObjectPath
198
215
    Private attibutes:
199
216
    _timeout: Real variable for 'timeout'
200
217
    _interval: Real variable for 'interval'
202
219
    _interval_milliseconds: - '' -
203
220
    """
204
221
    def _set_timeout(self, timeout):
205
 
        "Setter function for 'timeout' attribute"
 
222
        "Setter function for the 'timeout' attribute"
206
223
        self._timeout = timeout
207
224
        self._timeout_milliseconds = ((self.timeout.days
208
225
                                       * 24 * 60 * 60 * 1000)
209
226
                                      + (self.timeout.seconds * 1000)
210
227
                                      + (self.timeout.microseconds
211
228
                                         // 1000))
212
 
    timeout = property(lambda self: self._timeout,
213
 
                       _set_timeout)
 
229
        # Emit D-Bus signal
 
230
        self.PropertyChanged(dbus.String(u"timeout"),
 
231
                             (dbus.UInt64(self._timeout_milliseconds,
 
232
                                          variant_level=1)))
 
233
    timeout = property(lambda self: self._timeout, _set_timeout)
214
234
    del _set_timeout
 
235
    
215
236
    def _set_interval(self, interval):
216
 
        "Setter function for 'interval' attribute"
 
237
        "Setter function for the 'interval' attribute"
217
238
        self._interval = interval
218
239
        self._interval_milliseconds = ((self.interval.days
219
240
                                        * 24 * 60 * 60 * 1000)
221
242
                                          * 1000)
222
243
                                       + (self.interval.microseconds
223
244
                                          // 1000))
224
 
    interval = property(lambda self: self._interval,
225
 
                        _set_interval)
 
245
        # Emit D-Bus signal
 
246
        self.PropertyChanged(dbus.String(u"interval"),
 
247
                             (dbus.UInt64(self._interval_milliseconds,
 
248
                                          variant_level=1)))
 
249
    interval = property(lambda self: self._interval, _set_interval)
226
250
    del _set_interval
 
251
    
227
252
    def __init__(self, name = None, stop_hook=None, config=None):
228
253
        """Note: the 'checker' key in 'config' sets the
229
254
        'checker_command' attribute and *not* the 'checker'
230
255
        attribute."""
 
256
        self.dbus_object_path = (dbus.ObjectPath
 
257
                                 ("/Mandos/clients/"
 
258
                                  + name.replace(".", "_")))
 
259
        dbus.service.Object.__init__(self, bus,
 
260
                                     self.dbus_object_path)
231
261
        if config is None:
232
262
            config = {}
233
263
        self.name = name
235
265
        # Uppercase and remove spaces from fingerprint for later
236
266
        # comparison purposes with return value from the fingerprint()
237
267
        # function
238
 
        self.fingerprint = config["fingerprint"].upper()\
239
 
                           .replace(u" ", u"")
 
268
        self.fingerprint = (config["fingerprint"].upper()
 
269
                            .replace(u" ", u""))
240
270
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
241
271
        if "secret" in config:
242
272
            self.secret = config["secret"].decode(u"base64")
243
273
        elif "secfile" in config:
244
274
            with closing(open(os.path.expanduser
245
275
                              (os.path.expandvars
246
 
                               (config["secfile"])))) \
247
 
                               as secfile:
 
276
                               (config["secfile"])))) as secfile:
248
277
                self.secret = secfile.read()
249
278
        else:
250
279
            raise TypeError(u"No secret or secfile for client %s"
251
280
                            % self.name)
252
281
        self.host = config.get("host", "")
253
 
        self.created = datetime.datetime.now()
 
282
        self.created = datetime.datetime.utcnow()
 
283
        self.started = False
 
284
        self.last_started = None
254
285
        self.last_checked_ok = None
255
286
        self.timeout = string_to_delta(config["timeout"])
256
287
        self.interval = string_to_delta(config["interval"])
259
290
        self.checker_initiator_tag = None
260
291
        self.stop_initiator_tag = None
261
292
        self.checker_callback_tag = None
262
 
        self.check_command = config["checker"]
 
293
        self.checker_command = config["checker"]
 
294
    
263
295
    def start(self):
264
296
        """Start this client's checker and timeout hooks"""
 
297
        self.last_started = datetime.datetime.utcnow()
265
298
        # Schedule a new checker to be started an 'interval' from now,
266
299
        # and every interval from then on.
267
 
        self.checker_initiator_tag = gobject.timeout_add\
268
 
                                     (self._interval_milliseconds,
269
 
                                      self.start_checker)
 
300
        self.checker_initiator_tag = (gobject.timeout_add
 
301
                                      (self._interval_milliseconds,
 
302
                                       self.start_checker))
270
303
        # Also start a new checker *right now*.
271
304
        self.start_checker()
272
305
        # Schedule a stop() when 'timeout' has passed
273
 
        self.stop_initiator_tag = gobject.timeout_add\
274
 
                                  (self._timeout_milliseconds,
275
 
                                   self.stop)
 
306
        self.stop_initiator_tag = (gobject.timeout_add
 
307
                                   (self._timeout_milliseconds,
 
308
                                    self.stop))
 
309
        self.started = True
 
310
        # Emit D-Bus signal
 
311
        self.PropertyChanged(dbus.String(u"started"),
 
312
                             dbus.Boolean(True, variant_level=1))
 
313
        self.PropertyChanged(dbus.String(u"last_started"),
 
314
                             (_datetime_to_dbus_struct
 
315
                              (self.last_started, variant_level=1)))
 
316
    
276
317
    def stop(self):
277
 
        """Stop this client.
278
 
        The possibility that a client might be restarted is left open,
279
 
        but not currently used."""
280
 
        # If this client doesn't have a secret, it is already stopped.
281
 
        if hasattr(self, "secret") and self.secret:
282
 
            logger.info(u"Stopping client %s", self.name)
283
 
            self.secret = None
284
 
        else:
 
318
        """Stop this client."""
 
319
        if not getattr(self, "started", False):
285
320
            return False
 
321
        logger.info(u"Stopping client %s", self.name)
286
322
        if getattr(self, "stop_initiator_tag", False):
287
323
            gobject.source_remove(self.stop_initiator_tag)
288
324
            self.stop_initiator_tag = None
292
328
        self.stop_checker()
293
329
        if self.stop_hook:
294
330
            self.stop_hook(self)
 
331
        self.started = False
 
332
        # Emit D-Bus signal
 
333
        self.PropertyChanged(dbus.String(u"started"),
 
334
                             dbus.Boolean(False, variant_level=1))
295
335
        # Do not run this again if called by a gobject.timeout_add
296
336
        return False
 
337
    
297
338
    def __del__(self):
298
339
        self.stop_hook = None
299
340
        self.stop()
300
 
    def checker_callback(self, pid, condition):
 
341
    
 
342
    def checker_callback(self, pid, condition, command):
301
343
        """The checker has completed, so take appropriate actions."""
302
344
        self.checker_callback_tag = None
303
345
        self.checker = None
304
 
        if os.WIFEXITED(condition) \
305
 
               and (os.WEXITSTATUS(condition) == 0):
 
346
        # Emit D-Bus signal
 
347
        self.PropertyChanged(dbus.String(u"checker_running"),
 
348
                             dbus.Boolean(False, variant_level=1))
 
349
        if (os.WIFEXITED(condition)
 
350
            and (os.WEXITSTATUS(condition) == 0)):
306
351
            logger.info(u"Checker for %(name)s succeeded",
307
352
                        vars(self))
 
353
            # Emit D-Bus signal
 
354
            self.CheckerCompleted(dbus.Boolean(True),
 
355
                                  dbus.UInt16(condition),
 
356
                                  dbus.String(command))
308
357
            self.bump_timeout()
309
358
        elif not os.WIFEXITED(condition):
310
359
            logger.warning(u"Checker for %(name)s crashed?",
311
360
                           vars(self))
 
361
            # Emit D-Bus signal
 
362
            self.CheckerCompleted(dbus.Boolean(False),
 
363
                                  dbus.UInt16(condition),
 
364
                                  dbus.String(command))
312
365
        else:
313
366
            logger.info(u"Checker for %(name)s failed",
314
367
                        vars(self))
 
368
            # Emit D-Bus signal
 
369
            self.CheckerCompleted(dbus.Boolean(False),
 
370
                                  dbus.UInt16(condition),
 
371
                                  dbus.String(command))
 
372
    
315
373
    def bump_timeout(self):
316
374
        """Bump up the timeout for this client.
317
375
        This should only be called when the client has been seen,
318
376
        alive and well.
319
377
        """
320
 
        self.last_checked_ok = datetime.datetime.now()
 
378
        self.last_checked_ok = datetime.datetime.utcnow()
321
379
        gobject.source_remove(self.stop_initiator_tag)
322
 
        self.stop_initiator_tag = gobject.timeout_add\
323
 
            (self._timeout_milliseconds, self.stop)
 
380
        self.stop_initiator_tag = (gobject.timeout_add
 
381
                                   (self._timeout_milliseconds,
 
382
                                    self.stop))
 
383
        self.PropertyChanged(dbus.String(u"last_checked_ok"),
 
384
                             (_datetime_to_dbus_struct
 
385
                              (self.last_checked_ok,
 
386
                               variant_level=1)))
 
387
    
324
388
    def start_checker(self):
325
389
        """Start a new checker subprocess if one is not running.
326
390
        If a checker already exists, leave it running and do
335
399
        # is as it should be.
336
400
        if self.checker is None:
337
401
            try:
338
 
                # In case check_command has exactly one % operator
339
 
                command = self.check_command % self.host
 
402
                # In case checker_command has exactly one % operator
 
403
                command = self.checker_command % self.host
340
404
            except TypeError:
341
405
                # Escape attributes for the shell
342
406
                escaped_attrs = dict((key, re.escape(str(val)))
343
407
                                     for key, val in
344
408
                                     vars(self).iteritems())
345
409
                try:
346
 
                    command = self.check_command % escaped_attrs
 
410
                    command = self.checker_command % escaped_attrs
347
411
                except TypeError, error:
348
412
                    logger.error(u'Could not format string "%s":'
349
 
                                 u' %s', self.check_command, error)
 
413
                                 u' %s', self.checker_command, error)
350
414
                    return True # Try again later
351
415
            try:
352
416
                logger.info(u"Starting checker %r for %s",
358
422
                self.checker = subprocess.Popen(command,
359
423
                                                close_fds=True,
360
424
                                                shell=True, cwd="/")
361
 
                self.checker_callback_tag = gobject.child_watch_add\
362
 
                                            (self.checker.pid,
363
 
                                             self.checker_callback)
 
425
                # Emit D-Bus signal
 
426
                self.CheckerStarted(command)
 
427
                self.PropertyChanged(dbus.String("checker_running"),
 
428
                                     dbus.Boolean(True, variant_level=1))
 
429
                self.checker_callback_tag = (gobject.child_watch_add
 
430
                                             (self.checker.pid,
 
431
                                              self.checker_callback,
 
432
                                              data=command))
364
433
            except OSError, error:
365
434
                logger.error(u"Failed to start subprocess: %s",
366
435
                             error)
367
436
        # Re-run this periodically if run by gobject.timeout_add
368
437
        return True
 
438
    
369
439
    def stop_checker(self):
370
440
        """Force the checker process, if any, to stop."""
371
441
        if self.checker_callback_tag:
383
453
            if error.errno != errno.ESRCH: # No such process
384
454
                raise
385
455
        self.checker = None
 
456
        self.PropertyChanged(dbus.String(u"checker_running"),
 
457
                             dbus.Boolean(False, variant_level=1))
 
458
    
386
459
    def still_valid(self):
387
460
        """Has the timeout not yet passed for this client?"""
388
 
        now = datetime.datetime.now()
 
461
        if not getattr(self, "started", False):
 
462
            return False
 
463
        now = datetime.datetime.utcnow()
389
464
        if self.last_checked_ok is None:
390
465
            return now < (self.created + self.timeout)
391
466
        else:
392
467
            return now < (self.last_checked_ok + self.timeout)
 
468
    
 
469
    ## D-Bus methods & signals
 
470
    _interface = u"org.mandos_system.Mandos.Client"
 
471
    
 
472
    # BumpTimeout - method
 
473
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
 
474
    BumpTimeout.__name__ = "BumpTimeout"
 
475
    
 
476
    # CheckerCompleted - signal
 
477
    @dbus.service.signal(_interface, signature="bqs")
 
478
    def CheckerCompleted(self, success, condition, command):
 
479
        "D-Bus signal"
 
480
        pass
 
481
    
 
482
    # CheckerStarted - signal
 
483
    @dbus.service.signal(_interface, signature="s")
 
484
    def CheckerStarted(self, command):
 
485
        "D-Bus signal"
 
486
        pass
 
487
    
 
488
    # GetAllProperties - method
 
489
    @dbus.service.method(_interface, out_signature="a{sv}")
 
490
    def GetAllProperties(self):
 
491
        "D-Bus method"
 
492
        return dbus.Dictionary({
 
493
                dbus.String("name"):
 
494
                    dbus.String(self.name, variant_level=1),
 
495
                dbus.String("fingerprint"):
 
496
                    dbus.String(self.fingerprint, variant_level=1),
 
497
                dbus.String("host"):
 
498
                    dbus.String(self.host, variant_level=1),
 
499
                dbus.String("created"):
 
500
                    _datetime_to_dbus_struct(self.created,
 
501
                                             variant_level=1),
 
502
                dbus.String("last_started"):
 
503
                    (_datetime_to_dbus_struct(self.last_started,
 
504
                                              variant_level=1)
 
505
                     if self.last_started is not None
 
506
                     else dbus.Boolean(False, variant_level=1)),
 
507
                dbus.String("started"):
 
508
                    dbus.Boolean(self.started, variant_level=1),
 
509
                dbus.String("last_checked_ok"):
 
510
                    (_datetime_to_dbus_struct(self.last_checked_ok,
 
511
                                              variant_level=1)
 
512
                     if self.last_checked_ok is not None
 
513
                     else dbus.Boolean (False, variant_level=1)),
 
514
                dbus.String("timeout"):
 
515
                    dbus.UInt64(self._timeout_milliseconds,
 
516
                                variant_level=1),
 
517
                dbus.String("interval"):
 
518
                    dbus.UInt64(self._interval_milliseconds,
 
519
                                variant_level=1),
 
520
                dbus.String("checker"):
 
521
                    dbus.String(self.checker_command,
 
522
                                variant_level=1),
 
523
                dbus.String("checker_running"):
 
524
                    dbus.Boolean(self.checker is not None,
 
525
                                 variant_level=1),
 
526
                }, signature="sv")
 
527
    
 
528
    # IsStillValid - method
 
529
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
530
                    (still_valid))
 
531
    IsStillValid.__name__ = "IsStillValid"
 
532
    
 
533
    # PropertyChanged - signal
 
534
    @dbus.service.signal(_interface, signature="sv")
 
535
    def PropertyChanged(self, property, value):
 
536
        "D-Bus signal"
 
537
        pass
 
538
    
 
539
    # SetChecker - method
 
540
    @dbus.service.method(_interface, in_signature="s")
 
541
    def SetChecker(self, checker):
 
542
        "D-Bus setter method"
 
543
        self.checker_command = checker
 
544
    
 
545
    # SetHost - method
 
546
    @dbus.service.method(_interface, in_signature="s")
 
547
    def SetHost(self, host):
 
548
        "D-Bus setter method"
 
549
        self.host = host
 
550
    
 
551
    # SetInterval - method
 
552
    @dbus.service.method(_interface, in_signature="t")
 
553
    def SetInterval(self, milliseconds):
 
554
        self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
 
555
    
 
556
    # SetSecret - method
 
557
    @dbus.service.method(_interface, in_signature="ay",
 
558
                         byte_arrays=True)
 
559
    def SetSecret(self, secret):
 
560
        "D-Bus setter method"
 
561
        self.secret = str(secret)
 
562
    
 
563
    # SetTimeout - method
 
564
    @dbus.service.method(_interface, in_signature="t")
 
565
    def SetTimeout(self, milliseconds):
 
566
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
567
    
 
568
    # Start - method
 
569
    Start = dbus.service.method(_interface)(start)
 
570
    Start.__name__ = "Start"
 
571
    
 
572
    # StartChecker - method
 
573
    @dbus.service.method(_interface)
 
574
    def StartChecker(self):
 
575
        "D-Bus method"
 
576
        self.start_checker()
 
577
    
 
578
    # Stop - method
 
579
    @dbus.service.method(_interface)
 
580
    def Stop(self):
 
581
        "D-Bus method"
 
582
        self.stop()
 
583
    
 
584
    # StopChecker - method
 
585
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
586
    StopChecker.__name__ = "StopChecker"
 
587
    
 
588
    del _interface
393
589
 
394
590
 
395
591
def peer_certificate(session):
396
592
    "Return the peer's OpenPGP certificate as a bytestring"
397
593
    # If not an OpenPGP certificate...
398
 
    if gnutls.library.functions.gnutls_certificate_type_get\
399
 
            (session._c_object) \
400
 
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
 
594
    if (gnutls.library.functions
 
595
        .gnutls_certificate_type_get(session._c_object)
 
596
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
401
597
        # ...do the normal thing
402
598
        return session.peer_certificate
403
599
    list_size = ctypes.c_uint()
404
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
405
 
        (session._c_object, ctypes.byref(list_size))
 
600
    cert_list = (gnutls.library.functions
 
601
                 .gnutls_certificate_get_peers
 
602
                 (session._c_object, ctypes.byref(list_size)))
406
603
    if list_size.value == 0:
407
604
        return None
408
605
    cert = cert_list[0]
412
609
def fingerprint(openpgp):
413
610
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
414
611
    # New GnuTLS "datum" with the OpenPGP public key
415
 
    datum = gnutls.library.types.gnutls_datum_t\
416
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
417
 
                     ctypes.POINTER(ctypes.c_ubyte)),
418
 
         ctypes.c_uint(len(openpgp)))
 
612
    datum = (gnutls.library.types
 
613
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
614
                                         ctypes.POINTER
 
615
                                         (ctypes.c_ubyte)),
 
616
                             ctypes.c_uint(len(openpgp))))
419
617
    # New empty GnuTLS certificate
420
618
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
421
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
422
 
        (ctypes.byref(crt))
 
619
    (gnutls.library.functions
 
620
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
423
621
    # Import the OpenPGP public key into the certificate
424
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
425
 
                    (crt, ctypes.byref(datum),
426
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
622
    (gnutls.library.functions
 
623
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
624
                                gnutls.library.constants
 
625
                                .GNUTLS_OPENPGP_FMT_RAW))
427
626
    # Verify the self signature in the key
428
627
    crtverify = ctypes.c_uint()
429
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
430
 
        (crt, 0, ctypes.byref(crtverify))
 
628
    (gnutls.library.functions
 
629
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
431
630
    if crtverify.value != 0:
432
631
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
433
632
        raise gnutls.errors.CertificateSecurityError("Verify failed")
435
634
    buf = ctypes.create_string_buffer(20)
436
635
    buf_len = ctypes.c_size_t()
437
636
    # Get the fingerprint from the certificate into the buffer
438
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
439
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
637
    (gnutls.library.functions
 
638
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
639
                                         ctypes.byref(buf_len)))
440
640
    # Deinit the certificate
441
641
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
442
642
    # Convert the buffer to a Python bytestring
454
654
    def handle(self):
455
655
        logger.info(u"TCP connection from: %s",
456
656
                    unicode(self.client_address))
457
 
        session = gnutls.connection.ClientSession\
458
 
                  (self.request, gnutls.connection.X509Credentials())
 
657
        session = (gnutls.connection
 
658
                   .ClientSession(self.request,
 
659
                                  gnutls.connection
 
660
                                  .X509Credentials()))
459
661
        
460
662
        line = self.request.makefile().readline()
461
663
        logger.debug(u"Protocol version: %r", line)
476
678
        #                "+DHE-DSS"))
477
679
        # Use a fallback default, since this MUST be set.
478
680
        priority = self.server.settings.get("priority", "NORMAL")
479
 
        gnutls.library.functions.gnutls_priority_set_direct\
480
 
            (session._c_object, priority, None)
 
681
        (gnutls.library.functions
 
682
         .gnutls_priority_set_direct(session._c_object,
 
683
                                     priority, None))
481
684
        
482
685
        try:
483
686
            session.handshake()
493
696
            session.bye()
494
697
            return
495
698
        logger.debug(u"Fingerprint: %s", fpr)
496
 
        client = None
497
699
        for c in self.server.clients:
498
700
            if c.fingerprint == fpr:
499
701
                client = c
500
702
                break
501
 
        if not client:
 
703
        else:
502
704
            logger.warning(u"Client not found for fingerprint: %s",
503
705
                           fpr)
504
706
            session.bye()
649
851
    """Call the C function if_nametoindex(), or equivalent"""
650
852
    global if_nametoindex
651
853
    try:
652
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
653
 
            (ctypes.util.find_library("c")).if_nametoindex
 
854
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
855
                          (ctypes.util.find_library("c"))
 
856
                          .if_nametoindex)
654
857
    except (OSError, AttributeError):
655
858
        if "struct" not in sys.modules:
656
859
            import struct
735
938
    # Convert the SafeConfigParser object to a dict
736
939
    server_settings = server_config.defaults()
737
940
    # Use getboolean on the boolean config option
738
 
    server_settings["debug"] = server_config.getboolean\
739
 
                               ("DEFAULT", "debug")
 
941
    server_settings["debug"] = (server_config.getboolean
 
942
                                ("DEFAULT", "debug"))
740
943
    del server_config
741
944
    
742
945
    # Override the settings from the config file with command line
756
959
        console.setLevel(logging.WARNING)
757
960
    
758
961
    if server_settings["servicename"] != "Mandos":
759
 
        syslogger.setFormatter(logging.Formatter\
 
962
        syslogger.setFormatter(logging.Formatter
760
963
                               ('Mandos (%s): %%(levelname)s:'
761
964
                                ' %%(message)s'
762
965
                                % server_settings["servicename"]))
783
986
    except IOError, error:
784
987
        logger.error("Could not open file %r", pidfilename)
785
988
    
786
 
    uid = 65534
787
 
    gid = 65534
788
 
    try:
789
 
        uid = pwd.getpwnam("mandos").pw_uid
790
 
    except KeyError:
791
 
        try:
792
 
            uid = pwd.getpwnam("nobody").pw_uid
793
 
        except KeyError:
794
 
            pass
795
 
    try:
796
 
        gid = pwd.getpwnam("mandos").pw_gid
797
 
    except KeyError:
798
 
        try:
799
 
            gid = pwd.getpwnam("nogroup").pw_gid
800
 
        except KeyError:
801
 
            pass
 
989
    try:
 
990
        uid = pwd.getpwnam("_mandos").pw_uid
 
991
    except KeyError:
 
992
        try:
 
993
            uid = pwd.getpwnam("mandos").pw_uid
 
994
        except KeyError:
 
995
            try:
 
996
                uid = pwd.getpwnam("nobody").pw_uid
 
997
            except KeyError:
 
998
                uid = 65534
 
999
    try:
 
1000
        gid = pwd.getpwnam("_mandos").pw_gid
 
1001
    except KeyError:
 
1002
        try:
 
1003
            gid = pwd.getpwnam("mandos").pw_gid
 
1004
        except KeyError:
 
1005
            try:
 
1006
                gid = pwd.getpwnam("nogroup").pw_gid
 
1007
            except KeyError:
 
1008
                gid = 65534
802
1009
    try:
803
1010
        os.setuid(uid)
804
1011
        os.setgid(gid)
810
1017
    service = AvahiService(name = server_settings["servicename"],
811
1018
                           servicetype = "_mandos._tcp", )
812
1019
    if server_settings["interface"]:
813
 
        service.interface = if_nametoindex\
814
 
                            (server_settings["interface"])
 
1020
        service.interface = (if_nametoindex
 
1021
                             (server_settings["interface"]))
815
1022
    
816
1023
    global main_loop
817
1024
    global bus
824
1031
                                           avahi.DBUS_PATH_SERVER),
825
1032
                            avahi.DBUS_INTERFACE_SERVER)
826
1033
    # End of Avahi example code
827
 
    
828
 
    def remove_from_clients(client):
829
 
        clients.remove(client)
830
 
        if not clients:
831
 
            logger.critical(u"No clients left, exiting")
832
 
            sys.exit()
 
1034
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
833
1035
    
834
1036
    clients.update(Set(Client(name = section,
835
 
                              stop_hook = remove_from_clients,
836
1037
                              config
837
1038
                              = dict(client_config.items(section)))
838
1039
                       for section in client_config.sections()))
886
1087
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
887
1088
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
888
1089
    
 
1090
    class MandosServer(dbus.service.Object):
 
1091
        """A D-Bus proxy object"""
 
1092
        def __init__(self):
 
1093
            dbus.service.Object.__init__(self, bus,
 
1094
                                         "/Mandos")
 
1095
        _interface = u"org.mandos_system.Mandos"
 
1096
        
 
1097
        @dbus.service.signal(_interface, signature="oa{sv}")
 
1098
        def ClientAdded(self, objpath, properties):
 
1099
            "D-Bus signal"
 
1100
            pass
 
1101
        
 
1102
        @dbus.service.signal(_interface, signature="o")
 
1103
        def ClientRemoved(self, objpath):
 
1104
            "D-Bus signal"
 
1105
            pass
 
1106
        
 
1107
        @dbus.service.method(_interface, out_signature="ao")
 
1108
        def GetAllClients(self):
 
1109
            return dbus.Array(c.dbus_object_path for c in clients)
 
1110
        
 
1111
        @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1112
        def GetAllClientsWithProperties(self):
 
1113
            return dbus.Dictionary(
 
1114
                ((c.dbus_object_path, c.GetAllProperties())
 
1115
                 for c in clients),
 
1116
                signature="oa{sv}")
 
1117
        
 
1118
        @dbus.service.method(_interface, in_signature="o")
 
1119
        def RemoveClient(self, object_path):
 
1120
            for c in clients:
 
1121
                if c.dbus_object_path == object_path:
 
1122
                    c.stop()
 
1123
                    clients.remove(c)
 
1124
                    return
 
1125
            raise KeyError
 
1126
        
 
1127
        del _interface
 
1128
    
 
1129
    mandos_server = MandosServer()
 
1130
    
889
1131
    for client in clients:
 
1132
        # Emit D-Bus signal
 
1133
        mandos_server.ClientAdded(client.dbus_object_path,
 
1134
                                  client.GetAllProperties())
890
1135
        client.start()
891
1136
    
892
1137
    tcp_server.enable()
911
1156
        
912
1157
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
913
1158
                             lambda *args, **kwargs:
914
 
                             tcp_server.handle_request\
915
 
                             (*args[2:], **kwargs) or True)
 
1159
                             (tcp_server.handle_request
 
1160
                              (*args[2:], **kwargs) or True))
916
1161
        
917
1162
        logger.debug(u"Starting main loop")
918
1163
        main_loop.run()