/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (Client.current_checker_command): New attribute.
  (Client.start_checker): Make sure the running checker process is not
                          a zombie, just in case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
15
16
# 
16
17
# This program is free software: you can redistribute it and/or modify
17
18
# it under the terms of the GNU General Public License as published by
30
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
32
# 
32
33
 
33
 
from __future__ import division
 
34
from __future__ import division, with_statement, absolute_import
34
35
 
35
36
import SocketServer
36
37
import socket
37
 
import select
38
 
from optparse import OptionParser
 
38
import optparse
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
56
56
import logging
57
57
import logging.handlers
58
58
import pwd
 
59
from contextlib import closing
59
60
 
60
61
import dbus
 
62
import dbus.service
61
63
import gobject
62
64
import avahi
63
65
from dbus.mainloop.glib import DBusGMainLoop
64
66
import ctypes
 
67
import ctypes.util
65
68
 
66
 
version = "1.0"
 
69
version = "1.0.5"
67
70
 
68
71
logger = logging.Logger('mandos')
69
 
syslogger = logging.handlers.SysLogHandler\
70
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
71
 
             address = "/dev/log")
72
 
syslogger.setFormatter(logging.Formatter\
73
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
72
syslogger = (logging.handlers.SysLogHandler
 
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
74
              address = "/dev/log"))
 
