/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-07 21:45:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080807214541-pyg8itw6kphz1dy5
* plugbasedclient.c: Renamed to "mandos-client.c".  All users changed.

* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
                            All users changed.

* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
                          All users changed.

* server.conf: Renamed to "mandos.conf".  All users changed.

* server.py: Renamed to "mandos".
  (daemon): Have default values for arguments. Caller changed.

* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
                                                       "clean".
  (check, run-client, run-server): New.

* network-protocol.txt: New.

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