/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-11-09 06:40:29 UTC
  • mto: (237.2.1 mandos) (24.1.113 mandos)
  • mto: This revision was merged to the branch mainline in revision 238.
  • Revision ID: teddy@fukt.bsnet.se-20081109064029-df71jpoce308cq3v
First steps of a D-Bus interface to the server.

* mandos: Also import "dbus.service".
  (Client): Inherit from "dbus.service.Object", which is a new-style
            class, so inheriting from "object" is no longer necessary.
  (Client.interface): New temporary variable which only exists during
                     class definition.

  (Client.getName, Client.getFingerprint): New D-Bus getter methods.
  (Client.setSecret): New D-Bus setter method.
  (Client._set_timeout): Emit D-Bus signal "TimeoutChanged".
  (Client.getTimeout): New D-Bus getter method.
  (Client.TimeoutChanged): New D-Bus signal.
  (Client._set_interval): Emit D-Bus signal "IntervalChanged".
  (Client.getInterval): New D-Bus getter method.
  (Client.intervalChanged): New D-Bus signal.
  (Client.__init__): Also call "dbus.service.Object.__init__".
  (Client.started): New boolean attribute.
  (Client.start, Client.stop): Update "self.started", and emit D-Bus
                               signal "StateChanged".
  (Client.StateChanged): New D-Bus signal.
  (Client.stop): Use "self.started" instead of misusing "self.secret".
                 Also simplify code by using "getattr" instead of
                 "hasattr".
  (Client.checker_callback): Emit D-Bus signal "CheckerCompleted".
  (Client.CheckerCompleted): New D-Bus signal.
  (Client.bumpTimeout): D-Bus method name for "bump_timeout".
  (Client.start_checker): Emit D-Bus signal "CheckerStarted".
  (Client.CheckerStarted): New D-Bus signal.
  (Client.checkerIsRunning): New D-Bus method.
  (Client.StopChecker): D-Bus method name for "stop_checker".
  (Client.still_valid): First check "self.started".
  (Client.stillValid): D-Bus method name for "still_valid".

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