/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-04-01 03:37:45 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090401033745-c89k6bij5opdm1rk
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
                               not try to call
                               dbus.service.Object.__del__() if it
                               does not exist.
  (ClientDBus.start_checker): Simplify logic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
 
# methods "add", "remove", "server_state_changed",
10
 
# "entry_group_state_changed", "cleanup", and "activate" in the
11
 
# "AvahiService" class, and some lines in "main".
 
9
# methods "add" and "remove" in the "AvahiService" class, the
 
10
# "server_state_changed" and "entry_group_state_changed" functions,
 
11
# and some lines in "main".
12
12
13
13
# Everything else is
14
14
# Copyright © 2008,2009 Teddy Hogeborn
33
33
 
34
34
from __future__ import division, with_statement, absolute_import
35
35
 
36
 
import SocketServer as socketserver
 
36
import SocketServer
37
37
import socket
38
38
import optparse
39
39
import datetime
44
44
import gnutls.library.functions
45
45
import gnutls.library.constants
46
46
import gnutls.library.types
47
 
import ConfigParser as configparser
 
47
import ConfigParser
48
48
import sys
49
49
import re
50
50
import os
51
51
import signal
 
52
from sets import Set
52
53
import subprocess
53
54
import atexit
54
55
import stat
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
 
import contextlib
59
 
import struct
60
 
import fcntl
61
 
import functools
62
 
import cPickle as pickle
63
 
import select
 
59
from contextlib import closing
64
60
 
65
61
import dbus
66
62
import dbus.service
69
65
from dbus.mainloop.glib import DBusGMainLoop
70
66
import ctypes
71
67
import ctypes.util
72
 
import xml.dom.minidom
73
 
import inspect
74
 
 
75
 
try:
76
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
 
except AttributeError:
78
 
    try:
79
 
        from IN import SO_BINDTODEVICE
80
 
    except ImportError:
81
 
        SO_BINDTODEVICE = None
82
 
 
83
 
 
84
 
version = "1.0.14"
85
 
 
86
 
logger = logging.Logger(u'mandos')
 
68
 
 
69
version = "1.0.8"
 
70
 
 
71
logger = logging.Logger('mandos')
87
72
syslogger = (logging.handlers.SysLogHandler
88
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
74
              address = "/dev/log"))
90
75
syslogger.setFormatter(logging.Formatter
91
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
92
 
                        u' %(message)s'))
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
93
78
logger.addHandler(syslogger)
94
79
 
95
80
console = logging.StreamHandler()
96
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
97
 
                                       u' %(levelname)s:'
98
 
                                       u' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
99
83
logger.addHandler(console)
100
84
 
101
85
class AvahiError(Exception):
114
98
 
115
99
class AvahiService(object):
116
100
    """An Avahi (Zeroconf) service.
117
 
    
118
101
    Attributes:
119
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
120
103
               Used to optionally bind to the specified interface.
121
 
    name: string; Example: u'Mandos'
122
 
    type: string; Example: u'_mandos._tcp'.
 
104
    name: string; Example: 'Mandos'
 
105
    type: string; Example: '_mandos._tcp'.
123
106
                  See <http://www.dns-sd.org/ServiceTypes.html>
124
107
    port: integer; what port to announce
125
108
    TXT: list of strings; TXT record for the service
128
111
    max_renames: integer; maximum number of renames
129
112
    rename_count: integer; counter so we only rename after collisions
130
113
                  a sensible number of times
131
 
    group: D-Bus Entry Group
132
 
    server: D-Bus Server
133
 
    bus: dbus.SystemBus()
134
114
    """
135
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
136
116
                 servicetype = None, port = None, TXT = None,
137
 
                 domain = u"", host = u"", max_renames = 32768,
138
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
117
                 domain = "", host = "", max_renames = 32768,
 
118
                 protocol = avahi.PROTO_UNSPEC):
139
119
        self.interface = interface
140
120
        self.name = name
141
121
        self.type = servicetype
146
126
        self.rename_count = 0
147
127
        self.max_renames = max_renames
148
128
        self.protocol = protocol
149
 
        self.group = None       # our entry group
150
 
        self.server = None
151
 
        self.bus = bus
152
129
    def rename(self):
153
130
        """Derived from the Avahi example code"""
154
131
        if self.rename_count >= self.max_renames:
156
133
                            u" after %i retries, exiting.",
157
134
                            self.rename_count)
158
135
            raise AvahiServiceError(u"Too many renames")
159
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
136
        self.name = server.GetAlternativeServiceName(self.name)
160
137
        logger.info(u"Changing Zeroconf service name to %r ...",
161
 
                    unicode(self.name))
 
138
                    str(self.name))
