/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-11-19 18:31:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

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