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