162
139
        syslogger.setFormatter(logging.Formatter
163
 
                               (u'Mandos (%s) [%%(process)d]:'
164
 
                                u' %%(levelname)s: %%(message)s'
 
140
                               ('Mandos (%s) [%%(process)d]:'
 
141
                                ' %%(levelname)s: %%(message)s'
165
142
                                % self.name))
166
143
        self.remove()
167
144
        self.add()
168
145
        self.rename_count += 1
169
146
    def remove(self):
170
147
        """Derived from the Avahi example code"""
171
 
        if self.group is not None:
172
 
            self.group.Reset()
 
148
        if group is not None:
 
149
            group.Reset()
173
150
    def add(self):
174
151
        """Derived from the Avahi example code"""
175
 
        if self.group is None:
176
 
            self.group = dbus.Interface(
177
 
                self.bus.get_object(avahi.DBUS_NAME,
178
 
                                    self.server.EntryGroupNew()),
179
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
180
 
            self.group.connect_to_signal('StateChanged',
181
 
                                         self
182
 
                                         .entry_group_state_changed)
 
152
        global group
 
153
        if group is None:
 
154
            group = dbus.Interface(bus.get_object
 
155
                                   (avahi.DBUS_NAME,
 
156
                                    server.EntryGroupNew()),
 
157
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
158
            group.connect_to_signal('StateChanged',
 
159
                                    entry_group_state_changed)
183
160
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
184
 
                     self.name, self.type)
185
 
        self.group.AddService(
186
 
            self.interface,
187
 
            self.protocol,
188
 
            dbus.UInt32(0),     # flags
189
 
            self.name, self.type,
190
 
            self.domain, self.host,
191
 
            dbus.UInt16(self.port),
192
 
            avahi.string_array_to_txt_array(self.TXT))
193
 
        self.group.Commit()
194
 
    def entry_group_state_changed(self, state, error):
195
 
        """Derived from the Avahi example code"""
196
 
        logger.debug(u"Avahi entry group state change: %i", state)
197
 
        
198
 
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
199
 
            logger.debug(u"Zeroconf service established.")
200
 
        elif state == avahi.ENTRY_GROUP_COLLISION:
201
 
            logger.warning(u"Zeroconf service name collision.")
202
 
            self.rename()
203
 
        elif state == avahi.ENTRY_GROUP_FAILURE:
204
 
            logger.critical(u"Avahi: Error in group state changed %s",
205
 
                            unicode(error))
206
 
            raise AvahiGroupError(u"State changed: %s"
207
 
                                  % unicode(error))
208
 
    def cleanup(self):
209
 
        """Derived from the Avahi example code"""
210
 
        if self.group is not None:
211
 
            self.group.Free()
212
 
            self.group = None
213
 
    def server_state_changed(self, state):
214
 
        """Derived from the Avahi example code"""
215
 
        logger.debug(u"Avahi server state change: %i", state)
216
 
        if state == avahi.SERVER_COLLISION:
217
 
            logger.error(u"Zeroconf server name collision")
218
 
            self.remove()
219
 
        elif state == avahi.SERVER_RUNNING:
220
 
            self.add()
221
 
    def activate(self):
222
 
        """Derived from the Avahi example code"""
223
 
        if self.server is None:
224
 
            self.server = dbus.Interface(
225
 
                self.bus.get_object(avahi.DBUS_NAME,
226
 
                                    avahi.DBUS_PATH_SERVER),
227
 
                avahi.DBUS_INTERFACE_SERVER)
228
 
        self.server.connect_to_signal(u"StateChanged",
229
 
                                 self.server_state_changed)
230
 
        self.server_state_changed(self.server.GetState())
 
161
                     service.name, service.type)
 
162
        group.AddService(
 
163
                self.interface,         # interface
 
164
                self.protocol,          # protocol
 
165
                dbus.UInt32(0),         # flags
 
166
                self.name, self.type,
 
167
                self.domain, self.host,
 
168
                dbus.UInt16(self.port),
 
169
                avahi.string_array_to_txt_array(self.TXT))
 
170
        group.Commit()
 
171
 
 
172
# From the Avahi example code:
 
173
group = None                            # our entry group
 
174
# End of Avahi example code
 
175
 
 
176
 
 
177
def _datetime_to_dbus(dt, variant_level=0):
 
178
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
179
    return dbus.String(dt.isoformat(), variant_level=variant_level)
231
180
 
232
181
 
233
182
class Client(object):
234
183
    """A representation of a client host served by this server.
235
 
    
236
184
    Attributes:
237
185
    name:       string; from the config file, used in log messages and
238
186
                        D-Bus identifiers
245
193
    enabled:    bool()
246
194
    last_checked_ok: datetime.datetime(); (UTC) or None
247
195
    timeout:    datetime.timedelta(); How long from last_checked_ok
248
 
                                      until this client is disabled
 
196
                                      until this client is invalid
249
197
    interval:   datetime.timedelta(); How often to start a new checker
250
198
    disable_hook:  If set, called by disable() as disable_hook(self)
251
199
    checker:    subprocess.Popen(); a running checker process used
252
200
                                    to see if the client lives.
253
201
                                    'None' if no process is running.
254
202
    checker_initiator_tag: a gobject event source tag, or None
255
 
    disable_initiator_tag: - '' -
 
203
    disable_initiator_tag:    - '' -
256
204
    checker_callback_tag:  - '' -
257
205
    checker_command: string; External command which is run to check if
258
206
                     client lives.  %() expansions are done at
260
208
                     instance %(name)s can be used in the command.
261
209
    current_checker_command: string; current running checker_command
262
210
    """
263
 
    
264
 
    @staticmethod
265
 
    def _timedelta_to_milliseconds(td):
266
 
        "Convert a datetime.timedelta() to milliseconds"
267
 
        return ((td.days * 24 * 60 * 60 * 1000)
268
 
                + (td.seconds * 1000)
269
 
                + (td.microseconds // 1000))
270
 
    
271
211
    def timeout_milliseconds(self):
272
212
        "Return the 'timeout' attribute in milliseconds"
273
 
        return self._timedelta_to_milliseconds(self.timeout)
 
213
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
214
                + (self.timeout.seconds * 1000)
 
215
                + (self.timeout.microseconds // 1000))
274
216
    
275
217
    def interval_milliseconds(self):
276
218
        "Return the 'interval' attribute in milliseconds"
277
 
        return self._timedelta_to_milliseconds(self.interval)
 
219
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
220
                + (self.interval.seconds * 1000)
 
221
                + (self.interval.microseconds // 1000))
278
222
    
279
223
    def __init__(self, name = None, disable_hook=None, config=None):
280
224
        """Note: the 'checker' key in 'config' sets the
287
231
        # Uppercase and remove spaces from fingerprint for later
288
232
        # comparison purposes with return value from the fingerprint()
289
233
        # function
290
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
234
        self.fingerprint = (config["fingerprint"].upper()
291
235
                            .replace(u" ", u""))
292
236
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
293
 
        if u"secret" in config:
294
 
            self.secret = config[u"secret"].decode(u"base64")
295
 
        elif u"secfile" in config:
296
 
            with open(os.path.expanduser(os.path.expandvars
297
 
                                         (config[u"secfile"])),
298
 
                      "rb") as secfile:
 
237
        if "secret" in config:
 
238
            self.secret = config["secret"].decode(u"base64")
 
239
        elif "secfile" in config:
 
240
            with closing(open(os.path.expanduser
 
241
                              (os.path.expandvars
 
242
                               (config["secfile"])))) as secfile:
299
243
                self.secret = secfile.read()
300
244
        else:
301
245
            raise TypeError(u"No secret or secfile for client %s"
302
246
                            % self.name)
303
 
        self.host = config.get(u"host", u"")
 
247
        self.host = config.get("host", "")
304
248
        self.created = datetime.datetime.utcnow()
305
249
        self.enabled = False
306
250
        self.last_enabled = None
307
251
        self.last_checked_ok = None
308
 
        self.timeout = string_to_delta(config[u"timeout"])
309
 
        self.interval = string_to_delta(config[u"interval"])
 
252
        self.timeout = string_to_delta(config["timeout"])
 
253
        self.interval = string_to_delta(config["interval"])
310
254
        self.disable_hook = disable_hook
311
255
        self.checker = None
312
256
        self.checker_initiator_tag = None
313
257
        self.disable_initiator_tag = None
314
258
        self.checker_callback_tag = None
315
 
        self.checker_command = config[u"checker"]
 
259
        self.checker_command = config["checker"]
316
260
        self.current_checker_command = None
317
261
        self.last_connect = None
318
262
    
319
263
    def enable(self):
320
264
        """Start this client's checker and timeout hooks"""
321
 
        if getattr(self, u"enabled", False):
322
 
            # Already enabled
323
 
            return
324
265
        self.last_enabled = datetime.datetime.utcnow()
325
266
        # Schedule a new checker to be started an 'interval' from now,
326
267
        # and every interval from then on.
327
268
        self.checker_initiator_tag = (gobject.timeout_add
328
269
                                      (self.interval_milliseconds(),
329
270
                                       self.start_checker))
 
271
        # Also start a new checker *right now*.
 
272
        self.start_checker()
330
273
        # Schedule a disable() when 'timeout' has passed
331
274
        self.disable_initiator_tag = (gobject.timeout_add
332
275
                                   (self.timeout_milliseconds(),
333
276
                                    self.disable))
334
277
        self.enabled = True
335
 
        # Also start a new checker *right now*.
336
 
        self.start_checker()
337
278
    
338
 
    def disable(self, quiet=True):
 
279
    def disable(self):
339
280
        """Disable this client."""
340
281
        if not getattr(self, "enabled", False):
341
282
            return False
342
 
        if not quiet:
343
 
            logger.info(u"Disabling client %s", self.name)
344
 
        if getattr(self, u"disable_initiator_tag", False):
 
283
        logger.info(u"Disabling client %s", self.name)
 
284
        if getattr(self, "disable_initiator_tag", False):
345
285
            gobject.source_remove(self.disable_initiator_tag)
346
286
            self.disable_initiator_tag = None
347
 
        if getattr(self, u"checker_initiator_tag", False):
 
287
        if getattr(self, "checker_initiator_tag", False):
348
288
            gobject.source_remove(self.checker_initiator_tag)
349
289
            self.checker_initiator_tag = None
350
290
        self.stop_checker()
377
317
    
378
318
    def checked_ok(self):
379
319
        """Bump up the timeout for this client.
380
 
        
381
320
        This should only be called when the client has been seen,
382
321
        alive and well.
383
322
        """
389
328
    
390
329
    def start_checker(self):
391
330
        """Start a new checker subprocess if one is not running.
392
 
        
393
331
        If a checker already exists, leave it running and do
394
332
        nothing."""
395
333
        # The reason for not killing a running checker is that if we
398
336
        # client would inevitably timeout, since no checker would get
399
337
        # a chance to run to completion.  If we instead leave running
400
338
        # checkers alone, the checker would have to take more time
401
 
        # than 'timeout' for the client to be disabled, which is as it
402
 
        # should be.
 
339
        # than 'timeout' for the client to be declared invalid, which
 
340
        # is as it should be.
403
341
        
404
342
        # If a checker exists, make sure it is not a zombie
405
 
        try:
 
343
        if self.checker is not None:
406
344
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
407
 
        except (AttributeError, OSError), error:
408
 
            if (isinstance(error, OSError)
409
 
                and error.errno != errno.ECHILD):
410
 
                raise error
411
 
        else:
412
345
            if pid:
413
 
                logger.warning(u"Checker was a zombie")
 
346
                logger.warning("Checker was a zombie")
414
347
                gobject.source_remove(self.checker_callback_tag)
415
348
                self.checker_callback(pid, status,
416
349
                                      self.current_checker_command)
421
354
                command = self.checker_command % self.host
422
355
            except TypeError:
423
356
                # Escape attributes for the shell
424
 
                escaped_attrs = dict((key,
425
 
                                      re.escape(unicode(str(val),
426
 
                                                        errors=
427
 
                                                        u'replace')))
 
357
                escaped_attrs = dict((key, re.escape(str(val)))
428
358
                                     for key, val in
429
359
                                     vars(self).iteritems())
430
360
                try:
443
373
                # always replaced by /dev/null.)
444
374
                self.checker = subprocess.Popen(command,
445
375
                                                close_fds=True,
446
 
                                                shell=True, cwd=u"/")
 
376
                                                shell=True, cwd="/")
447
377
                self.checker_callback_tag = (gobject.child_watch_add
448
378
                                             (self.checker.pid,
449
379
                                              self.checker_callback,
465
395
        if self.checker_callback_tag:
466
396
            gobject.source_remove(self.checker_callback_tag)
467
397
            self.checker_callback_tag = None
468
 
        if getattr(self, u"checker", None) is None:
 
398
        if getattr(self, "checker", None) is None:
469
399
            return
470
400
        logger.debug(u"Stopping checker for %(name)s", vars(self))
471
401
        try:
472
402
            os.kill(self.checker.pid, signal.SIGTERM)
473
 
            #time.sleep(0.5)
 
403
            #os.sleep(0.5)
474
404
            #if self.checker.poll() is None:
475
405
            #    os.kill(self.checker.pid, signal.SIGKILL)
476
406
        except OSError, error:
477
407
            if error.errno != errno.ESRCH: # No such process
478
408
                raise
479
409
        self.checker = None
480
 
 
481
 
 
482
 
def dbus_service_property(dbus_interface, signature=u"v",
483
 
                          access=u"readwrite", byte_arrays=False):
484
 
    """Decorators for marking methods of a DBusObjectWithProperties to
485
 
    become properties on the D-Bus.
486
 
    
487
 
    The decorated method will be called with no arguments by "Get"
488
 
    and with one argument by "Set".
489
 
    
490
 
    The parameters, where they are supported, are the same as
491
 
    dbus.service.method, except there is only "signature", since the
492
 
    type from Get() and the type sent to Set() is the same.
493
 
    """
494
 
    # Encoding deeply encoded byte arrays is not supported yet by the
495
 
    # "Set" method, so we fail early here:
496
 
    if byte_arrays and signature != u"ay":
497
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
498
 
                         u" signature %r" % signature)
499
 
    def decorator(func):
500
 
        func._dbus_is_property = True
501
 
        func._dbus_interface = dbus_interface
502
 
        func._dbus_signature = signature
503
 
        func._dbus_access = access
504
 
        func._dbus_name = func.__name__
505
 
        if func._dbus_name.endswith(u"_dbus_property"):
506
 
            func._dbus_name = func._dbus_name[:-14]
507
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
508
 
        return func
509
 
    return decorator
510
 
 
511
 
 
512
 
class DBusPropertyException(dbus.exceptions.DBusException):
513
 
    """A base class for D-Bus property-related exceptions
514
 
    """
515
 
    def __unicode__(self):
516
 
        return unicode(str(self))
517
 
 
518
 
 
519
 
class DBusPropertyAccessException(DBusPropertyException):
520
 
    """A property's access permissions disallows an operation.
521
 
    """
522
 
    pass
523
 
 
524
 
 
525
 
class DBusPropertyNotFound(DBusPropertyException):
526
 
    """An attempt was made to access a non-existing property.
527
 
    """
528
 
    pass
529
 
 
530
 
 
531
 
class DBusObjectWithProperties(dbus.service.Object):
532
 
    """A D-Bus object with properties.
533
 
 
534
 
    Classes inheriting from this can use the dbus_service_property
535
 
    decorator to expose methods as D-Bus properties.  It exposes the
536
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
537
 
    """
538
 
    
539
 
    @staticmethod
540
 
    def _is_dbus_property(obj):
541
 
        return getattr(obj, u"_dbus_is_property", False)
542
 
    
543
 
    def _get_all_dbus_properties(self):
544
 
        """Returns a generator of (name, attribute) pairs
545
 
        """
546
 
        return ((prop._dbus_name, prop)
547
 
                for name, prop in
548
 
                inspect.getmembers(self, self._is_dbus_property))
549
 
    
550
 
    def _get_dbus_property(self, interface_name, property_name):
551
 
        """Returns a bound method if one exists which is a D-Bus
552
 
        property with the specified name and interface.
553
 
        """
554
 
        for name in (property_name,
555
 
                     property_name + u"_dbus_property"):
556
 
            prop = getattr(self, name, None)
557
 
            if (prop is None
558
 
                or not self._is_dbus_property(prop)
559
 
                or prop._dbus_name != property_name
560
 
                or (interface_name and prop._dbus_interface
561
 
                    and interface_name != prop._dbus_interface)):
562
 
                continue
563
 
            return prop
564
 
        # No such property
565
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
566
 
                                   + interface_name + u"."
567
 
                                   + property_name)
568
 
    
569
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
570
 
                         out_signature=u"v")
571
 
    def Get(self, interface_name, property_name):
572
 
        """Standard D-Bus property Get() method, see D-Bus standard.
573
 
        """
574
 
        prop = self._get_dbus_property(interface_name, property_name)
575
 
        if prop._dbus_access == u"write":
576
 
            raise DBusPropertyAccessException(property_name)
577
 
        value = prop()
578
 
        if not hasattr(value, u"variant_level"):
579
 
            return value
580
 
        return type(value)(value, variant_level=value.variant_level+1)
581
 
    
582
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
583
 
    def Set(self, interface_name, property_name, value):
584
 
        """Standard D-Bus property Set() method, see D-Bus standard.
585
 
        """
586
 
        prop = self._get_dbus_property(interface_name, property_name)
587
 
        if prop._dbus_access == u"read":
588
 
            raise DBusPropertyAccessException(property_name)
589
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
590
 
            # The byte_arrays option is not supported yet on
591
 
            # signatures other than "ay".
592
 
            if prop._dbus_signature != u"ay":
593
 
                raise ValueError
594
 
            value = dbus.ByteArray(''.join(unichr(byte)
595
 
                                           for byte in value))
596
 
        prop(value)
597
 
    
598
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
599
 
                         out_signature=u"a{sv}")
600
 
    def GetAll(self, interface_name):
601
 
        """Standard D-Bus property GetAll() method, see D-Bus
602
 
        standard.
603
 
 
604
 
        Note: Will not include properties with access="write".
605
 
        """
606
 
        all = {}
607
 
        for name, prop in self._get_all_dbus_properties():
608
 
            if (interface_name
609
 
                and interface_name != prop._dbus_interface):
610
 
                # Interface non-empty but did not match
611
 
                continue
612
 
            # Ignore write-only properties
613
 
            if prop._dbus_access == u"write":
614
 
                continue
615
 
            value = prop()
616
 
            if not hasattr(value, u"variant_level"):
617
 
                all[name] = value
618
 
                continue
619
 
            all[name] = type(value)(value, variant_level=
620
 
                                    value.variant_level+1)
621
 
        return dbus.Dictionary(all, signature=u"sv")
622
 
    
623
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
624
 
                         out_signature=u"s",
625
 
                         path_keyword='object_path',
626
 
                         connection_keyword='connection')
627
 
    def Introspect(self, object_path, connection):
628
 
        """Standard D-Bus method, overloaded to insert property tags.
629
 
        """
630
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
631
 
                                                   connection)
632
 
        try:
633
 
            document = xml.dom.minidom.parseString(xmlstring)
634
 
            def make_tag(document, name, prop):
635
 
                e = document.createElement(u"property")
636
 
                e.setAttribute(u"name", name)
637
 
                e.setAttribute(u"type", prop._dbus_signature)
638
 
                e.setAttribute(u"access", prop._dbus_access)
639
 
                return e
640
 
            for if_tag in document.getElementsByTagName(u"interface"):
641
 
                for tag in (make_tag(document, name, prop)
642
 
                            for name, prop
643
 
                            in self._get_all_dbus_properties()
644
 
                            if prop._dbus_interface
645
 
                            == if_tag.getAttribute(u"name")):
646
 
                    if_tag.appendChild(tag)
647
 
                # Add the names to the return values for the
648
 
                # "org.freedesktop.DBus.Properties" methods
649
 
                if (if_tag.getAttribute(u"name")
650
 
                    == u"org.freedesktop.DBus.Properties"):
651
 
                    for cn in if_tag.getElementsByTagName(u"method"):
652
 
                        if cn.getAttribute(u"name") == u"Get":
653
 
                            for arg in cn.getElementsByTagName(u"arg"):
654
 
                                if (arg.getAttribute(u"direction")
655
 
                                    == u"out"):
656
 
                                    arg.setAttribute(u"name", u"value")
657
 
                        elif cn.getAttribute(u"name") == u"GetAll":
658
 
                            for arg in cn.getElementsByTagName(u"arg"):
659
 
                                if (arg.getAttribute(u"direction")
660
 
                                    == u"out"):
661
 
                                    arg.setAttribute(u"name", u"props")
662
 
            xmlstring = document.toxml(u"utf-8")
663
 
            document.unlink()
664
 
        except (AttributeError, xml.dom.DOMException,
665
 
                xml.parsers.expat.ExpatError), error:
666
 
            logger.error(u"Failed to override Introspection method",
667
 
                         error)
668
 
        return xmlstring
669
 
 
670
 
 
671
 
class ClientDBus(Client, DBusObjectWithProperties):
 
410
    
 
411
    def still_valid(self):
 
412
        """Has the timeout not yet passed for this client?"""
 
413
        if not getattr(self, "enabled", False):
 
414
            return False
 
415
        now = datetime.datetime.utcnow()
 
416
        if self.last_checked_ok is None:
 
417
            return now < (self.created + self.timeout)
 
418
        else:
 
419
            return now < (self.last_checked_ok + self.timeout)
 
420
 
 
421
 
 
422
class ClientDBus(Client, dbus.service.Object):
672
423
    """A Client class using D-Bus
673
 
    
674
424
    Attributes:
675
 
    dbus_object_path: dbus.ObjectPath
676
 
    bus: dbus.SystemBus()
 
425
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
677
426
    """
678
427
    # dbus.service.Object doesn't use super(), so we can't either.
679
428
    
680
 
    def __init__(self, bus = None, *args, **kwargs):
681
 
        self.bus = bus
 
429
    def __init__(self, *args, **kwargs):
682
430
        Client.__init__(self, *args, **kwargs)
683
431
        # Only now, when this client is initialized, can it show up on
684
432
        # the D-Bus
685
433
        self.dbus_object_path = (dbus.ObjectPath
686
 
                                 (u"/clients/"
687
 
                                  + self.name.replace(u".", u"_")))
688
 
        DBusObjectWithProperties.__init__(self, self.bus,
689
 
                                          self.dbus_object_path)
690
 
    
691
 
    @staticmethod
692
 
    def _datetime_to_dbus(dt, variant_level=0):
693
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
694
 
        return dbus.String(dt.isoformat(),
695
 
                           variant_level=variant_level)
696
 
    
 
434
                                 ("/clients/"
 
435
                                  + self.name.replace(".", "_")))
 
