/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-02-09 19:33:46 UTC
  • mfrom: (24.1.135 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090209193346-5insyr1rsisor8dj
Merge from Björn:

* plugins.d/mandos-client.c (mc): Initialize globally.
  (main): Better handling of signals.

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