75
syslogger.setFormatter(logging.Formatter
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
74
78
logger.addHandler(syslogger)
75
79
 
76
80
console = logging.StreamHandler()
77
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
78
 
                                       ' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
79
83
logger.addHandler(console)
80
84
 
81
85
class AvahiError(Exception):
82
 
    def __init__(self, value):
 
86
    def __init__(self, value, *args, **kwargs):
83
87
        self.value = value
84
 
    def __str__(self):
85
 
        return repr(self.value)
 
88
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
89
    def __unicode__(self):
 
90
        return unicode(repr(self.value))
86
91
 
87
92
class AvahiServiceError(AvahiError):
88
93
    pass
108
113
                  a sensible number of times
109
114
    """
110
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
111
 
                 type = None, port = None, TXT = None, domain = "",
112
 
                 host = "", max_renames = 32768):
 
116
                 servicetype = None, port = None, TXT = None,
 
117
                 domain = "", host = "", max_renames = 32768,
 
118
                 protocol = avahi.PROTO_UNSPEC):
113
119
        self.interface = interface
114
120
        self.name = name
115
 
        self.type = type
 
121
        self.type = servicetype
116
122
        self.port = port
117
 
        if TXT is None:
118
 
            self.TXT = []
119
 
        else:
120
 
            self.TXT = TXT
 
123
        self.TXT = TXT if TXT is not None else []
121
124
        self.domain = domain
122
125
        self.host = host
123
126
        self.rename_count = 0
124
127
        self.max_renames = max_renames
 
128
        self.protocol = protocol
125
129
    def rename(self):
126
130
        """Derived from the Avahi example code"""
127
131
        if self.rename_count >= self.max_renames:
128
132
            logger.critical(u"No suitable Zeroconf service name found"
129
133
                            u" after %i retries, exiting.",
130
 
                            rename_count)
131
 
            raise AvahiServiceError("Too many renames")
 
134
                            self.rename_count)
 
135
            raise AvahiServiceError(u"Too many renames")
132
136
        self.name = server.GetAlternativeServiceName(self.name)
133
137
        logger.info(u"Changing Zeroconf service name to %r ...",
134
138
                    str(self.name))
135
 
        syslogger.setFormatter(logging.Formatter\
 
139
        syslogger.setFormatter(logging.Formatter
136
140
                               ('Mandos (%s): %%(levelname)s:'
137
 
                               ' %%(message)s' % self.name))
 
141
                                ' %%(message)s' % self.name))
138
142
        self.remove()
139
143
        self.add()
140
144
        self.rename_count += 1
146
150
        """Derived from the Avahi example code"""
147
151
        global group
148
152
        if group is None:
149
 
            group = dbus.Interface\
150
 
                    (bus.get_object(avahi.DBUS_NAME,
 
153
            group = dbus.Interface(bus.get_object
 
154
                                   (avahi.DBUS_NAME,
151
155
                                    server.EntryGroupNew()),
152
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
156
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
157
            group.connect_to_signal('StateChanged',
154
158
                                    entry_group_state_changed)
155
159
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
156
160
                     service.name, service.type)
157
161
        group.AddService(
158
162
                self.interface,         # interface
159
 
                avahi.PROTO_INET6,      # protocol
 
163
                self.protocol,          # protocol
160
164
                dbus.UInt32(0),         # flags
161
165
                self.name, self.type,
162
166
                self.domain, self.host,
169
173
# End of Avahi example code
170
174
 
171
175
 
172
 
class Client(object):
 
176
def _datetime_to_dbus(dt, variant_level=0):
 
177
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
178
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
179
 
 
180
 
 
181
class Client(dbus.service.Object):
173
182
    """A representation of a client host served by this server.
174
183
    Attributes:
175
 
    name:      string; from the config file, used in log messages
 
184
    name:       string; from the config file, used in log messages and
 
185
                        D-Bus identifiers
176
186
    fingerprint: string (40 or 32 hexadecimal digits); used to
177
187
                 uniquely identify the client
178
 
    secret:    bytestring; sent verbatim (over TLS) to client
179
 
    host:      string; available for use by the checker command
180
 
    created:   datetime.datetime(); object creation, not client host
181
 
    last_checked_ok: datetime.datetime() or None if not yet checked OK
182
 
    timeout:   datetime.timedelta(); How long from last_checked_ok
183
 
                                     until this client is invalid
184
 
    interval:  datetime.timedelta(); How often to start a new checker
185
 
    stop_hook: If set, called by stop() as stop_hook(self)
186
 
    checker:   subprocess.Popen(); a running checker process used
187
 
                                   to see if the client lives.
188
 
                                   'None' if no process is running.
 
188
    secret:     bytestring; sent verbatim (over TLS) to client
 
189
    host:       string; available for use by the checker command
 
190
    created:    datetime.datetime(); (UTC) object creation
 
191
    last_enabled: datetime.datetime(); (UTC)
 
192
    enabled:    bool()
 
193
    last_checked_ok: datetime.datetime(); (UTC) or None
 
194
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
195
                                      until this client is invalid
 
196
    interval:   datetime.timedelta(); How often to start a new checker
 
197
    disable_hook:  If set, called by disable() as disable_hook(self)
 
198
    checker:    subprocess.Popen(); a running checker process used
 
199
                                    to see if the client lives.
 
200
                                    'None' if no process is running.
189
201
    checker_initiator_tag: a gobject event source tag, or None
190
 
    stop_initiator_tag:    - '' -
 
202
    disable_initiator_tag:    - '' -
191
203
    checker_callback_tag:  - '' -
192
204
    checker_command: string; External command which is run to check if
193
205
                     client lives.  %() expansions are done at
194
206
                     runtime with vars(self) as dict, so that for
195
207
                     instance %(name)s can be used in the command.
196
 
    Private attibutes:
197
 
    _timeout: Real variable for 'timeout'
198
 
    _interval: Real variable for 'interval'
199
 
    _timeout_milliseconds: Used when calling gobject.timeout_add()
200
 
    _interval_milliseconds: - '' -
 
208
    current_checker_command: string; current running checker_command
 
209
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
210
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
201
211
    """
202
 
    def _set_timeout(self, timeout):
203
 
        "Setter function for 'timeout' attribute"
204
 
        self._timeout = timeout
205
 
        self._timeout_milliseconds = ((self.timeout.days
206
 
                                       * 24 * 60 * 60 * 1000)
207
 
                                      + (self.timeout.seconds * 1000)
208
 
                                      + (self.timeout.microseconds
209
 
                                         // 1000))
210
 
    timeout = property(lambda self: self._timeout,
211
 
                       _set_timeout)
212
 
    del _set_timeout
213
 
    def _set_interval(self, interval):
214
 
        "Setter function for 'interval' attribute"
215
 
        self._interval = interval
216
 
        self._interval_milliseconds = ((self.interval.days
217
 
                                        * 24 * 60 * 60 * 1000)
218
 
                                       + (self.interval.seconds
219
 
                                          * 1000)
220
 
                                       + (self.interval.microseconds
221
 
                                          // 1000))
222
 
    interval = property(lambda self: self._interval,
223
 
                        _set_interval)
224
 
    del _set_interval
225
 
    def __init__(self, name = None, stop_hook=None, config={}):
 
212
    def timeout_milliseconds(self):
 
213
        "Return the 'timeout' attribute in milliseconds"
 
214
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
215
                + (self.timeout.seconds * 1000)
 
216
                + (self.timeout.microseconds // 1000))
 
217
    
 
218
    def interval_milliseconds(self):
 
219
        "Return the 'interval' attribute in milliseconds"
 
220
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
221
                + (self.interval.seconds * 1000)
 
222
                + (self.interval.microseconds // 1000))
 
223
    
 
224
    def __init__(self, name = None, disable_hook=None, config=None,
 
225
                 use_dbus=True):
226
226
        """Note: the 'checker' key in 'config' sets the
227
227
        'checker_command' attribute and *not* the 'checker'
228
228
        attribute."""
229
229
        self.name = name
 
230
        if config is None:
 
231
            config = {}
230
232
        logger.debug(u"Creating client %r", self.name)
 
233
        self.use_dbus = False   # During __init__
231
234
        # Uppercase and remove spaces from fingerprint for later
232
235
        # comparison purposes with return value from the fingerprint()
233
236
        # function
234
 
        self.fingerprint = config["fingerprint"].upper()\
235
 
                           .replace(u" ", u"")
 
237
        self.fingerprint = (config["fingerprint"].upper()
 
238
                            .replace(u" ", u""))
236
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
237
240
        if "secret" in config:
238
241
            self.secret = config["secret"].decode(u"base64")
239
242
        elif "secfile" in config:
240
 
            sf = open(config["secfile"])
241
 
            self.secret = sf.read()
242
 
            sf.close()
 
243
            with closing(open(os.path.expanduser
 
244
                              (os.path.expandvars
 
245
                               (config["secfile"])))) as secfile:
 
246
                self.secret = secfile.read()
243
247
        else:
244
248
            raise TypeError(u"No secret or secfile for client %s"
245
249
                            % self.name)
246
250
        self.host = config.get("host", "")
247
 
        self.created = datetime.datetime.now()
 
251
        self.created = datetime.datetime.utcnow()
 
252
        self.enabled = False
 
253
        self.last_enabled = None
248
254
        self.last_checked_ok = None
249
255
        self.timeout = string_to_delta(config["timeout"])
250
256
        self.interval = string_to_delta(config["interval"])
251
 
        self.stop_hook = stop_hook
 
257
        self.disable_hook = disable_hook
252
258
        self.checker = None
253
259
        self.checker_initiator_tag = None
254
 
        self.stop_initiator_tag = None
 
260
        self.disable_initiator_tag = None
255
261
        self.checker_callback_tag = None
256
 
        self.check_command = config["checker"]
257
 
    def start(self):
 
262
        self.checker_command = config["checker"]
 
263
        self.current_checker_command = None
 
264
        self.last_connect = None
 
265
        # Only now, when this client is initialized, can it show up on
 
266
        # the D-Bus
 
267
        self.use_dbus = use_dbus
 
268
        if self.use_dbus:
 
269
            self.dbus_object_path = (dbus.ObjectPath
 
270
                                     ("/clients/"
 
271
                                      + self.name.replace(".", "_")))
 
272
            dbus.service.Object.__init__(self, bus,
 
273
                                         self.dbus_object_path)
 
274
    
 
275
    def enable(self):
258
276
        """Start this client's checker and timeout hooks"""
 
277
        self.last_enabled = datetime.datetime.utcnow()
259
278
        # Schedule a new checker to be started an 'interval' from now,
260
279
        # and every interval from then on.
261
 
        self.checker_initiator_tag = gobject.timeout_add\
262
 
                                     (self._interval_milliseconds,
263
 
                                      self.start_checker)
 
280
        self.checker_initiator_tag = (gobject.timeout_add
 
281
                                      (self.interval_milliseconds(),
 
282
                                       self.start_checker))
264
283
        # Also start a new checker *right now*.
265
284
        self.start_checker()
266
 
        # Schedule a stop() when 'timeout' has passed
267
 
        self.stop_initiator_tag = gobject.timeout_add\
268
 
                                  (self._timeout_milliseconds,
269
 
                                   self.stop)
270
 
    def stop(self):
271
 
        """Stop this client.
272
 
        The possibility that a client might be restarted is left open,
273
 
        but not currently used."""
274
 
        # If this client doesn't have a secret, it is already stopped.
275
 
        if hasattr(self, "secret") and self.secret:
276
 
            logger.info(u"Stopping client %s", self.name)
277
 
            self.secret = None
278
 
        else:
 
285
        # Schedule a disable() when 'timeout' has passed
 
286
        self.disable_initiator_tag = (gobject.timeout_add
 
287
                                   (self.timeout_milliseconds(),
 
288
                                    self.disable))
 
289
        self.enabled = True
 
290
        if self.use_dbus:
 
291
            # Emit D-Bus signals
 
292
            self.PropertyChanged(dbus.String(u"enabled"),
 
293
                                 dbus.Boolean(True, variant_level=1))
 
294
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
295
                                 (_datetime_to_dbus(self.last_enabled,
 
296
                                                    variant_level=1)))
 