436
        dbus.service.Object.__init__(self, bus,
 
437
                                     self.dbus_object_path)
697
438
    def enable(self):
698
 
        oldstate = getattr(self, u"enabled", False)
 
439
        oldstate = getattr(self, "enabled", False)
699
440
        r = Client.enable(self)
700
441
        if oldstate != self.enabled:
701
442
            # Emit D-Bus signals
702
443
            self.PropertyChanged(dbus.String(u"enabled"),
703
444
                                 dbus.Boolean(True, variant_level=1))
704
 
            self.PropertyChanged(
705
 
                dbus.String(u"last_enabled"),
706
 
                self._datetime_to_dbus(self.last_enabled,
707
 
                                       variant_level=1))
 
445
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
446
                                 (_datetime_to_dbus(self.last_enabled,
 
447
                                                    variant_level=1)))
708
448
        return r
709
449
    
710
 
    def disable(self, quiet = False):
711
 
        oldstate = getattr(self, u"enabled", False)
712
 
        r = Client.disable(self, quiet=quiet)
713
 
        if not quiet and oldstate != self.enabled:
 
450
    def disable(self, signal = True):
 
451
        oldstate = getattr(self, "enabled", False)
 
452
        r = Client.disable(self)
 
453
        if signal and oldstate != self.enabled:
714
454
            # Emit D-Bus signal
715
455
            self.PropertyChanged(dbus.String(u"enabled"),
716
456
                                 dbus.Boolean(False, variant_level=1))
721
461
            self.remove_from_connection()
722
462
        except LookupError:
723
463
            pass
724
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
725
 
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
464
        if hasattr(dbus.service.Object, "__del__"):
 
465
            dbus.service.Object.__del__(self, *args, **kwargs)
726
466
        Client.__del__(self, *args, **kwargs)
727
467
    
728
468
    def checker_callback(self, pid, condition, command,
752
492
        # Emit D-Bus signal
753
493
        self.PropertyChanged(
754
494
            dbus.String(u"last_checked_ok"),
755
 
            (self._datetime_to_dbus(self.last_checked_ok,
756
 
                                    variant_level=1)))
 
495
            (_datetime_to_dbus(self.last_checked_ok,
 
496
                               variant_level=1)))
757
497
        return r
758
498
    
759
499
    def start_checker(self, *args, **kwargs):
769
509
            # Emit D-Bus signal
770
510
            self.CheckerStarted(self.current_checker_command)
771
511
            self.PropertyChanged(
772
 
                dbus.String(u"checker_running"),
 
512
                dbus.String("checker_running"),
773
513
                dbus.Boolean(True, variant_level=1))
774
514
        return r
775
515
    
776
516
    def stop_checker(self, *args, **kwargs):
777
 
        old_checker = getattr(self, u"checker", None)
 
517
        old_checker = getattr(self, "checker", None)
778
518
        r = Client.stop_checker(self, *args, **kwargs)
779
519
        if (old_checker is not None
780
 
            and getattr(self, u"checker", None) is None):
 
520
            and getattr(self, "checker", None) is None):
781
521
            self.PropertyChanged(dbus.String(u"checker_running"),
782
522
                                 dbus.Boolean(False, variant_level=1))
783
523
        return r
784
524
    
785
 
    ## D-Bus methods, signals & properties
 
525
    ## D-Bus methods & signals
786
526
    _interface = u"se.bsnet.fukt.Mandos.Client"
787
527
    
788
 
    ## Signals
 
528
    # CheckedOK - method
 
529
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
530
    CheckedOK.__name__ = "CheckedOK"
789
531
    
790
532
    # CheckerCompleted - signal
791
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
533
    @dbus.service.signal(_interface, signature="nxs")
792
534
    def CheckerCompleted(self, exitcode, waitstatus, command):
793
535
        "D-Bus signal"
794
536
        pass
795
537
    
796
538
    # CheckerStarted - signal
797
 
    @dbus.service.signal(_interface, signature=u"s")
 
539
    @dbus.service.signal(_interface, signature="s")
798
540
    def CheckerStarted(self, command):
799
541
        "D-Bus signal"
800
542
        pass
801
543
    
 
544
    # GetAllProperties - method
 
545
    @dbus.service.method(_interface, out_signature="a{sv}")
 
546
    def GetAllProperties(self):
 
547
        "D-Bus method"
 
548
        return dbus.Dictionary({
 
549
                dbus.String("name"):
 
550
                    dbus.String(self.name, variant_level=1),
 
551
                dbus.String("fingerprint"):
 
552
                    dbus.String(self.fingerprint, variant_level=1),
 
553
                dbus.String("host"):
 
554
                    dbus.String(self.host, variant_level=1),
 
555
                dbus.String("created"):
 
556
                    _datetime_to_dbus(self.created, variant_level=1),
 
557
                dbus.String("last_enabled"):
 
558
                    (_datetime_to_dbus(self.last_enabled,
 
559
                                       variant_level=1)
 
560
                     if self.last_enabled is not None
 
561
                     else dbus.Boolean(False, variant_level=1)),
 
562
                dbus.String("enabled"):
 
563
                    dbus.Boolean(self.enabled, variant_level=1),
 
564
                dbus.String("last_checked_ok"):
 
565
                    (_datetime_to_dbus(self.last_checked_ok,
 
566
                                       variant_level=1)
 
567
                     if self.last_checked_ok is not None
 
568
                     else dbus.Boolean (False, variant_level=1)),
 
569
                dbus.String("timeout"):
 
570
                    dbus.UInt64(self.timeout_milliseconds(),
 
571
                                variant_level=1),
 
572
                dbus.String("interval"):
 
573
                    dbus.UInt64(self.interval_milliseconds(),
 
574
                                variant_level=1),
 
575
                dbus.String("checker"):
 
576
                    dbus.String(self.checker_command,
 
577
                                variant_level=1),
 
578
                dbus.String("checker_running"):
 
579
                    dbus.Boolean(self.checker is not None,
 
580
                                 variant_level=1),
 
581
                dbus.String("object_path"):
 
582
                    dbus.ObjectPath(self.dbus_object_path,
 
583
                                    variant_level=1)
 
584
                }, signature="sv")
 
585
    
 
586
    # IsStillValid - method
 
587
    @dbus.service.method(_interface, out_signature="b")
 
588
    def IsStillValid(self):
 
589
        return self.still_valid()
 
590
    
802
591
    # PropertyChanged - signal
