/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-30 19:49:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080830194924-f4liqq8wxajlbshn
* plugin-runner.xml (NAME): Improved wording.
  (SYNOPSIS): Use <option> and <replaceable> tags.  Unify short and
              long options.  Add "--global-envs" and "--envs-for"
              options.

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