297
    
 
298
    def disable(self):
 
299
        """Disable this client."""
 
300
        if not getattr(self, "enabled", False):
279
301
            return False
280
 
        if getattr(self, "stop_initiator_tag", False):
281
 
            gobject.source_remove(self.stop_initiator_tag)
282
 
            self.stop_initiator_tag = None
 
302
        logger.info(u"Disabling client %s", self.name)
 
303
        if getattr(self, "disable_initiator_tag", False):
 
304
            gobject.source_remove(self.disable_initiator_tag)
 
305
            self.disable_initiator_tag = None
283
306
        if getattr(self, "checker_initiator_tag", False):
284
307
            gobject.source_remove(self.checker_initiator_tag)
285
308
            self.checker_initiator_tag = None
286
309
        self.stop_checker()
287
 
        if self.stop_hook:
288
 
            self.stop_hook(self)
 
310
        if self.disable_hook:
 
311
            self.disable_hook(self)
 
312
        self.enabled = False
 
313
        if self.use_dbus:
 
314
            # Emit D-Bus signal
 
315
            self.PropertyChanged(dbus.String(u"enabled"),
 
316
                                 dbus.Boolean(False, variant_level=1))
289
317
        # Do not run this again if called by a gobject.timeout_add
290
318
        return False
 
319
    
291
320
    def __del__(self):
292
 
        self.stop_hook = None
293
 
        self.stop()
294
 
    def checker_callback(self, pid, condition):
 
321
        self.disable_hook = None
 
322
        self.disable()
 
323
    
 
324
    def checker_callback(self, pid, condition, command):
295
325
        """The checker has completed, so take appropriate actions."""
296
 
        now = datetime.datetime.now()
297
326
        self.checker_callback_tag = None
298
327
        self.checker = None
299
 
        if os.WIFEXITED(condition) \
300
 
               and (os.WEXITSTATUS(condition) == 0):
301
 
            logger.info(u"Checker for %(name)s succeeded",
302
 
                        vars(self))
303
 
            self.last_checked_ok = now
304
 
            gobject.source_remove(self.stop_initiator_tag)
305
 
            self.stop_initiator_tag = gobject.timeout_add\
306
 
                                      (self._timeout_milliseconds,
307
 
                                       self.stop)
308
 
        elif not os.WIFEXITED(condition):
 
328
        if self.use_dbus:
 
329
            # Emit D-Bus signal
 
330
            self.PropertyChanged(dbus.String(u"checker_running"),
 
331
                                 dbus.Boolean(False, variant_level=1))
 
332
        if os.WIFEXITED(condition):
 
333
            exitstatus = os.WEXITSTATUS(condition)
 
334
            if exitstatus == 0:
 
335
                logger.info(u"Checker for %(name)s succeeded",
 
336
                            vars(self))
 
337
                self.checked_ok()
 
338
            else:
 
339
                logger.info(u"Checker for %(name)s failed",
 
340
                            vars(self))
 
341
            if self.use_dbus:
 
342
                # Emit D-Bus signal
 
343
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
344
                                      dbus.Int64(condition),
 
345
                                      dbus.String(command))
 
346
        else:
309
347
            logger.warning(u"Checker for %(name)s crashed?",
310
348
                           vars(self))
311
 
        else:
312
 
            logger.info(u"Checker for %(name)s failed",
313
 
                        vars(self))
 
349
            if self.use_dbus:
 
350
                # Emit D-Bus signal
 
351
                self.CheckerCompleted(dbus.Int16(-1),
 
352
                                      dbus.Int64(condition),
 
353
                                      dbus.String(command))
 
354
    
 
355
    def checked_ok(self):
 
356
        """Bump up the timeout for this client.
 
357
        This should only be called when the client has been seen,
 
358
        alive and well.
 
359
        """
 
360
        self.last_checked_ok = datetime.datetime.utcnow()
 
361
        gobject.source_remove(self.disable_initiator_tag)
 
362
        self.disable_initiator_tag = (gobject.timeout_add
 
363
                                      (self.timeout_milliseconds(),
 
364
                                       self.disable))
 
365
        if self.use_dbus:
 
366
            # Emit D-Bus signal
 
367
            self.PropertyChanged(
 
368
                dbus.String(u"last_checked_ok"),
 
369
                (_datetime_to_dbus(self.last_checked_ok,
 
370
                                   variant_level=1)))
 
371
    
314
372
    def start_checker(self):
