/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

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