803
 
    @dbus.service.signal(_interface, signature=u"sv")
 
592
    @dbus.service.signal(_interface, signature="sv")
804
593
    def PropertyChanged(self, property, value):
805
594
        "D-Bus signal"
806
595
        pass
807
596
    
808
 
    # GotSecret - signal
 
597
    # ReceivedSecret - signal
809
598
    @dbus.service.signal(_interface)
810
 
    def GotSecret(self):
 
599
    def ReceivedSecret(self):
811
600
        "D-Bus signal"
812
601
        pass
813
602
    
817
606
        "D-Bus signal"
818
607
        pass
819
608
    
820
 
    ## Methods
821
 
    
822
 
    # CheckedOK - method
823
 
    @dbus.service.method(_interface)
824
 
    def CheckedOK(self):
825
 
        return self.checked_ok()
 
609
    # SetChecker - method
 
610
    @dbus.service.method(_interface, in_signature="s")
 
611
    def SetChecker(self, checker):
 
612
        "D-Bus setter method"
 
613
        self.checker_command = checker
 
614
        # Emit D-Bus signal
 
615
        self.PropertyChanged(dbus.String(u"checker"),
 
616
                             dbus.String(self.checker_command,
 
617
                                         variant_level=1))
 
618
    
 
619
    # SetHost - method
 
620
    @dbus.service.method(_interface, in_signature="s")
 
621
    def SetHost(self, host):
 
622
        "D-Bus setter method"
 
623
        self.host = host
 
624
        # Emit D-Bus signal
 
625
        self.PropertyChanged(dbus.String(u"host"),
 
626
                             dbus.String(self.host, variant_level=1))
 
627
    
 
628
    # SetInterval - method
 
629
    @dbus.service.method(_interface, in_signature="t")
 
630
    def SetInterval(self, milliseconds):
 
631
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
632
        # Emit D-Bus signal
 
633
        self.PropertyChanged(dbus.String(u"interval"),
 
634
                             (dbus.UInt64(self.interval_milliseconds(),
 
635
                                          variant_level=1)))
 
636
    
 
637
    # SetSecret - method
 
638
    @dbus.service.method(_interface, in_signature="ay",
 
639
                         byte_arrays=True)
 
640
    def SetSecret(self, secret):
 
641
        "D-Bus setter method"
 
642
        self.secret = str(secret)
 
643
    
 
644
    # SetTimeout - method
 
645
    @dbus.service.method(_interface, in_signature="t")
 
646
    def SetTimeout(self, milliseconds):
 
647
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
648
        # Emit D-Bus signal
 
649
        self.PropertyChanged(dbus.String(u"timeout"),
 
650
                             (dbus.UInt64(self.timeout_milliseconds(),
 
651
                                          variant_level=1)))
826
652
    
827
653
    # Enable - method
828
 
    @dbus.service.method(_interface)
829
 
    def Enable(self):
830
 
        "D-Bus method"
831
 
        self.enable()
 
654
    Enable = dbus.service.method(_interface)(enable)
 
655
    Enable.__name__ = "Enable"
832
656
    
833
657
    # StartChecker - method
834
658
    @dbus.service.method(_interface)
843
667
        self.disable()
844
668
    
845
669
    # StopChecker - method
846
 
    @dbus.service.method(_interface)
847
 
    def StopChecker(self):
848
 
        self.stop_checker()
849
 
    
850
 
    ## Properties
851
 
    
852
 
    # name - property
853
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
854
 
    def name_dbus_property(self):
855
 
        return dbus.String(self.name)
856
 
    
857
 
    # fingerprint - property
858
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
859
 
    def fingerprint_dbus_property(self):
860
 
        return dbus.String(self.fingerprint)
861
 
    
862
 
    # host - property
863
 
    @dbus_service_property(_interface, signature=u"s",
864
 
                           access=u"readwrite")
865
 
    def host_dbus_property(self, value=None):
866
 
        if value is None:       # get
867
 
            return dbus.String(self.host)
868
 
        self.host = value
869
 
        # Emit D-Bus signal
870
 
        self.PropertyChanged(dbus.String(u"host"),
871
 
                             dbus.String(value, variant_level=1))
872
 
    
873
 
    # created - property
874
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
875
 
    def created_dbus_property(self):
876
 
        return dbus.String(self._datetime_to_dbus(self.created))
877
 
    
878
 
    # last_enabled - property
879
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
880
 
    def last_enabled_dbus_property(self):
881
 
        if self.last_enabled is None:
882
 
            return dbus.String(u"")
883
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
884
 
    
885
 
    # enabled - property
886
 
    @dbus_service_property(_interface, signature=u"b",
887
 
                           access=u"readwrite")
888
 
    def enabled_dbus_property(self, value=None):
889
 
        if value is None:       # get
890
 
            return dbus.Boolean(self.enabled)
891
 
        if value:
892
 
            self.enable()
893
 
        else:
894
 
            self.disable()
895
 
    
896
 
    # last_checked_ok - property
897
 
    @dbus_service_property(_interface, signature=u"s",
898
 
                           access=u"readwrite")
899
 
    def last_checked_ok_dbus_property(self, value=None):
900
 
        if value is not None:
901
 
            self.checked_ok()
902
 
            return
903
 
        if self.last_checked_ok is None:
904
 
            return dbus.String(u"")
905
 
        return dbus.String(self._datetime_to_dbus(self
906
 
                                                  .last_checked_ok))
907
 
    
908
 
    # timeout - property
909
 
    @dbus_service_property(_interface, signature=u"t",
910
 
                           access=u"readwrite")
911
 
    def timeout_dbus_property(self, value=None):
912
 
        if value is None:       # get
913
 
            return dbus.UInt64(self.timeout_milliseconds())
914
 
        self.timeout = datetime.timedelta(0, 0, 0, value)
915
 
        # Emit D-Bus signal
916
 
        self.PropertyChanged(dbus.String(u"timeout"),
917
 
                             dbus.UInt64(value, variant_level=1))
918
 
        if getattr(self, u"disable_initiator_tag", None) is None:
919
 
            return
920
 
        # Reschedule timeout
921
 
        gobject.source_remove(self.disable_initiator_tag)
922
 
        self.disable_initiator_tag = None
923
 
        time_to_die = (self.
924
 
                       _timedelta_to_milliseconds((self
925
 
                                                   .last_checked_ok
926
 
                                                   + self.timeout)
927
 
                                                  - datetime.datetime
928
 
                                                  .utcnow()))
929
 
        if time_to_die <= 0:
930
 
            # The timeout has passed
931
 
            self.disable()
932
 
        else:
933
 
            self.disable_initiator_tag = (gobject.timeout_add
934
 
                                          (time_to_die, self.disable))
935
 
    
936
 
    # interval - property
937
 
    @dbus_service_property(_interface, signature=u"t",
938
 
                           access=u"readwrite")
939
 
    def interval_dbus_property(self, value=None):
940
 
        if value is None:       # get
941
 
            return dbus.UInt64(self.interval_milliseconds())
942
 
        self.interval = datetime.timedelta(0, 0, 0, value)
943
 
        # Emit D-Bus signal
944
 
        self.PropertyChanged(dbus.String(u"interval"),
945
 
                             dbus.UInt64(value, variant_level=1))
946
 
        if getattr(self, u"checker_initiator_tag", None) is None:
947
 
            return
948
 
        # Reschedule checker run
949
 
        gobject.source_remove(self.checker_initiator_tag)
950
 
        self.checker_initiator_tag = (gobject.timeout_add
951
 
                                      (value, self.start_checker))
952
 
        self.start_checker()    # Start one now, too
953
 
 
954
 
    # checker - property
955
 
    @dbus_service_property(_interface, signature=u"s",
956
 
                           access=u"readwrite")
957
 
    def checker_dbus_property(self, value=None):
958
 
        if value is None:       # get
959
 
            return dbus.String(self.checker_command)
960
 
        self.checker_command = value
961
 
        # Emit D-Bus signal
962
 
        self.PropertyChanged(dbus.String(u"checker"),
963
 
                             dbus.String(self.checker_command,
964
 
                                         variant_level=1))
965
 
    
966
 
    # checker_running - property
967
 
    @dbus_service_property(_interface, signature=u"b",
968
 
                           access=u"readwrite")
969
 
    def checker_running_dbus_property(self, value=None):
970
 
        if value is None:       # get
971
 
            return dbus.Boolean(self.checker is not None)
972
 
        if value:
973
 
            self.start_checker()
974
 
        else:
975
 
            self.stop_checker()
976
 
    
977
 
    # object_path - property
978
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
979
 
    def object_path_dbus_property(self):
980
 
        return self.dbus_object_path # is already a dbus.ObjectPath
981
 
    
982
 
    # secret = property
983
 
    @dbus_service_property(_interface, signature=u"ay",
984
 
                           access=u"write", byte_arrays=True)
985
 
    def secret_dbus_property(self, value):
986
 
        self.secret = str(value)
 
670
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
671
    StopChecker.__name__ = "StopChecker"
987
672
    
988
673
    del _interface
989
674
 
990
675
 
991
 
class ClientHandler(socketserver.BaseRequestHandler, object):
992
 
    """A class to handle client connections.
993
 
    
994
 
    Instantiated once for each connection to handle it.
 
676
def peer_certificate(session):
 
677
    "Return the peer's OpenPGP certificate as a bytestring"
 
678
    # If not an OpenPGP certificate...
 
679
    if (gnutls.library.functions
 
680
        .gnutls_certificate_type_get(session._c_object)
 
681
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
682
        # ...do the normal thing
 
683
        return session.peer_certificate
 
684
    list_size = ctypes.c_uint(1)
 
685
    cert_list = (gnutls.library.functions
 
686
                 .gnutls_certificate_get_peers
 
687
                 (session._c_object, ctypes.byref(list_size)))
 
688
    if not bool(cert_list) and list_size.value != 0:
 
689
        raise gnutls.errors.GNUTLSError("error getting peer"
 
690
                                        " certificate")
 
691
    if list_size.value == 0:
 
692
        return None
 
693
    cert = cert_list[0]
 
694
    return ctypes.string_at(cert.data, cert.size)
 
695
 
 
696
 
 
697
def fingerprint(openpgp):
 
698
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
699
    # New GnuTLS "datum" with the OpenPGP public key
 
700
    datum = (gnutls.library.types
 
701
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
702
                                         ctypes.POINTER
 
703
                                         (ctypes.c_ubyte)),
 
704
                             ctypes.c_uint(len(openpgp))))
 
705
    # New empty GnuTLS certificate
 
706
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
707
    (gnutls.library.functions
 
708
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
709
    # Import the OpenPGP public key into the certificate
 
710
    (gnutls.library.functions
 
711
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
712
                                gnutls.library.constants
 
713
                                .GNUTLS_OPENPGP_FMT_RAW))
 
714
    # Verify the self signature in the key
 
715
    crtverify = ctypes.c_uint()
 
716
    (gnutls.library.functions
 
717
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
718
    if crtverify.value != 0:
 
719
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
720
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
721
    # New buffer for the fingerprint
 
722
    buf = ctypes.create_string_buffer(20)
 
723
    buf_len = ctypes.c_size_t()
 
724
    # Get the fingerprint from the certificate into the buffer
 
725
    (gnutls.library.functions
 
726
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
727
                                         ctypes.byref(buf_len)))
 
728
    # Deinit the certificate
 
729
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
730
    # Convert the buffer to a Python bytestring
 
731
    fpr = ctypes.string_at(buf, buf_len.value)
 
732
    # Convert the bytestring to hexadecimal notation
 
733
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
734
    return hex_fpr
 
735
 
 
736
 
 
737
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
738
    """A TCP request handler class.
 
