/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-27 01:18:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080827011825-ka3ni6xvy2ehi1y8
* .bzrignore: New.

* clients.conf ([foo]): Remove Radix-64 checksum.

* mandos (AvahiService.rename, server_state_changed,
          entry_group_state_changed): Make Avahi log messages more
                                      clear that they are about
                                      Zeroconf.
  (fingerprint): Use plain "0" instead of "ctypes.c_uint(0)".

Show diffs side-by-side

added added

removed removed

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