/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-01-18 00:16:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090118001657-6mo3ae73ldy5tegf
* debian/mandos-client.postinst: Converted to Bourne shell.  Also
                                 minor message change.
* debian/mandos-client.postrm: Minor message change.
* debian/mandos.postinst: Converted to Bourne shell.  Also minor
                          message change.
* debian/mandos.prerm: Minor message change.

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