739
    Instantiated by IPv6_TCPServer for each request to handle it.
995
740
    Note: This will run in its own forked process."""
996
741
    
997
742
    def handle(self):
998
743
        logger.info(u"TCP connection from: %s",
999
744
                    unicode(self.client_address))
1000
 
        logger.debug(u"IPC Pipe FD: %d",
1001
 
                     self.server.child_pipe[1].fileno())
 
745
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
1002
746
        # Open IPC pipe to parent process
1003
 
        with contextlib.nested(self.server.child_pipe[1],
1004
 
                               self.server.parent_pipe[0]
1005
 
                               ) as (ipc, ipc_return):
 
747
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
1006
748
            session = (gnutls.connection
1007
749
                       .ClientSession(self.request,
1008
750
                                      gnutls.connection
1009
751
                                      .X509Credentials()))
1010
752
            
 
753
            line = self.request.makefile().readline()
 
754
            logger.debug(u"Protocol version: %r", line)
 
755
            try:
 
756
                if int(line.strip().split()[0]) > 1:
 
757
                    raise RuntimeError
 
758
            except (ValueError, IndexError, RuntimeError), error:
 
759
                logger.error(u"Unknown protocol version: %s", error)
 
760
                return
 
761
            
1011
762
            # Note: gnutls.connection.X509Credentials is really a
1012
763
            # generic GnuTLS certificate credentials object so long as
1013
764
            # no X.509 keys are added to it.  Therefore, we can use it
1014
765
            # here despite using OpenPGP certificates.
1015
766
            
1016
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1017
 
            #                      u"+AES-256-CBC", u"+SHA1",
1018
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1019
 
            #                      u"+DHE-DSS"))
 
767
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
768
            #                     "+AES-256-CBC", "+SHA1",
 
769
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
 
770
            #                     "+DHE-DSS"))
1020
771
            # Use a fallback default, since this MUST be set.
1021
 
            priority = self.server.gnutls_priority
1022
 
            if priority is None:
1023
 
                priority = u"NORMAL"
 
772
            priority = self.server.settings.get("priority", "NORMAL")
1024
773
            (gnutls.library.functions
1025
774
             .gnutls_priority_set_direct(session._c_object,
1026
775
                                         priority, None))
1027
776
            
1028
 
            # Start communication using the Mandos protocol
1029
 
            # Get protocol number
1030
 
            line = self.request.makefile().readline()
1031
 
            logger.debug(u"Protocol version: %r", line)
1032
 
            try:
1033
 
                if int(line.strip().split()[0]) > 1:
1034
 
                    raise RuntimeError
1035
 
            except (ValueError, IndexError, RuntimeError), error:
1036
 
                logger.error(u"Unknown protocol version: %s", error)
1037
 
                return
1038
 
            
1039
 
            # Start GnuTLS connection
1040
777
            try:
1041
778
                session.handshake()
1042
779
            except gnutls.errors.GNUTLSError, error:
1046
783
                return
1047
784
            logger.debug(u"Handshake succeeded")
1048
785
            try:
1049
 
                try:
1050
 
                    fpr = self.fingerprint(self.peer_certificate
1051
 
                                           (session))
1052
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1053
 
                    logger.warning(u"Bad certificate: %s", error)
1054
 
                    return
1055
 
                logger.debug(u"Fingerprint: %s", fpr)
1056
 
 
1057
 
                for c in self.server.clients:
1058
 
                    if c.fingerprint == fpr:
1059
 
                        client = c
1060
 
                        break
1061
 
                else:
1062
 
                    ipc.write(u"NOTFOUND %s %s\n"
1063
 
                              % (fpr, unicode(self.client_address)))
1064
 
                    return
1065
 
                
1066
 
                class ClientProxy(object):
1067
 
                    """Client proxy object.  Not for calling methods."""
1068
 
                    def __init__(self, client):
1069
 
                        self.client = client
1070
 
                    def __getattr__(self, name):
1071
 
                        if name.startswith("ipc_"):
1072
 
                            def tempfunc():
1073
 
                                ipc.write("%s %s\n" % (name[4:].upper(),
1074
 
                                                       self.client.name))
1075
 
                            return tempfunc
1076
 
                        if not hasattr(self.client, name):
1077
 
                            raise AttributeError
1078
 
                        ipc.write(u"GETATTR %s %s\n"
1079
 
                                  % (name, self.client.fingerprint))
1080
 
                        return pickle.load(ipc_return)
1081
 
                clientproxy = ClientProxy(client)
1082
 
                # Have to check if client.enabled, since it is
1083
 
                # possible that the client was disabled since the
1084
 
                # GnuTLS session was established.
1085
 
                if not clientproxy.enabled:
1086
 
                    clientproxy.ipc_disabled()
1087
 
                    return
1088
 
                
1089
 
                clientproxy.ipc_sending()
1090
 
                sent_size = 0
1091
 
                while sent_size < len(client.secret):
1092
 
                    sent = session.send(client.secret[sent_size:])
1093
 
                    logger.debug(u"Sent: %d, remaining: %d",
1094
 
                                 sent, len(client.secret)
1095
 
                                 - (sent_size + sent))
1096
 
                    sent_size += sent
1097
 
            finally:
1098
 
                session.bye()
1099
 
    
1100
 
    @staticmethod
1101
 
    def peer_certificate(session):
1102
 
        "Return the peer's OpenPGP certificate as a bytestring"
1103
 
        # If not an OpenPGP certificate...
1104
 
        if (gnutls.library.functions
1105
 
            .gnutls_certificate_type_get(session._c_object)
1106
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1107
 
            # ...do the normal thing
1108
 
            return session.peer_certificate
1109
 
        list_size = ctypes.c_uint(1)
1110
 
        cert_list = (gnutls.library.functions
1111
 
                     .gnutls_certificate_get_peers
1112
 
                     (session._c_object, ctypes.byref(list_size)))
1113
 
        if not bool(cert_list) and list_size.value != 0:
1114
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1115
 
                                            u" certificate")
1116
 
        if list_size.value == 0:
1117
 
            return None
1118
 
        cert = cert_list[0]
1119
 
        return ctypes.string_at(cert.data, cert.size)
1120
 
    
1121
 
    @staticmethod
1122
 
    def fingerprint(openpgp):
1123
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1124
 
        # New GnuTLS "datum" with the OpenPGP public key
1125
 
        datum = (gnutls.library.types
1126
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1127
 
                                             ctypes.POINTER
1128
 
                                             (ctypes.c_ubyte)),
1129
 
                                 ctypes.c_uint(len(openpgp))))
1130
 
        # New empty GnuTLS certificate
1131
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1132
 
        (gnutls.library.functions
1133
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1134
 
        # Import the OpenPGP public key into the certificate
1135
 
        (gnutls.library.functions
1136
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1137
 
                                    gnutls.library.constants
1138
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
1139
 
        # Verify the self signature in the key
1140
 
        crtverify = ctypes.c_uint()
1141
 
        (gnutls.library.functions
1142
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1143
 
                                         ctypes.byref(crtverify)))
1144
 
        if crtverify.value != 0:
1145
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1146
 
            raise (gnutls.errors.CertificateSecurityError
1147
 
                   (u"Verify failed"))
1148
 
        # New buffer for the fingerprint
1149
 
        buf = ctypes.create_string_buffer(20)
1150
 
        buf_len = ctypes.c_size_t()
1151
 
        # Get the fingerprint from the certificate into the buffer
1152
 
        (gnutls.library.functions
1153
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1154
 
                                             ctypes.byref(buf_len)))
1155
 
        # Deinit the certificate
1156
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1157
 
        # Convert the buffer to a Python bytestring
1158
 
        fpr = ctypes.string_at(buf, buf_len.value)
1159
 
        # Convert the bytestring to hexadecimal notation
1160
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1161
 
        return hex_fpr
1162
 
 
1163
 
 
1164
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1165
 
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
786
                fpr = fingerprint(peer_certificate(session))
 
787
            except (TypeError, gnutls.errors.GNUTLSError), error:
 
788
                logger.warning(u"Bad certificate: %s", error)
 
789
                session.bye()
 
790
                return
 
791
            logger.debug(u"Fingerprint: %s", fpr)
 
792
            
 
793
            for c in self.server.clients:
 
794
                if c.fingerprint == fpr:
 
795
                    client = c
 
796
                    break
 
797
            else:
 
798
                logger.warning(u"Client not found for fingerprint: %s",
 
799
                               fpr)
 
800
                ipc.write("NOTFOUND %s\n" % fpr)
 
801
                session.bye()
 
802
                return
 
803
            # Have to check if client.still_valid(), since it is
 
804
            # possible that the client timed out while establishing
 
805
            # the GnuTLS session.
 
806
            if not client.still_valid():
 
807
                logger.warning(u"Client %(name)s is invalid",
 
808
                               vars(client))
 
809
                ipc.write("INVALID %s\n" % client.name)
 
810
                session.bye()
 
811
                return
 
812
            ipc.write("SENDING %s\n" % client.name)
 
813
            sent_size = 0
 
814
            while sent_size < len(client.secret):
 
815
                sent = session.send(client.secret[sent_size:])
 
816
                logger.debug(u"Sent: %d, remaining: %d",
 
817
                             sent, len(client.secret)
 
818
                             - (sent_size + sent))
 
819
                sent_size += sent
 
820
            session.bye()
 
821
 
 
822
 
 
823
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
 
824
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
 
825
    Assumes a gobject.MainLoop event loop.
 
826
    """
1166
827
    def process_request(self, request, client_address):
1167
 
        """Overrides and wraps the original process_request().
1168
 
        
1169
 
        This function creates a new pipe in self.pipe
 
828
        """This overrides and wraps the original process_request().
 
829
        This function creates a new pipe in self.pipe 
1170
830
        """
1171
 
        # Child writes to child_pipe
1172
 
        self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1173
 
        # Parent writes to parent_pipe
1174
 
        self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1175
 
        super(ForkingMixInWithPipes,
 
831
        self.pipe = os.pipe()
 
832
        super(ForkingMixInWithPipe,
1176
833
              self).process_request(request, client_address)
1177
 
        # Close unused ends for parent
1178
 
        self.parent_pipe[0].close() # close read end
1179
 
        self.child_pipe[1].close()  # close write end
1180
 
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1181
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
834
        os.close(self.pipe[1])  # close write end
 
835
        # Call "handle_ipc" for both data and EOF events
 
836
        gobject.io_add_watch(self.pipe[0],
 
837
                             gobject.IO_IN | gobject.IO_HUP,
 
838
                             self.handle_ipc)
 
839
    def handle_ipc(source, condition):
1182
840
        """Dummy function; override as necessary"""
1183
 
        child_pipe_fd.close()
1184
 
        parent_pipe_fd.close()
1185
 
 
1186
 
 
1187
 
class IPv6_TCPServer(ForkingMixInWithPipes,
1188
 
                     socketserver.TCPServer, object):
 
841
        os.close(source)
 
842
        return False
 
843
 
 
844
 
 
845
class IPv6_TCPServer(ForkingMixInWithPipe,
 
846
                     SocketServer.TCPServer, object):
1189
847
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1190
 
    
1191
848
    Attributes:
 
849
        settings:       Server settings
 
850
        clients:        Set() of Client objects
1192
851
        enabled:        Boolean; whether this server is activated yet
1193
 
        interface:      None or a network interface name (string)
1194
 
        use_ipv6:       Boolean; to use IPv6 or not
1195
852
    """