315
373
        """Start a new checker subprocess if one is not running.
316
374
        If a checker already exists, leave it running and do
323
381
        # checkers alone, the checker would have to take more time
324
382
        # than 'timeout' for the client to be declared invalid, which
325
383
        # is as it should be.
 
384
        
 
385
        # If a checker exists, make sure it is not a zombie
 
386
        if self.checker is not None:
 
387
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
388
            if pid:
 
389
                logger.warning("Checker was a zombie")
 
390
                gobject.source_remove(self.checker_callback_tag)
 
391
                self.checker_callback(pid, status,
 
392
                                      self.current_checker_command)
 
393
        # Start a new checker if needed
326
394
        if self.checker is None:
327
395
            try:
328
 
                # In case check_command has exactly one % operator
329
 
                command = self.check_command % self.host
 
396
                # In case checker_command has exactly one % operator
 
397
                command = self.checker_command % self.host
330
398
            except TypeError:
331
399
                # Escape attributes for the shell
332
400
                escaped_attrs = dict((key, re.escape(str(val)))
333
401
                                     for key, val in
334
402
                                     vars(self).iteritems())
335
403
                try:
336
 
                    command = self.check_command % escaped_attrs
 
404
                    command = self.checker_command % escaped_attrs
337
405
                except TypeError, error:
338
406
                    logger.error(u'Could not format string "%s":'
339
 
                                 u' %s', self.check_command, error)
 
407
                                 u' %s', self.checker_command, error)
340
408
                    return True # Try again later
 
409
                self.current_checker_command = command
341
410
            try:
342
411
                logger.info(u"Starting checker %r for %s",
343
412
                            command, self.name)
348
417
                self.checker = subprocess.Popen(command,
349
418
                                                close_fds=True,
350
419
                                                shell=True, cwd="/")
351
 
                self.checker_callback_tag = gobject.child_watch_add\
352
 
                                            (self.checker.pid,
353
 
                                             self.checker_callback)
 
420
                if self.use_dbus:
 
421
                    # Emit D-Bus signal
 
422
                    self.CheckerStarted(command)
 
423
                    self.PropertyChanged(
 
424
                        dbus.String("checker_running"),
 
425
                        dbus.Boolean(True, variant_level=1))
 
426
                self.checker_callback_tag = (gobject.child_watch_add
 
427
                                             (self.checker.pid,
 
428
                                              self.checker_callback,
 
429
                                              data=command))
 
430
                # The checker may have completed before the gobject
 
431
                # watch was added.  Check for this.
 
432
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
433
                if pid:
 
434
                    gobject.source_remove(self.checker_callback_tag)
 
435
                    self.checker_callback(pid, status, command)
354
436
            except OSError, error:
355
437
                logger.error(u"Failed to start subprocess: %s",
356
438
                             error)
357
439
        # Re-run this periodically if run by gobject.timeout_add
358
440
        return True
 
441
    
359
442
    def stop_checker(self):
360
443
        """Force the checker process, if any, to stop."""
361
444
        if self.checker_callback_tag:
373
456
            if error.errno != errno.ESRCH: # No such process
374
457
                raise
375
458
        self.checker = None
 
459
        if self.use_dbus:
 
460
            self.PropertyChanged(dbus.String(u"checker_running"),
 
461
                                 dbus.Boolean(False, variant_level=1))
 
462
    
376
463
    def still_valid(self):
377
464
        """Has the timeout not yet passed for this client?"""
378
 
        now = datetime.datetime.now()
 
465
        if not getattr(self, "enabled", False):
 
466
            return False
 
467
        now = datetime.datetime.utcnow()
379
468
        if self.last_checked_ok is None:
380
469
            return now < (self.created + self.timeout)
381
470
        else:
382
471
            return now < (self.last_checked_ok + self.timeout)
 
472
    
 
473
    ## D-Bus methods & signals
 
474
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
475
    
 
476
    # CheckedOK - method
 
477
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
478
    CheckedOK.__name__ = "CheckedOK"
 
479
    
 
480
    # CheckerCompleted - signal
 
481
    @dbus.service.signal(_interface, signature="nxs")
 
482
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
483
        "D-Bus signal"
 
484
        pass
 
485
    
 
486
    # CheckerStarted - signal
 
487
    @dbus.service.signal(_interface, signature="s")
 
488
    def CheckerStarted(self, command):
 
489
        "D-Bus signal"
 
490
        pass
 
491
    
 
492
    # GetAllProperties - method
 
493
    @dbus.service.method(_interface, out_signature="a{sv}")
 
494
    def GetAllProperties(self):
 
495
        "D-Bus method"
 
496
        return dbus.Dictionary({
 
497
                dbus.String("name"):
 
498
                    dbus.String(self.name, variant_level=1),
 
499
                dbus.String("fingerprint"):
 
500
                    dbus.String(self.fingerprint, variant_level=1),
 
501
                dbus.String("host"):
 
502
                    dbus.String(self.host, variant_level=1),
 
503
                dbus.String("created"):
 
504
                    _datetime_to_dbus(self.created, variant_level=1),
 
505
                dbus.String("last_enabled"):
 
506
                    (_datetime_to_dbus(self.last_enabled,
 
507
                                       variant_level=1)
 
508
                     if self.last_enabled is not None
 
509
                     else dbus.Boolean(False, variant_level=1)),
 
510
                dbus.String("enabled"):
 
511
                    dbus.Boolean(self.enabled, variant_level=1),
 
512
                dbus.String("last_checked_ok"):
 
513
                    (_datetime_to_dbus(self.last_checked_ok,
 
514
                                       variant_level=1)
 
515
                     if self.last_checked_ok is not None
 
516
                     else dbus.Boolean (False, variant_level=1)),
 
517
                dbus.String("timeout"):
 
518
                    dbus.UInt64(self.timeout_milliseconds(),
 
519
                                variant_level=1),
 
520
                dbus.String("interval"):
 
521
                    dbus.UInt64(self.interval_milliseconds(),
 
522
                                variant_level=1),
 
523
                dbus.String("checker"):
 
524
                    dbus.String(self.checker_command,
 
525
                                variant_level=1),
 
526
                dbus.String("checker_running"):
 
527
                    dbus.Boolean(self.checker is not None,
 
528
                                 variant_level=1),
 
529
                dbus.String("object_path"):
 
530
                    dbus.ObjectPath(self.dbus_object_path,
 
531
                                    variant_level=1)
 
532
                }, signature="sv")
 
533
    
 
534
    # IsStillValid - method
 
535
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
536
                    (still_valid))
 
537
    IsStillValid.__name__ = "IsStillValid"
 
538
    
 
539
    # PropertyChanged - signal
 
540
    @dbus.service.signal(_interface, signature="sv")
 
541
    def PropertyChanged(self, property, value):
 
542
        "D-Bus signal"
 
543
        pass
 
544
    
 
545
    # SetChecker - method
 
546
    @dbus.service.method(_interface, in_signature="s")
 
547
    def SetChecker(self, checker):
 
548
        "D-Bus setter method"
 
549
        self.checker_command = checker
 
550
        # Emit D-Bus signal
 
551
        self.PropertyChanged(dbus.String(u"checker"),
 
552
                             dbus.String(self.checker_command,
 
553
                                         variant_level=1))
 
554
    
 
555
    # SetHost - method
 
556
    @dbus.service.method(_interface, in_signature="s")
 
557
    def SetHost(self, host):
 
558
        "D-Bus setter method"
 
559
        self.host = host
 
560
        # Emit D-Bus signal
 
561
        self.PropertyChanged(dbus.String(u"host"),
 
562
                             dbus.String(self.host, variant_level=1))
 
563
    
 
564
    # SetInterval - method
 
565
    @dbus.service.method(_interface, in_signature="t")
 
566
    def SetInterval(self, milliseconds):
 
567
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
568
        # Emit D-Bus signal
 
569
        self.PropertyChanged(dbus.String(u"interval"),
 
570
                             (dbus.UInt64(self.interval_milliseconds(),
 
571
                                          variant_level=1)))
 
572
    
 
573
    # SetSecret - method
 
574
    @dbus.service.method(_interface, in_signature="ay",
 
575
                         byte_arrays=True)
 
576
    def SetSecret(self, secret):
 
577
        "D-Bus setter method"
 
578
        self.secret = str(secret)
 
579
    
 
580
    # SetTimeout - method
 
581
    @dbus.service.method(_interface, in_signature="t")
 
582
    def SetTimeout(self, milliseconds):
 
583
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
584
        # Emit D-Bus signal
 
585
        self.PropertyChanged(dbus.String(u"timeout"),
 
586
                             (dbus.UInt64(self.timeout_milliseconds(),
 
587
                                          variant_level=1)))
 
588
    
 
589
    # Enable - method
 
590
    Enable = dbus.service.method(_interface)(enable)
 
591
    Enable.__name__ = "Enable"
 
592
    
 
593
    # StartChecker - method
 
594
    @dbus.service.method(_interface)
 
595
    def StartChecker(self):
 
596
        "D-Bus method"
 
597
        self.start_checker()
 
598
    
 
599
    # Disable - method
 
600
    @dbus.service.method(_interface)
 
601
    def Disable(self):
 
602
        "D-Bus method"
 
603
        self.disable()
 
604
    
 
605
    # StopChecker - method
 
606
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
607
    StopChecker.__name__ = "StopChecker"
 
608
    
 
609
    del _interface
383
610
 
384
611
 
385
612
def peer_certificate(session):
386
613
    "Return the peer's OpenPGP certificate as a bytestring"
387
614
    # If not an OpenPGP certificate...
388
 
    if gnutls.library.functions.gnutls_certificate_type_get\
389
 
            (session._c_object) \
390
 
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
 
615
    if (gnutls.library.functions
 
616
        .gnutls_certificate_type_get(session._c_object)
 
617
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
391
618
        # ...do the normal thing
392
619
        return session.peer_certificate
393
 
    list_size = ctypes.c_uint()
394
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
395
 
        (session._c_object, ctypes.byref(list_size))
 
620
    list_size = ctypes.c_uint(1)
 
621
    cert_list = (gnutls.library.functions
 
622
                 .gnutls_certificate_get_peers
 
623
                 (session._c_object, ctypes.byref(list_size)))
 
624
    if not bool(cert_list) and list_size.value != 0:
 
625
        raise gnutls.errors.GNUTLSError("error getting peer"
 
626
                                        " certificate")
396
627
    if list_size.value == 0:
397
628
        return None
398
629
    cert = cert_list[0]
402
633
def fingerprint(openpgp):
403
634
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
404
635
    # New GnuTLS "datum" with the OpenPGP public key
405
 
    datum = gnutls.library.types.gnutls_datum_t\
406
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
407
 
                     ctypes.POINTER(ctypes.c_ubyte)),
408
 
         ctypes.c_uint(len(openpgp)))
 
636
    datum = (gnutls.library.types
 
637
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
638
                                         ctypes.POINTER
 
639
                                         (ctypes.c_ubyte)),
 
640
                             ctypes.c_uint(len(openpgp))))
409
641
    # New empty GnuTLS certificate
410
642
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
411
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
412
 
        (ctypes.byref(crt))
 
643
    (gnutls.library.functions
 
644
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
413
645
    # Import the OpenPGP public key into the certificate
414
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
415
 
                    (crt, ctypes.byref(datum),
416
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
646
    (gnutls.library.functions
 
647
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
648
                                gnutls.library.constants
 
649
                                .GNUTLS_OPENPGP_FMT_RAW))
417
650
    # Verify the self signature in the key
418
 
    crtverify = ctypes.c_uint();
419
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
 
        (crt, 0, ctypes.byref(crtverify))
 
651
    crtverify = ctypes.c_uint()
 
652
    (gnutls.library.functions
 
653
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
421
654
    if crtverify.value != 0:
422
655
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
656
        raise gnutls.errors.CertificateSecurityError("Verify failed")
424
657
    # New buffer for the fingerprint
425
 
    buffer = ctypes.create_string_buffer(20)
426
 
    buffer_length = ctypes.c_size_t()
 
658
    buf = ctypes.create_string_buffer(20)
 
659
    buf_len = ctypes.c_size_t()
427
660
    # Get the fingerprint from the certificate into the buffer
428
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
429
 
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
 
661
    (gnutls.library.functions
 
662
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
663
                                         ctypes.byref(buf_len)))
430
664
    # Deinit the certificate
431
665
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
432
666
    # Convert the buffer to a Python bytestring
433
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
667
    fpr = ctypes.string_at(buf, buf_len.value)
434
668
    # Convert the bytestring to hexadecimal notation
435
669
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
436
670
    return hex_fpr
437
671
 
438
672
 
439
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
673
class TCP_handler(SocketServer.BaseRequestHandler, object):
440
674
    """A TCP request handler class.