1196
 
    def __init__(self, server_address, RequestHandlerClass,
1197
 
                 interface=None, use_ipv6=True):
1198
 
        self.interface = interface
1199
 
        if use_ipv6:
1200
 
            self.address_family = socket.AF_INET6
1201
 
        socketserver.TCPServer.__init__(self, server_address,
1202
 
                                        RequestHandlerClass)
 
853
    address_family = socket.AF_INET6
 
854
    def __init__(self, *args, **kwargs):
 
855
        if "settings" in kwargs:
 
856
            self.settings = kwargs["settings"]
 
857
            del kwargs["settings"]
 
858
        if "clients" in kwargs:
 
859
            self.clients = kwargs["clients"]
 
860
            del kwargs["clients"]
 
861
        if "use_ipv6" in kwargs:
 
862
            if not kwargs["use_ipv6"]:
 
863
                self.address_family = socket.AF_INET
 
864
            del kwargs["use_ipv6"]
 
865
        self.enabled = False
 
866
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1203
867
    def server_bind(self):
1204
868
        """This overrides the normal server_bind() function
1205
869
        to bind to an interface if one was specified, and also NOT to
1206
870
        bind to an address or port if they were not specified."""
1207
 
        if self.interface is not None:
1208
 
            if SO_BINDTODEVICE is None:
1209
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1210
 
                             u" cannot bind to interface %s",
1211
 
                             self.interface)
1212
 
            else:
1213
 
                try:
1214
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1215
 
                                           SO_BINDTODEVICE,
1216
 
                                           str(self.interface
1217
 
                                               + u'\0'))
1218
 
                except socket.error, error:
1219
 
                    if error[0] == errno.EPERM:
1220
 
                        logger.error(u"No permission to"
1221
 
                                     u" bind to interface %s",
1222
 
                                     self.interface)
1223
 
                    elif error[0] == errno.ENOPROTOOPT:
1224
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1225
 
                                     u" cannot bind to interface %s",
1226
 
                                     self.interface)
1227
 
                    else:
1228
 
                        raise
 
871
        if self.settings["interface"]:
 
872
            # 25 is from /usr/include/asm-i486/socket.h
 
873
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
874
            try:
 
875
                self.socket.setsockopt(socket.SOL_SOCKET,
 
876
                                       SO_BINDTODEVICE,
 
877
                                       self.settings["interface"])
 
878
            except socket.error, error:
 
879
                if error[0] == errno.EPERM:
 
880
                    logger.error(u"No permission to"
 
881
                                 u" bind to interface %s",
 
882
                                 self.settings["interface"])
 
883
                else:
 
884
                    raise
1229
885
        # Only bind(2) the socket if we really need to.
1230
886
        if self.server_address[0] or self.server_address[1]:
1231
887
            if not self.server_address[0]:
1232
888
                if self.address_family == socket.AF_INET6:
1233
 
                    any_address = u"::" # in6addr_any
 
889
                    any_address = "::" # in6addr_any
1234
890
                else:
1235
891
                    any_address = socket.INADDR_ANY
1236
892
                self.server_address = (any_address,
1238
894
            elif not self.server_address[1]:
1239
895
                self.server_address = (self.server_address[0],
1240
896
                                       0)
1241
 
#                 if self.interface:
 
897
#                 if self.settings["interface"]:
1242
898
#                     self.server_address = (self.server_address[0],
1243
899
#                                            0, # port
1244
900
#                                            0, # flowinfo
1245
901
#                                            if_nametoindex
1246
 
#                                            (self.interface))
1247
 
            return socketserver.TCPServer.server_bind(self)
1248
 
 
1249
 
 
1250
 
class MandosServer(IPv6_TCPServer):
1251
 
    """Mandos server.
1252
 
    
1253
 
    Attributes:
1254
 
        clients:        set of Client objects
1255
 
        gnutls_priority GnuTLS priority string
1256
 
        use_dbus:       Boolean; to emit D-Bus signals or not
1257
 
    
1258
 
    Assumes a gobject.MainLoop event loop.
1259
 
    """
1260
 
    def __init__(self, server_address, RequestHandlerClass,
1261
 
                 interface=None, use_ipv6=True, clients=None,
1262
 
                 gnutls_priority=None, use_dbus=True):
1263
 
        self.enabled = False
1264
 
        self.clients = clients
1265
 
        if self.clients is None:
1266
 
            self.clients = set()
1267
 
        self.use_dbus = use_dbus
1268
 
        self.gnutls_priority = gnutls_priority
1269
 
        IPv6_TCPServer.__init__(self, server_address,
1270
 
                                RequestHandlerClass,
1271
 
                                interface = interface,
1272
 
                                use_ipv6 = use_ipv6)
 
902
#                                            (self.settings
 
903
#                                             ["interface"]))
 
904
            return super(IPv6_TCPServer, self).server_bind()
1273
905
    def server_activate(self):
1274
906
        if self.enabled:
1275
 
            return socketserver.TCPServer.server_activate(self)
 
907
            return super(IPv6_TCPServer, self).server_activate()
1276
908
    def enable(self):
1277
909
        self.enabled = True
1278
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1279
 
        # Call "handle_ipc" for both data and EOF events
1280
 
        gobject.io_add_watch(child_pipe_fd.fileno(),
1281
 
                             gobject.IO_IN | gobject.IO_HUP,
1282
 
                             functools.partial(self.handle_ipc,
1283
 
                                               reply = parent_pipe_fd,
1284
 
                                               sender= child_pipe_fd))
1285
 
    def handle_ipc(self, source, condition, reply=None, sender=None):
 
910
    def handle_ipc(self, source, condition, file_objects={}):
1286
911
        condition_names = {
1287
 
            gobject.IO_IN: u"IN",   # There is data to read.
1288
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
1289
 
                                    # blocking).
1290
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1291
 
            gobject.IO_ERR: u"ERR", # Error condition.
1292
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1293
 
                                    # broken, usually for pipes and
1294
 
                                    # sockets).
 
912
            gobject.IO_IN: "IN", # There is data to read.
 
913
            gobject.IO_OUT: "OUT", # Data can be written (without
 
914
                                   # blocking).
 
915
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
916
            gobject.IO_ERR: "ERR", # Error condition.
 
917
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
918
                                   # broken, usually for pipes and
 
919
                                   # sockets).
1295
920
            }
1296
921
        conditions_string = ' | '.join(name
1297
922
                                       for cond, name in
1298
923
                                       condition_names.iteritems()
1299
924
                                       if cond & condition)
1300
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
925
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
1301
926
                     conditions_string)
1302
927
        
 
928
        # Turn the pipe file descriptor into a Python file object
 
929
        if source not in file_objects:
 
930
            file_objects[source] = os.fdopen(source, "r", 1)
 
931
        
1303
932
        # Read a line from the file object
1304
 
        cmdline = sender.readline()
 
933
        cmdline = file_objects[source].readline()
1305
934
        if not cmdline:             # Empty line means end of file
1306
 
            # close the IPC pipes
1307
 
            sender.close()
1308
 
            reply.close()
 
935
            # close the IPC pipe
 
936
            file_objects[source].close()
 
937
            del file_objects[source]
1309
938
            
1310
939
            # Stop calling this function
1311
940
            return False
1312
941
        
1313
 
        logger.debug(u"IPC command: %r", cmdline)
 
942
        logger.debug("IPC command: %r\n" % cmdline)
1314
943
        
1315
944
        # Parse and act on command
1316
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1317
 
        
1318
 
        if cmd == u"NOTFOUND":
1319
 
            fpr, address = args.split(None, 1)
1320
 
            logger.warning(u"Client not found for fingerprint: %s, ad"
1321
 
                           u"dress: %s", fpr, address)
1322
 
            if self.use_dbus:
 
945
        cmd, args = cmdline.split(None, 1)
 
946
        if cmd == "NOTFOUND":
 
947
            if self.settings["use_dbus"]:
1323
948
                # Emit D-Bus signal
1324
 
                mandos_dbus_service.ClientNotFound(fpr, address)
1325
 
        elif cmd == u"DISABLED":
1326
 
            for client in self.clients:
1327
 
                if client.name == args:
1328
 
                    logger.warning(u"Client %s is disabled", args)
1329
 
                    if self.use_dbus:
 
949
                mandos_dbus_service.ClientNotFound(args)
 
950
        elif cmd == "INVALID":
 
951
            if self.settings["use_dbus"]:
 
952
                for client in self.clients:
 
953
                    if client.name == args:
1330
954
                        # Emit D-Bus signal
1331
955
                        client.Rejected()
1332
 
                    break
1333
 
            else:
1334
 
                logger.error(u"Unknown client %s is disabled", args)
1335
 
        elif cmd == u"SENDING":
 
956
                        break
 
957
        elif cmd == "SENDING":
1336
958
            for client in self.clients:
1337
959
                if client.name == args:
1338
 
                    logger.info(u"Sending secret to %s", client.name)
1339
960
                    client.checked_ok()
1340
 
                    if self.use_dbus:
 
961
                    if self.settings["use_dbus"]:
1341
962
                        # Emit D-Bus signal
1342
 
                        client.GotSecret()
1343
 
                    break
1344
 
            else:
1345
 
                logger.error(u"Sending secret to unknown client %s",
1346
 
                             args)
1347
 
        elif cmd == u"GETATTR":
1348
 
            attr_name, fpr = args.split(None, 1)
1349
 
            for client in self.clients:
1350
 
                if client.fingerprint == fpr:
1351
 
                    attr_value = getattr(client, attr_name, None)
1352
 
                    logger.debug("IPC reply: %r", attr_value)
1353
 
                    pickle.dump(attr_value, reply)
1354
 
                    break
1355
 
            else:
1356
 
                logger.error(u"Client %s on address %s requesting "
1357
 
                             u"attribute %s not found", fpr, address,
1358
 
                             attr_name)
1359
 
                pickle.dump(None, reply)
 
963
                        client.ReceivedSecret()
 
964
                    break
1360
965
        else:
1361
 
            logger.error(u"Unknown IPC command: %r", cmdline)
 
966
            logger.error("Unknown IPC command: %r", cmdline)
1362
967
        
1363
968
        # Keep calling this function
1364
969
        return True
1367
972
def string_to_delta(interval):
1368
973
    """Parse a string and return a datetime.timedelta
1369
974
    
1370
 
    >>> string_to_delta(u'7d')
 
975
    >>> string_to_delta('7d')
1371
976
    datetime.timedelta(7)
1372
 
    >>> string_to_delta(u'60s')
 
977
    >>> string_to_delta('60s')
1373
978
    datetime.timedelta(0, 60)
1374
 
    >>> string_to_delta(u'60m')
 
979
    >>> string_to_delta('60m')
1375
980
    datetime.timedelta(0, 3600)
1376
 
    >>> string_to_delta(u'24h')
 
981
    >>> string_to_delta('24h')
1377
982
    datetime.timedelta(1)
1378
983
    >>> string_to_delta(u'1w')
1379
984
    datetime.timedelta(7)
1380
 
    >>> string_to_delta(u'5m 30s')
 
985
    >>> string_to_delta('5m 30s')
1381
986
    datetime.timedelta(0, 330)
1382
987
    """