441
675
    Instantiated by IPv6_TCPServer for each request to handle it.
442
676
    Note: This will run in its own forked process."""
443
677
    
444
678
    def handle(self):
445
679
        logger.info(u"TCP connection from: %s",
446
 
                     unicode(self.client_address))
447
 
        session = gnutls.connection.ClientSession\
448
 
                  (self.request, gnutls.connection.X509Credentials())
 
680
                    unicode(self.client_address))
 
681
        session = (gnutls.connection
 
682
                   .ClientSession(self.request,
 
683
                                  gnutls.connection
 
684
                                  .X509Credentials()))
449
685
        
450
686
        line = self.request.makefile().readline()
451
687
        logger.debug(u"Protocol version: %r", line)
462
698
        # using OpenPGP certificates.
463
699
        
464
700
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
465
 
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
466
 
        #                "+DHE-DSS"))
467
 
        priority = "NORMAL"             # Fallback default, since this
468
 
                                        # MUST be set.
469
 
        if self.server.settings["priority"]:
470
 
            priority = self.server.settings["priority"]
471
 
        gnutls.library.functions.gnutls_priority_set_direct\
472
 
            (session._c_object, priority, None);
 
701
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
702
        #                     "+DHE-DSS"))
 
703
        # Use a fallback default, since this MUST be set.
 
704
        priority = self.server.settings.get("priority", "NORMAL")
 
705
        (gnutls.library.functions
 
706
         .gnutls_priority_set_direct(session._c_object,
 
707
                                     priority, None))
473
708
        
474
709
        try:
475
710
            session.handshake()
478
713
            # Do not run session.bye() here: the session is not
479
714
            # established.  Just abandon the request.
480
715
            return
 
716
        logger.debug(u"Handshake succeeded")
481
717
        try:
482
718
            fpr = fingerprint(peer_certificate(session))
483
719
        except (TypeError, gnutls.errors.GNUTLSError), error:
485
721
            session.bye()
486
722
            return
487
723
        logger.debug(u"Fingerprint: %s", fpr)
488
 
        client = None
 
724
        
489
725
        for c in self.server.clients:
490
726
            if c.fingerprint == fpr:
491
727
                client = c
492
728
                break
493
 
        if not client:
 
729
        else:
494
730
            logger.warning(u"Client not found for fingerprint: %s",
495
731
                           fpr)
496
732
            session.bye()
503
739
                           vars(client))
504
740
            session.bye()
505
741
            return
 
742
        ## This won't work here, since we're in a fork.
 
743
        # client.checked_ok()
506
744
        sent_size = 0
507
745
        while sent_size < len(client.secret):
508
746
            sent = session.send(client.secret[sent_size:])
513
751
        session.bye()
514
752
 
515
753
 
516
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
517
 
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
 
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
755
                     SocketServer.TCPServer, object):
 
756
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port.
518
757
    Attributes:
519
758
        settings:       Server settings
520
759
        clients:        Set() of Client objects
528
767
        if "clients" in kwargs:
529
768
            self.clients = kwargs["clients"]
530
769
            del kwargs["clients"]
 
770
        if "use_ipv6" in kwargs:
 
771
            if not kwargs["use_ipv6"]:
 
772
                self.address_family = socket.AF_INET
 
773
            del kwargs["use_ipv6"]
531
774
        self.enabled = False
532
 
        return super(type(self), self).__init__(*args, **kwargs)
 
775
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
533
776
    def server_bind(self):
534
777
        """This overrides the normal server_bind() function