1383
988
    timevalue = datetime.timedelta(0)
1396
1001
            elif suffix == u"w":
1397
1002
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1398
1003
            else:
1399
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1400
 
        except (ValueError, IndexError), e:
1401
 
            raise ValueError(e.message)
 
1004
                raise ValueError
 
1005
        except (ValueError, IndexError):
 
1006
            raise ValueError
1402
1007
        timevalue += delta
1403
1008
    return timevalue
1404
1009
 
1405
1010
 
 
1011
def server_state_changed(state):
 
1012
    """Derived from the Avahi example code"""
 
1013
    if state == avahi.SERVER_COLLISION:
 
1014
        logger.error(u"Zeroconf server name collision")
 
1015
        service.remove()
 
1016
    elif state == avahi.SERVER_RUNNING:
 
1017
        service.add()
 
1018
 
 
1019
 
 
1020
def entry_group_state_changed(state, error):
 
1021
    """Derived from the Avahi example code"""
 
1022
    logger.debug(u"Avahi state change: %i", state)
 
1023
    
 
1024
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
1025
        logger.debug(u"Zeroconf service established.")
 
1026
    elif state == avahi.ENTRY_GROUP_COLLISION:
 
1027
        logger.warning(u"Zeroconf service name collision.")
 
1028
        service.rename()
 
1029
    elif state == avahi.ENTRY_GROUP_FAILURE:
 
1030
        logger.critical(u"Avahi: Error in group state changed %s",
 
1031
                        unicode(error))
 
1032
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
1033
 
1406
1034
def if_nametoindex(interface):
1407
 
    """Call the C function if_nametoindex(), or equivalent
1408
 
    
1409
 
    Note: This function cannot accept a unicode string."""
 
1035
    """Call the C function if_nametoindex(), or equivalent"""
1410
1036
    global if_nametoindex
1411
1037
    try:
1412
1038
        if_nametoindex = (ctypes.cdll.LoadLibrary
1413
 
                          (ctypes.util.find_library(u"c"))
 
1039
                          (ctypes.util.find_library("c"))
1414
1040
                          .if_nametoindex)
1415
1041
    except (OSError, AttributeError):
1416
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1042
        if "struct" not in sys.modules:
 
1043
            import struct
 
1044
        if "fcntl" not in sys.modules:
 
1045
            import fcntl
1417
1046
        def if_nametoindex(interface):
1418
1047
            "Get an interface index the hard way, i.e. using fcntl()"
1419
1048
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1420
 
            with contextlib.closing(socket.socket()) as s:
 
1049
            with closing(socket.socket()) as s:
1421
1050
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1422
 
                                    struct.pack(str(u"16s16x"),
1423
 
                                                interface))
1424
 
            interface_index = struct.unpack(str(u"I"),
1425
 
                                            ifreq[16:20])[0]
 
1051
                                    struct.pack("16s16x", interface))
 
1052
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1426
1053
            return interface_index
1427
1054
    return if_nametoindex(interface)
1428
1055
 
1429
1056
 
1430
1057
def daemon(nochdir = False, noclose = False):
1431
1058
    """See daemon(3).  Standard BSD Unix function.
1432
 
    
1433
1059
    This should really exist as os.daemon, but it doesn't (yet)."""
1434
1060
    if os.fork():
1435
1061
        sys.exit()
1436
1062
    os.setsid()
1437
1063
    if not nochdir:
1438
 
        os.chdir(u"/")
 
1064
        os.chdir("/")
1439
1065
    if os.fork():
1440
1066
        sys.exit()
1441
1067
    if not noclose:
1443
1069
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1444
1070
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1445
1071
            raise OSError(errno.ENODEV,
1446
 
                          u"%s not a character device"
1447
 
                          % os.path.devnull)
 
1072
                          "/dev/null not a character device")
1448
1073
        os.dup2(null, sys.stdin.fileno())
1449
1074
        os.dup2(null, sys.stdout.fileno())
1450
1075
        os.dup2(null, sys.stderr.fileno())
1454
1079
 
1455
1080
def main():
1456
1081
    
1457
 
    ##################################################################
 
1082
    ######################################################################
1458
1083
    # Parsing of options, both command line and config file
1459
1084
    
1460
1085
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1461
 
    parser.add_option("-i", u"--interface", type=u"string",
1462
 
                      metavar="IF", help=u"Bind to interface IF")
1463
 
    parser.add_option("-a", u"--address", type=u"string",
1464
 
                      help=u"Address to listen for requests on")
1465
 
    parser.add_option("-p", u"--port", type=u"int",
1466
 
                      help=u"Port number to receive requests on")
1467
 
    parser.add_option("--check", action=u"store_true",
1468
 
                      help=u"Run self-test")
1469
 
    parser.add_option("--debug", action=u"store_true",
1470
 
                      help=u"Debug mode; run in foreground and log to"
1471
 
                      u" terminal")
1472
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1473
 
                      u" priority string (see GnuTLS documentation)")
1474
 
    parser.add_option("--servicename", type=u"string",
1475
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1476
 
    parser.add_option("--configdir", type=u"string",
1477
 
                      default=u"/etc/mandos", metavar=u"DIR",
1478
 
                      help=u"Directory to search for configuration"
1479
 
                      u" files")
1480
 
    parser.add_option("--no-dbus", action=u"store_false",
1481
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1482
 
                      u" system bus interface")
1483
 
    parser.add_option("--no-ipv6", action=u"store_false",
1484
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1086
    parser.add_option("-i", "--interface", type="string",
 
1087
                      metavar="IF", help="Bind to interface IF")
 
1088
    parser.add_option("-a", "--address", type="string",
 
1089
                      help="Address to listen for requests on")
 
1090
    parser.add_option("-p", "--port", type="int",
 
1091
                      help="Port number to receive requests on")
 
1092
    parser.add_option("--check", action="store_true",
 
1093
                      help="Run self-test")
 
1094
    parser.add_option("--debug", action="store_true",
 
1095
                      help="Debug mode; run in foreground and log to"
 
1096
                      " terminal")
 
1097
    parser.add_option("--priority", type="string", help="GnuTLS"
 
1098
                      " priority string (see GnuTLS documentation)")
 
1099
    parser.add_option("--servicename", type="string", metavar="NAME",
 
1100
                      help="Zeroconf service name")
 
1101
    parser.add_option("--configdir", type="string",
 
1102
                      default="/etc/mandos", metavar="DIR",
 
1103
                      help="Directory to search for configuration"
 
1104
                      " files")
 
1105
    parser.add_option("--no-dbus", action="store_false",
 
1106
                      dest="use_dbus",
 
1107
                      help="Do not provide D-Bus system bus"
 
1108
                      " interface")
 
1109
    parser.add_option("--no-ipv6", action="store_false",
 
1110
                      dest="use_ipv6", help="Do not use IPv6")
1485
1111
    options = parser.parse_args()[0]
1486
1112
    
1487
1113
    if options.check:
1490
1116
        sys.exit()
1491
1117
    
1492
1118
    # Default values for config file for server-global settings
1493
 
    server_defaults = { u"interface": u"",
1494
 
                        u"address": u"",
1495
 
                        u"port": u"",
1496
 
                        u"debug": u"False",
1497
 
                        u"priority":
1498
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1499
 
                        u"servicename": u"Mandos",
1500
 
                        u"use_dbus": u"True",
1501
 
                        u"use_ipv6": u"True",
 
1119
    server_defaults = { "interface": "",
 
1120
                        "address": "",
 
1121
                        "port": "",
 
1122
                        "debug": "False",
 
1123
                        "priority":
 
1124
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1125
                        "servicename": "Mandos",
 
1126
                        "use_dbus": "True",
 
1127
                        "use_ipv6": "True",
1502
1128
                        }
1503
1129
    
1504
1130
    # Parse config file for server-global settings
1505
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
1131
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1506
1132
    del server_defaults
1507
 
    server_config.read(os.path.join(options.configdir,
1508
 
                                    u"mandos.conf"))
 
1133
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1509
1134
    # Convert the SafeConfigParser object to a dict
1510
1135
    server_settings = server_config.defaults()
1511
1136
    # Use the appropriate methods on the non-string config options
1512
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1513
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1514
 
                                                           option)
 
1137
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
1138
                                                        "debug")
 
1139
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
1140
                                                           "use_dbus")
 
1141
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
1142
                                                           "use_ipv6")
1515
1143
    if server_settings["port"]:
1516
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1517
 
                                                       u"port")
 
1144
        server_settings["port"] = server_config.getint("DEFAULT",
 
1145
                                                       "port")
1518
1146
    del server_config
1519
1147
    
1520
1148
    # Override the settings from the config file with command line
1521
1149
    # options, if set.
1522
 
    for option in (u"interface", u"address", u"port", u"debug",
1523
 
                   u"priority", u"servicename", u"configdir",
1524
 
                   u"use_dbus", u"use_ipv6"):
 
1150
    for option in ("interface", "address", "port", "debug",
 
1151
                   "priority", "servicename", "configdir",
 
1152
                   "use_dbus", "use_ipv6"):
1525
1153
        value = getattr(options, option)
1526
1154
        if value is not None:
1527
1155
            server_settings[option] = value
1528
1156
    del options
1529
 
    # Force all strings to be unicode
1530
 
    for option in server_settings.keys():
1531
 
        if type(server_settings[option]) is str:
1532
 
            server_settings[option] = unicode(server_settings[option])
1533
1157
    # Now we have our good server settings in "server_settings"
1534
1158
    
1535
1159
    ##################################################################
1536
1160
    
1537
1161
    # For convenience
1538
 
    debug = server_settings[u"debug"]
1539
 
    use_dbus = server_settings[u"use_dbus"]
1540
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1162
    debug = server_settings["debug"]
 
1163
    use_dbus = server_settings["use_dbus"]
 
1164
    use_ipv6 = server_settings["use_ipv6"]
1541
1165
    
1542
1166
    if not debug:
1543
1167
        syslogger.setLevel(logging.WARNING)
1544
1168
        console.setLevel(logging.WARNING)
1545
1169
    
1546
 
    if server_settings[u"servicename"] != u"Mandos":
 
1170
    if server_settings["servicename"] != "Mandos":
1547
1171
        syslogger.setFormatter(logging.Formatter
1548
 
                               (u'Mandos (%s) [%%(process)d]:'
1549
 
                                u' %%(levelname)s: %%(message)s'
1550
 
                                % server_settings[u"servicename"]))
 
1172
                               ('Mandos (%s) [%%(process)d]:'
 
1173
                                ' %%(levelname)s: %%(message)s'
 
1174
                                % server_settings["servicename"]))
1551
1175
    
1552
1176
    # Parse config file with clients
1553
 
    client_defaults = { u"timeout": u"1h",
1554
 
                        u"interval": u"5m",
1555
 
                        u"checker": u"fping -q -- %%(host)s",
1556
 
                        u"host": u"",
 
1177
    client_defaults = { "timeout": "1h",
 
1178
                        "interval": "5m",
 
1179
                        "checker": "fping -q -- %%(host)s",
 
1180
                        "host": "",
1557
1181
                        }
1558
 
    client_config = configparser.SafeConfigParser(client_defaults)
1559
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1560
 
                                    u"clients.conf"))
1561
 
    
 
1182
    client_config = ConfigParser.SafeConfigParser(client_defaults)
 
1183
    client_config.read(os.path.join(server_settings["configdir"],
 
1184
                                    "clients.conf"))
 
1185
 
1562
1186
    global mandos_dbus_service
1563
1187
    mandos_dbus_service = None
1564
1188
    
1565
 
    tcp_server = MandosServer((server_settings[u"address"],
1566
 
                               server_settings[u"port"]),
1567
 
                              ClientHandler,
1568
 
                              interface=server_settings[u"interface"],
1569
 
                              use_ipv6=use_ipv6,
1570
 
                              gnutls_priority=
1571
 
                              server_settings[u"priority"],
1572
 
                              use_dbus=use_dbus)
1573
 
    pidfilename = u"/var/run/mandos.pid"
 
1189
    clients = Set()
 
1190
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
1191
                                 server_settings["port"]),
 
1192
                                TCP_handler,
 
1193
                                settings=server_settings,
 
1194
                                clients=clients, use_ipv6=use_ipv6)
 
1195
    pidfilename = "/var/run/mandos.pid"
1574
1196
    try:
1575
 
        pidfile = open(pidfilename, u"w")
 
1197
        pidfile = open(pidfilename, "w")
1576
1198
    except IOError:
1577
 
        logger.error(u"Could not open file %r", pidfilename)
 
1199
        logger.error("Could not open file %r", pidfilename)
1578
1200
    
1579
1201
    try:
1580
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1581
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1202
        uid = pwd.getpwnam("_mandos").pw_uid
 
1203
        gid = pwd.getpwnam("_mandos").pw_gid
1582
1204
    except KeyError:
1583
1205
        try:
1584
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1585
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1206
            uid = pwd.getpwnam("mandos").pw_uid
 
1207
            gid = pwd.getpwnam("mandos").pw_gid
1586
1208
        except KeyError:
1587
1209
            try:
1588
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1589
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1210
                uid = pwd.getpwnam("nobody").pw_uid
 
1211
                gid = pwd.getpwnam("nogroup").pw_gid
1590
1212
            except KeyError:
1591
1213
                uid = 65534
1592
1214
                gid = 65534
1605
1227
        
1606
1228
        @gnutls.library.types.gnutls_log_func
1607
1229
        def debug_gnutls(level, string):
1608
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1230
            logger.debug("GnuTLS: %s", string[:-1])
1609
1231
        
1610
1232
        (gnutls.library.functions
1611
1233
         .gnutls_global_set_log_function(debug_gnutls))
1612
1234
    
 
1235
    global service
 
1236
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1237
    service = AvahiService(name = server_settings["servicename"],
 
1238
                           servicetype = "_mandos._tcp",
 
1239
                           protocol = protocol)
 
1240
    if server_settings["interface"]:
 
1241
        service.interface = (if_nametoindex
 
1242
                             (server_settings["interface"]))
 
1243
    
1613
1244
    global main_loop
 
1245
    global bus
 
1246
    global server
1614
1247
    # From the Avahi example code
1615
1248
    DBusGMainLoop(set_as_default=True )
1616
1249
    main_loop = gobject.MainLoop()
1617
1250
    bus = dbus.SystemBus()
 
1251
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1252
                                           avahi.DBUS_PATH_SERVER),
 
1253
                            avahi.DBUS_INTERFACE_SERVER)
1618
1254
    # End of Avahi example code
1619
1255
    if use_dbus:
1620
 
        try:
1621
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1622
 
                                            bus, do_not_queue=True)
1623
 
        except dbus.exceptions.NameExistsException, e:
1624
 
            logger.error(unicode(e) + u", disabling D-Bus")
1625
 
            use_dbus = False
1626
 
            server_settings[u"use_dbus"] = False
1627
 
            tcp_server.use_dbus = False
1628
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1629
 
    service = AvahiService(name = server_settings[u"servicename"],
1630
 
                           servicetype = u"_mandos._tcp",
1631
 
                           protocol = protocol, bus = bus)
1632
 
    if server_settings["interface"]:
1633
 
        service.interface = (if_nametoindex
1634
 
                             (str(server_settings[u"interface"])))
 
1256
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1635
1257
    
1636
1258
    client_class = Client
1637
1259
    if use_dbus:
1638
 
        client_class = functools.partial(ClientDBus, bus = bus)
1639
 
    tcp_server.clients.update(set(
 
1260
        client_class = ClientDBus
 
1261
    clients.update(Set(
1640
1262
            client_class(name = section,
1641
1263
                         config= dict(client_config.items(section)))
1642
1264
            for section in client_config.sections()))
1643
 
    if not tcp_server.clients:
 
1265
    if not clients:
1644
1266
        logger.warning(u"No clients defined")
1645
1267
    
1646
1268
    if debug:
1656
1278
        daemon()
1657
1279
    
1658
1280
    try:
1659
 
        with pidfile:
 
1281
        with closing(pidfile):
1660
1282
            pid = os.getpid()
1661
1283
            pidfile.write(str(pid) + "\n")
1662
1284
        del pidfile
1668
1290
        pass
1669
1291
    del pidfilename
1670
1292
    
 
1293
    def cleanup():
 
1294
        "Cleanup function; run on exit"
 
1295
        global group
 
1296
        # From the Avahi example code
 
1297
        if not group is None:
 
1298
            group.Free()
 
1299
            group = None
 
1300
        # End of Avahi example code
 
1301
        
 
1302
        while clients:
 
1303
            client = clients.pop()
 
1304
            client.disable_hook = None
 
1305
            client.disable()
 
1306
    
 
1307
    atexit.register(cleanup)
 
1308
    
1671
1309
    if not debug:
1672
1310
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1673
1311
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1677
1315
        class MandosDBusService(dbus.service.Object):
1678
1316
            """A D-Bus proxy object"""
1679
1317
            def __init__(self):
1680
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1318
                dbus.service.Object.__init__(self, bus, "/")
1681
1319
            _interface = u"se.bsnet.fukt.Mandos"
1682
1320
            
1683
 
            @dbus.service.signal(_interface, signature=u"o")
1684
 
            def ClientAdded(self, objpath):
1685
 
                "D-Bus signal"
1686
 
                pass
1687
 
            
1688
 
            @dbus.service.signal(_interface, signature=u"ss")
1689
 
            def ClientNotFound(self, fingerprint, address):
1690
 
                "D-Bus signal"
1691
 
                pass
1692
 
            
1693
 
            @dbus.service.signal(_interface, signature=u"os")
 
1321
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1322
            def ClientAdded(self, objpath, properties):
 
1323
                "D-Bus signal"
 
1324
                pass
 
1325
            
 
1326
            @dbus.service.signal(_interface, signature="s")
 
1327
            def ClientNotFound(self, fingerprint):
 
1328
                "D-Bus signal"
 
1329
                pass
 
1330
            
 
1331
            @dbus.service.signal(_interface, signature="os")
1694
1332
            def ClientRemoved(self, objpath, name):
1695
1333
                "D-Bus signal"
1696
1334
                pass
1697
1335
            
1698
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1336
            @dbus.service.method(_interface, out_signature="ao")
1699
1337
            def GetAllClients(self):
1700
1338
                "D-Bus method"
1701
 
                return dbus.Array(c.dbus_object_path
1702
 
                                  for c in tcp_server.clients)
 
1339
                return dbus.Array(c.dbus_object_path for c in clients)
1703
1340
            
1704
 
            @dbus.service.method(_interface,
1705
 
                                 out_signature=u"a{oa{sv}}")
 
1341
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1706
1342
            def GetAllClientsWithProperties(self):
1707
1343
                "D-Bus method"
1708
1344
                return dbus.Dictionary(
1709
 
                    ((c.dbus_object_path, c.GetAll(u""))
1710
 
                     for c in tcp_server.clients),
1711
 
                    signature=u"oa{sv}")
 
1345
                    ((c.dbus_object_path, c.GetAllProperties())
 
1346
                     for c in clients),
 
1347
                    signature="oa{sv}")
1712
1348
            
1713
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1349
            @dbus.service.method(_interface, in_signature="o")
1714
1350
            def RemoveClient(self, object_path):
1715
1351
                "D-Bus method"
1716
 
                for c in tcp_server.clients:
 
1352
                for c in clients:
1717
1353
                    if c.dbus_object_path == object_path:
1718
 
                        tcp_server.clients.remove(c)
 
1354
                        clients.remove(c)
1719
1355
                        c.remove_from_connection()
1720
1356
                        # Don't signal anything except ClientRemoved
1721
 
                        c.disable(quiet=True)
 
1357
                        c.disable(signal=False)
1722
1358
                        # Emit D-Bus signal
1723
1359
                        self.ClientRemoved(object_path, c.name)
1724
1360
                        return
1725
 
                raise KeyError(object_path)
 
1361
                raise KeyError
1726
1362
            
1727
1363
            del _interface
1728
1364
        
1729
1365
        mandos_dbus_service = MandosDBusService()
1730
1366
    
1731
 
    def cleanup():
1732
 
        "Cleanup function; run on exit"
1733
 
        service.cleanup()
1734
 
        
1735
 
        while tcp_server.clients:
1736
 
            client = tcp_server.clients.pop()
1737
 
            if use_dbus:
1738
 
                client.remove_from_connection()
1739
 
            client.disable_hook = None
1740
 
            # Don't signal anything except ClientRemoved
1741
 
            client.disable(quiet=True)
1742
 
            if use_dbus:
1743
 
                # Emit D-Bus signal
1744
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1745
 
                                                  client.name)
1746
 
    
1747
 
    atexit.register(cleanup)
1748
 
    
1749
 
    for client in tcp_server.clients:
 
1367
    for client in clients:
1750
1368
        if use_dbus:
1751
1369
            # Emit D-Bus signal
1752
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
1370
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
 
1371
                                            client.GetAllProperties())
1753
1372
        client.enable()
1754
1373
    
1755
1374
    tcp_server.enable()
1769
1388
    
1770
1389
    try:
1771
1390
        # From the Avahi example code
 
1391
        server.connect_to_signal("StateChanged", server_state_changed)
1772
1392
        try:
1773
 
            service.activate()
 
1393
            server_state_changed(server.GetState())
1774
1394
        except dbus.exceptions.DBusException, error:
1775
1395
            logger.critical(u"DBusException: %s", error)
1776
 
            cleanup()
1777
1396
            sys.exit(1)
1778
1397
        # End of Avahi example code
1779
1398
        
1786
1405
        main_loop.run()
1787
1406
    except AvahiError, error:
1788
1407
        logger.critical(u"AvahiError: %s", error)
1789
 
        cleanup()
1790
1408
        sys.exit(1)
1791
1409
    except KeyboardInterrupt:
1792
1410
        if debug:
1793
1411
            print >> sys.stderr
1794
 
        logger.debug(u"Server received KeyboardInterrupt")
1795
 
    logger.debug(u"Server exiting")
1796
 
    # Must run before the D-Bus bus name gets deregistered
1797
 
    cleanup()
 
1412
        logger.debug("Server received KeyboardInterrupt")
 
1413
    logger.debug("Server exiting")
1798
1414
 
1799
1415
if __name__ == '__main__':
1800
1416
    main()