535
778
        to bind to an interface if one was specified, and also NOT to
547
790
                                 u" bind to interface %s",
548
791
                                 self.settings["interface"])
549
792
                else:
550
 
                    raise error
 
793
                    raise
551
794
        # Only bind(2) the socket if we really need to.
552
795
        if self.server_address[0] or self.server_address[1]:
553
796
            if not self.server_address[0]:
554
 
                in6addr_any = "::"
555
 
                self.server_address = (in6addr_any,
 
797
                if self.address_family == socket.AF_INET6:
 
798
                    any_address = "::" # in6addr_any
 
799
                else:
 
800
                    any_address = socket.INADDR_ANY
 
801
                self.server_address = (any_address,
556
802
                                       self.server_address[1])
557
803
            elif not self.server_address[1]:
558
804
                self.server_address = (self.server_address[0],
564
810
#                                            if_nametoindex
565
811
#                                            (self.settings
566
812
#                                             ["interface"]))
567
 
            return super(type(self), self).server_bind()
 
813
            return super(IPv6_TCPServer, self).server_bind()
568
814
    def server_activate(self):
569
815
        if self.enabled:
570
 
            return super(type(self), self).server_activate()
 
816
            return super(IPv6_TCPServer, self).server_activate()
571
817
    def enable(self):
572
818
        self.enabled = True
573
819
 
574
820
 
575
821
def string_to_delta(interval):
576
822
    """Parse a string and return a datetime.timedelta
577
 
 
 
823
    
578
824
    >>> string_to_delta('7d')
579
825
    datetime.timedelta(7)
580
826
    >>> string_to_delta('60s')
591
837
    timevalue = datetime.timedelta(0)
592
838
    for s in interval.split():
593
839
        try:
594
 
            suffix=unicode(s[-1])
595
 
            value=int(s[:-1])
 
840
            suffix = unicode(s[-1])
 
841
            value = int(s[:-1])
596
842
            if suffix == u"d":
597
843
                delta = datetime.timedelta(value)
598
844
            elif suffix == u"s":
632
878
    elif state == avahi.ENTRY_GROUP_FAILURE:
633
879
        logger.critical(u"Avahi: Error in group state changed %s",
634
880
                        unicode(error))
635
 
        raise AvahiGroupError("State changed: %s", str(error))
 
881
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
636
882
 
637
883
def if_nametoindex(interface):
638
884
    """Call the C function if_nametoindex(), or equivalent"""
639
885
    global if_nametoindex
640
886
    try:
641
 
        if "ctypes.util" not in sys.modules:
642
 
            import ctypes.util
643
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
644
 
            (ctypes.util.find_library("c")).if_nametoindex
 
887
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
888
                          (ctypes.util.find_library("c"))
 
889
                          .if_nametoindex)
645
890
    except (OSError, AttributeError):
646
891
        if "struct" not in sys.modules:
647
892
            import struct
650
895
        def if_nametoindex(interface):
651
896
            "Get an interface index the hard way, i.e. using fcntl()"
652
897
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
653
 
            s = socket.socket()
654
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
655
 
                                struct.pack("16s16x", interface))
656
 
            s.close()
 
898
            with closing(socket.socket()) as s:
 
899
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
900
                                    struct.pack("16s16x", interface))
657
901
            interface_index = struct.unpack("I", ifreq[16:20])[0]
658
902
            return interface_index
659
903
    return if_nametoindex(interface)
683
927
 
684
928
 
685
929
def main():
686
 
    global main_loop_started
687
 
    main_loop_started = False
688
 
    
689
 
    parser = OptionParser(version = "%%prog %s" % version)
 
930
    parser = optparse.OptionParser(version = "%%prog %s" % version)
690
931
    parser.add_option("-i", "--interface", type="string",
691
932
                      metavar="IF", help="Bind to interface IF")
692
933
    parser.add_option("-a", "--address", type="string",
693
934
                      help="Address to listen for requests on")
694
935
    parser.add_option("-p", "--port", type="int",
695
936
                      help="Port number to receive requests on")
696
 
    parser.add_option("--check", action="store_true", default=False,
 
937
    parser.add_option("--check", action="store_true",
697
938
                      help="Run self-test")
698
939
    parser.add_option("--debug", action="store_true",
699
940
                      help="Debug mode; run in foreground and log to"
706
947
                      default="/etc/mandos", metavar="DIR",
707
948
                      help="Directory to search for configuration"
708
949
                      " files")
709
 
    (options, args) = parser.parse_args()
 
950
    parser.add_option("--no-dbus", action="store_false",
 
951
                      dest="use_dbus",
 
952
                      help="Do not provide D-Bus system bus"
 
953
                      " interface")
 
954
    parser.add_option("--no-ipv6", action="store_false",
 
955
                      dest="use_ipv6", help="Do not use IPv6")
 
956
    options = parser.parse_args()[0]
710
957
    
711
958
    if options.check:
712
959
        import doctest
721
968
                        "priority":
722
969
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
723
970
                        "servicename": "Mandos",
 
971
                        "use_dbus": "True",
 
972
                        "use_ipv6": "True",
724
973
                        }
725
974
    
726
975
    # Parse config file for server-global settings
729
978
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
730
979
    # Convert the SafeConfigParser object to a dict
731
980
    server_settings = server_config.defaults()
732
 
    # Use getboolean on the boolean config option
733
 
    server_settings["debug"] = server_config.getboolean\
734
 
                               ("DEFAULT", "debug")
 
981
    # Use the appropriate methods on the non-string config options
 
982
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
983
                                                        "debug")
 
984
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
985
                                                           "use_dbus")
 
986
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
987
                                                           "use_ipv6")
 
988
    if server_settings["port"]:
 
989
        server_settings["port"] = server_config.getint("DEFAULT",
 
990
                                                       "port")
735
991
    del server_config
736
992
    
737
993
    # Override the settings from the config file with command line
738
994
    # options, if set.
739
995
    for option in ("interface", "address", "port", "debug",
740
 
                   "priority", "servicename", "configdir"):
 
996
                   "priority", "servicename", "configdir",
 
997
                   "use_dbus", "use_ipv6"):
741
998
        value = getattr(options, option)
742
999
        if value is not None:
743
1000
            server_settings[option] = value
744
1001
    del options
745
1002
    # Now we have our good server settings in "server_settings"
746
1003
    
 
1004
    # For convenience
747
1005
    debug = server_settings["debug"]
 
1006
    use_dbus = server_settings["use_dbus"]
 
1007
    use_ipv6 = server_settings["use_ipv6"]
748
1008
    
749
1009
    if not debug:
750
1010
        syslogger.setLevel(logging.WARNING)
751
1011
        console.setLevel(logging.WARNING)
752
1012
    
753
1013
    if server_settings["servicename"] != "Mandos":
754
 
        syslogger.setFormatter(logging.Formatter\
 
1014
        syslogger.setFormatter(logging.Formatter
755
1015
                               ('Mandos (%s): %%(levelname)s:'
756
1016
                                ' %%(message)s'
757
1017
                                % server_settings["servicename"]))
759
1019
    # Parse config file with clients
760
1020
    client_defaults = { "timeout": "1h",
761
1021
                        "interval": "5m",
762
 
                        "checker": "fping -q -- %(host)s",
 
1022
                        "checker": "fping -q -- %%(host)s",
763
1023
                        "host": "",
764
1024
                        }
765
1025
    client_config = ConfigParser.SafeConfigParser(client_defaults)
769
1029
    clients = Set()
770
1030
    tcp_server = IPv6_TCPServer((server_settings["address"],
771
1031
                                 server_settings["port"]),
772
 
                                tcp_handler,
 
1032
                                TCP_handler,
773
1033
                                settings=server_settings,
774
 
                                clients=clients)
 
1034
                                clients=clients, use_ipv6=use_ipv6)
775
1035
    pidfilename = "/var/run/mandos.pid"
776
1036
    try:
777
1037
        pidfile = open(pidfilename, "w")
778
 
    except IOError, error:
 
1038
    except IOError:
779
1039
        logger.error("Could not open file %r", pidfilename)
780
1040
    
781
 
    uid = 65534
782
 
    gid = 65534
783
 
    try:
784
 
        uid = pwd.getpwnam("mandos").pw_uid
785
 
    except KeyError:
786
 
        try:
787
 
            uid = pwd.getpwnam("nobody").pw_uid
788
 
        except KeyError:
789
 
            pass
790
 
    try:
791
 
        gid = pwd.getpwnam("mandos").pw_gid
792
 
    except KeyError:
793
 
        try:
794
 
            gid = pwd.getpwnam("nogroup").pw_gid
795
 
        except KeyError:
796
 
            pass
797
 
    try:
 
1041
    try:
 
1042
        uid = pwd.getpwnam("_mandos").pw_uid
 
1043
        gid = pwd.getpwnam("_mandos").pw_gid
 
1044
    except KeyError:
 
1045
        try:
 
1046
            uid = pwd.getpwnam("mandos").pw_uid
 
1047
            gid = pwd.getpwnam("mandos").pw_gid
 
1048
        except KeyError:
 
1049
            try:
 
1050
                uid = pwd.getpwnam("nobody").pw_uid
 
1051
                gid = pwd.getpwnam("nogroup").pw_gid
 
1052
            except KeyError:
 
1053
                uid = 65534
 
1054
                gid = 65534
 
1055
    try:
 
1056
        os.setgid(gid)
798
1057
        os.setuid(uid)
799
 
        os.setgid(gid)
800
1058
    except OSError, error:
801
1059
        if error[0] != errno.EPERM:
802
1060
            raise error
803
1061
    
 
1062
    # Enable all possible GnuTLS debugging
 
1063
    if debug:
 
1064
        # "Use a log level over 10 to enable all debugging options."
 
1065
        # - GnuTLS manual
 
1066
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1067
        
 
1068
        @gnutls.library.types.gnutls_log_func
 
1069
        def debug_gnutls(level, string):
 
1070
            logger.debug("GnuTLS: %s", string[:-1])
 
1071
        
 
1072
        (gnutls.library.functions
 
1073
         .gnutls_global_set_log_function(debug_gnutls))
 
1074
    
804
1075
    global service
 
1076
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
805
1077
    service = AvahiService(name = server_settings["servicename"],
806
 
                           type = "_mandos._tcp", );
 
1078
                           servicetype = "_mandos._tcp",
 
1079
                           protocol = protocol)
807
1080
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
1081
        service.interface = (if_nametoindex
 
1082
                             (server_settings["interface"]))
810
1083
    
811
1084
    global main_loop
812
1085
    global bus
819
1092
                                           avahi.DBUS_PATH_SERVER),
820
1093
                            avahi.DBUS_INTERFACE_SERVER)
821
1094
    # End of Avahi example code
822
 
    
823
 
    def remove_from_clients(client):
824
 
        clients.remove(client)
825
 
        if not clients:
826
 
            logger.critical(u"No clients left, exiting")
827
 
            sys.exit()
 
1095
    if use_dbus:
 
1096
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
828
1097
    
829
1098
    clients.update(Set(Client(name = section,
830
 
                              stop_hook = remove_from_clients,
831
1099
                              config
832
 
                              = dict(client_config.items(section)))
 
1100
                              = dict(client_config.items(section)),
 
1101
                              use_dbus = use_dbus)
833
1102
                       for section in client_config.sections()))
834
1103
    if not clients:
835
 
        logger.critical(u"No clients defined")
836
 
        sys.exit(1)
 
1104
        logger.warning(u"No clients defined")
837
1105
    
838
1106
    if debug:
839
1107
        # Redirect stdin so all checkers get /dev/null
852
1120
        pidfile.write(str(pid) + "\n")
853
1121
        pidfile.close()
854
1122
        del pidfile
855
 
    except IOError, err:
 
1123
    except IOError:
856
1124
        logger.error(u"Could not write to file %r with PID %d",
857
1125
                     pidfilename, pid)
858
1126
    except NameError:
871
1139
        
872
1140
        while clients:
873
1141
            client = clients.pop()
874
 
            client.stop_hook = None
875
 
            client.stop()
 
1142
            client.disable_hook = None
 
1143
            client.disable()
876
1144
    
877
1145
    atexit.register(cleanup)
878
1146
    
881
1149
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
882
1150
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
883
1151
    
 
1152
    if use_dbus:
 
1153
        class MandosServer(dbus.service.Object):
 
1154
            """A D-Bus proxy object"""
 
1155
            def __init__(self):
 
1156
                dbus.service.Object.__init__(self, bus, "/")
 
1157
            _interface = u"se.bsnet.fukt.Mandos"
 
1158
            
 
1159
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1160
            def ClientAdded(self, objpath, properties):
 
1161
                "D-Bus signal"
 
1162
                pass
 
1163
            
 
1164
            @dbus.service.signal(_interface, signature="os")
 
1165
            def ClientRemoved(self, objpath, name):
 
1166
                "D-Bus signal"
 
1167
                pass
 
1168
            
 
1169
            @dbus.service.method(_interface, out_signature="ao")
 
1170
            def GetAllClients(self):
 
1171
                "D-Bus method"
 
1172
                return dbus.Array(c.dbus_object_path for c in clients)
 
1173
            
 
1174
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1175
            def GetAllClientsWithProperties(self):
 
1176
                "D-Bus method"
 
1177
                return dbus.Dictionary(
 
1178
                    ((c.dbus_object_path, c.GetAllProperties())
 
1179
                     for c in clients),
 
1180
                    signature="oa{sv}")
 
1181
            
 
1182
            @dbus.service.method(_interface, in_signature="o")
 
1183
            def RemoveClient(self, object_path):
 
1184
                "D-Bus method"
 
1185
                for c in clients:
 
1186
                    if c.dbus_object_path == object_path:
 
1187
                        clients.remove(c)
 
1188
                        # Don't signal anything except ClientRemoved
 
1189
                        c.use_dbus = False
 
1190
                        c.disable()
 
1191
                        # Emit D-Bus signal
 
1192
                        self.ClientRemoved(object_path, c.name)
 
1193
                        return
 
1194
                raise KeyError
 
1195
            
 
1196
            del _interface
 
1197
        
 
1198
        mandos_server = MandosServer()
 
1199
    
884
1200
    for client in clients:
885
 
        client.start()
 
1201
        if use_dbus:
 
1202
            # Emit D-Bus signal
 
1203
            mandos_server.ClientAdded(client.dbus_object_path,
 
1204
                                      client.GetAllProperties())
 
1205
        client.enable()
886
1206
    
887
1207
    tcp_server.enable()
888
1208
    tcp_server.server_activate()
889
1209
    
890
1210
    # Find out what port we got
891
1211
    service.port = tcp_server.socket.getsockname()[1]
892
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
893
 
                u" scope_id %d" % tcp_server.socket.getsockname())
 
1212
    if use_ipv6:
 
1213
        logger.info(u"Now listening on address %r, port %d,"
 
1214
                    " flowinfo %d, scope_id %d"
 
1215
                    % tcp_server.socket.getsockname())
 
1216
    else:                       # IPv4
 
1217
        logger.info(u"Now listening on address %r, port %d"
 
1218
                    % tcp_server.socket.getsockname())
894
1219
    
895
1220
    #service.interface = tcp_server.socket.getsockname()[3]
896
1221
    
906
1231
        
907
1232
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
908
1233
                             lambda *args, **kwargs:
909
 
                             tcp_server.handle_request\
910
 
                             (*args[2:], **kwargs) or True)
 
1234
                             (tcp_server.handle_request
 
1235
                              (*args[2:], **kwargs) or True))
911
1236
        
912
1237
        logger.debug(u"Starting main loop")
913
 
        main_loop_started = True
914
1238
        main_loop.run()
915
1239
    except AvahiError, error:
916
 
        logger.critical(u"AvahiError: %s" + unicode(error))
 
1240
        logger.critical(u"AvahiError: %s", error)
917
1241
        sys.exit(1)
918
1242
    except KeyboardInterrupt:
919
1243
        if debug:
920
 
            print
 
1244
            print >> sys.stderr
 
1245
        logger.debug("Server received KeyboardInterrupt")
 
1246
    logger.debug("Server exiting")
921
1247
 
922
1248
if __name__ == '__main__':
923
1249
    main()