/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

Support not using IPv6 in server:

* mandos (AvahiService.__init__): Take new "protocol" parameter.  All
                                  callers changed.
  (IPv6_TCPServer.__init__): Take new "use_ipv6" parameter.  All
                             callers changed.
  (IPv6_TCPServer.server_bind): Create IPv4 socket if not using IPv6.
  (main): New "--no-ipv6" command line option.  New "use_ipv6" config
          option.
* mandos-options.xml ([@id="address"]): Document conditional IPv4
                                        address support.
  ([@id="ipv6"]): New paragraph.
* mandos.conf (use_ipv6): New config option.
* mandos.conf.xml (OPTIONS): Document new "use_dbus" option.
  (EXAMPLE): Changed to use IPv6 link-local address.  Added "use_ipv6"
             option.
* mandos.xml (SYNOPSIS): New "--no-ipv6" option.
  (OPTIONS): Document new "--no-ipv6" option.

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
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
209
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
201
210
    """
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={}):
 
211
    def timeout_milliseconds(self):
 
212
        "Return the 'timeout' attribute in milliseconds"
 
213
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
214
                + (self.timeout.seconds * 1000)
 
215
                + (self.timeout.microseconds // 1000))
 
216
    
 
217
    def interval_milliseconds(self):
 
218
        "Return the 'interval' attribute in milliseconds"
 
219
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
220
                + (self.interval.seconds * 1000)
 
221
                + (self.interval.microseconds // 1000))
 
222
    
 
223
    def __init__(self, name = None, disable_hook=None, config=None,
 
224
                 use_dbus=True):
226
225
        """Note: the 'checker' key in 'config' sets the
227
226
        'checker_command' attribute and *not* the 'checker'
228
227
        attribute."""
229
228
        self.name = name
 
229
        if config is None:
 
230
            config = {}
230
231
        logger.debug(u"Creating client %r", self.name)
 
232
        self.use_dbus = False   # During __init__
231
233
        # Uppercase and remove spaces from fingerprint for later
232
234
        # comparison purposes with return value from the fingerprint()
233
235
        # function
234
 
        self.fingerprint = config["fingerprint"].upper()\
235
 
                           .replace(u" ", u"")
 
236
        self.fingerprint = (config["fingerprint"].upper()
 
237
                            .replace(u" ", u""))
236
238
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
237
239
        if "secret" in config:
238
240
            self.secret = config["secret"].decode(u"base64")
239
241
        elif "secfile" in config:
240
 
            sf = open(config["secfile"])
241
 
            self.secret = sf.read()
242
 
            sf.close()
 
242
            with closing(open(os.path.expanduser
 
243
                              (os.path.expandvars
 
244
                               (config["secfile"])))) as secfile:
 
245
                self.secret = secfile.read()
243
246
        else:
244
247
            raise TypeError(u"No secret or secfile for client %s"
245
248
                            % self.name)
246
249
        self.host = config.get("host", "")
247
 
        self.created = datetime.datetime.now()
 
250
        self.created = datetime.datetime.utcnow()
 
251
        self.enabled = False
 
252
        self.last_enabled = None
248
253
        self.last_checked_ok = None
249
254
        self.timeout = string_to_delta(config["timeout"])
250
255
        self.interval = string_to_delta(config["interval"])
251
 
        self.stop_hook = stop_hook
 
256
        self.disable_hook = disable_hook
252
257
        self.checker = None
253
258
        self.checker_initiator_tag = None
254
 
        self.stop_initiator_tag = None
 
259
        self.disable_initiator_tag = None
255
260
        self.checker_callback_tag = None
256
 
        self.check_command = config["checker"]
257
 
    def start(self):
 
261
        self.checker_command = config["checker"]
 
262
        self.last_connect = None
 
263
        # Only now, when this client is initialized, can it show up on
 
264
        # the D-Bus
 
265
        self.use_dbus = use_dbus
 
266
        if self.use_dbus:
 
267
            self.dbus_object_path = (dbus.ObjectPath
 
268
                                     ("/clients/"
 
269
                                      + self.name.replace(".", "_")))
 
270
            dbus.service.Object.__init__(self, bus,
 
271
                                         self.dbus_object_path)
 
272
    
 
273
    def enable(self):
258
274
        """Start this client's checker and timeout hooks"""
 
275
        self.last_enabled = datetime.datetime.utcnow()
259
276
        # Schedule a new checker to be started an 'interval' from now,
260
277
        # and every interval from then on.
261
 
        self.checker_initiator_tag = gobject.timeout_add\
262
 
                                     (self._interval_milliseconds,
263
 
                                      self.start_checker)
 
278
        self.checker_initiator_tag = (gobject.timeout_add
 
279
                                      (self.interval_milliseconds(),
 
280
                                       self.start_checker))
264
281
        # Also start a new checker *right now*.
265
282
        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:
 
283
        # Schedule a disable() when 'timeout' has passed
 
284
        self.disable_initiator_tag = (gobject.timeout_add
 
285
                                   (self.timeout_milliseconds(),
 
286
                                    self.disable))
 
287
        self.enabled = True
 
288
        if self.use_dbus:
 
289
            # Emit D-Bus signals
 
290
            self.PropertyChanged(dbus.String(u"enabled"),
 
291
                                 dbus.Boolean(True, variant_level=1))
 
292
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
293
                                 (_datetime_to_dbus(self.last_enabled,
 
294
                                                    variant_level=1)))
 
295
    
 
296
    def disable(self):
 
297
        """Disable this client."""
 
298
        if not getattr(self, "enabled", False):
279
299
            return False
280
 
        if getattr(self, "stop_initiator_tag", False):
281
 
            gobject.source_remove(self.stop_initiator_tag)
282
 
            self.stop_initiator_tag = None
 
300
        logger.info(u"Disabling client %s", self.name)
 
301
        if getattr(self, "disable_initiator_tag", False):
 
302
            gobject.source_remove(self.disable_initiator_tag)
 
303
            self.disable_initiator_tag = None
283
304
        if getattr(self, "checker_initiator_tag", False):
284
305
            gobject.source_remove(self.checker_initiator_tag)
285
306
            self.checker_initiator_tag = None
286
307
        self.stop_checker()
287
 
        if self.stop_hook:
288
 
            self.stop_hook(self)
 
308
        if self.disable_hook:
 
309
            self.disable_hook(self)
 
310
        self.enabled = False
 
311
        if self.use_dbus:
 
312
            # Emit D-Bus signal
 
313
            self.PropertyChanged(dbus.String(u"enabled"),
 
314
                                 dbus.Boolean(False, variant_level=1))
289
315
        # Do not run this again if called by a gobject.timeout_add
290
316
        return False
 
317
    
291
318
    def __del__(self):
292
 
        self.stop_hook = None
293
 
        self.stop()
294
 
    def checker_callback(self, pid, condition):
 
319
        self.disable_hook = None
 
320
        self.disable()
 
321
    
 
322
    def checker_callback(self, pid, condition, command):
295
323
        """The checker has completed, so take appropriate actions."""
296
 
        now = datetime.datetime.now()
297
324
        self.checker_callback_tag = None
298
325
        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):
 
326
        if self.use_dbus:
 
327
            # Emit D-Bus signal
 
328
            self.PropertyChanged(dbus.String(u"checker_running"),
 
329
                                 dbus.Boolean(False, variant_level=1))
 
330
        if os.WIFEXITED(condition):
 
331
            exitstatus = os.WEXITSTATUS(condition)
 
332
            if exitstatus == 0:
 
333
                logger.info(u"Checker for %(name)s succeeded",
 
334
                            vars(self))
 
335
                self.checked_ok()
 
336
            else:
 
337
                logger.info(u"Checker for %(name)s failed",
 
338
                            vars(self))
 
339
            if self.use_dbus:
 
340
                # Emit D-Bus signal
 
341
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
342
                                      dbus.Int64(condition),
 
343
                                      dbus.String(command))
 
344
        else:
309
345
            logger.warning(u"Checker for %(name)s crashed?",
310
346
                           vars(self))
311
 
        else:
312
 
            logger.info(u"Checker for %(name)s failed",
313
 
                        vars(self))
 
347
            if self.use_dbus:
 
348
                # Emit D-Bus signal
 
349
                self.CheckerCompleted(dbus.Int16(-1),
 
350
                                      dbus.Int64(condition),
 
351
                                      dbus.String(command))
 
352
    
 
353
    def checked_ok(self):
 
354
        """Bump up the timeout for this client.
 
355
        This should only be called when the client has been seen,
 
356
        alive and well.
 
357
        """
 
358
        self.last_checked_ok = datetime.datetime.utcnow()
 
359
        gobject.source_remove(self.disable_initiator_tag)
 
360
        self.disable_initiator_tag = (gobject.timeout_add
 
361
                                      (self.timeout_milliseconds(),
 
362
                                       self.disable))
 
363
        if self.use_dbus:
 
364
            # Emit D-Bus signal
 
365
            self.PropertyChanged(
 
366
                dbus.String(u"last_checked_ok"),
 
367
                (_datetime_to_dbus(self.last_checked_ok,
 
368
                                   variant_level=1)))
 
369
    
314
370
    def start_checker(self):
315
371
        """Start a new checker subprocess if one is not running.
316
372
        If a checker already exists, leave it running and do
325
381
        # is as it should be.
326
382
        if self.checker is None:
327
383
            try:
328
 
                # In case check_command has exactly one % operator
329
 
                command = self.check_command % self.host
 
384
                # In case checker_command has exactly one % operator
 
385
                command = self.checker_command % self.host
330
386
            except TypeError:
331
387
                # Escape attributes for the shell
332
388
                escaped_attrs = dict((key, re.escape(str(val)))
333
389
                                     for key, val in
334
390
                                     vars(self).iteritems())
335
391
                try:
336
 
                    command = self.check_command % escaped_attrs
 
392
                    command = self.checker_command % escaped_attrs
337
393
                except TypeError, error:
338
394
                    logger.error(u'Could not format string "%s":'
339
 
                                 u' %s', self.check_command, error)
 
395
                                 u' %s', self.checker_command, error)
340
396
                    return True # Try again later
341
397
            try:
342
398
                logger.info(u"Starting checker %r for %s",
348
404
                self.checker = subprocess.Popen(command,
349
405
                                                close_fds=True,
350
406
                                                shell=True, cwd="/")
351
 
                self.checker_callback_tag = gobject.child_watch_add\
352
 
                                            (self.checker.pid,
353
 
                                             self.checker_callback)
 
407
                if self.use_dbus:
 
408
                    # Emit D-Bus signal
 
409
                    self.CheckerStarted(command)
 
410
                    self.PropertyChanged(
 
411
                        dbus.String("checker_running"),
 
412
                        dbus.Boolean(True, variant_level=1))
 
413
                self.checker_callback_tag = (gobject.child_watch_add
 
414
                                             (self.checker.pid,
 
415
                                              self.checker_callback,
 
416
                                              data=command))
 
417
                # The checker may have completed before the gobject
 
418
                # watch was added.  Check for this.
 
419
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
420
                if pid:
 
421
                    gobject.source_remove(self.checker_callback_tag)
 
422
                    self.checker_callback(pid, status, command)
354
423
            except OSError, error:
355
424
                logger.error(u"Failed to start subprocess: %s",
356
425
                             error)
357
426
        # Re-run this periodically if run by gobject.timeout_add
358
427
        return True
 
428
    
359
429
    def stop_checker(self):
360
430
        """Force the checker process, if any, to stop."""
361
431
        if self.checker_callback_tag:
373
443
            if error.errno != errno.ESRCH: # No such process
374
444
                raise
375
445
        self.checker = None
 
446
        if self.use_dbus:
 
447
            self.PropertyChanged(dbus.String(u"checker_running"),
 
448
                                 dbus.Boolean(False, variant_level=1))
 
449
    
376
450
    def still_valid(self):
377
451
        """Has the timeout not yet passed for this client?"""
378
 
        now = datetime.datetime.now()
 
452
        if not getattr(self, "enabled", False):
 
453
            return False
 
454
        now = datetime.datetime.utcnow()
379
455
        if self.last_checked_ok is None:
380
456
            return now < (self.created + self.timeout)
381
457
        else:
382
458
            return now < (self.last_checked_ok + self.timeout)
 
459
    
 
460
    ## D-Bus methods & signals
 
461
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
462
    
 
463
    # CheckedOK - method
 
464
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
465
    CheckedOK.__name__ = "CheckedOK"
 
466
    
 
467
    # CheckerCompleted - signal
 
468
    @dbus.service.signal(_interface, signature="nxs")
 
469
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
470
        "D-Bus signal"
 
471
        pass
 
472
    
 
473
    # CheckerStarted - signal
 
474
    @dbus.service.signal(_interface, signature="s")
 
475
    def CheckerStarted(self, command):
 
476
        "D-Bus signal"
 
477
        pass
 
478
    
 
479
    # GetAllProperties - method
 
480
    @dbus.service.method(_interface, out_signature="a{sv}")
 
481
    def GetAllProperties(self):
 
482
        "D-Bus method"
 
483
        return dbus.Dictionary({
 
484
                dbus.String("name"):
 
485
                    dbus.String(self.name, variant_level=1),
 
486
                dbus.String("fingerprint"):
 
487
                    dbus.String(self.fingerprint, variant_level=1),
 
488
                dbus.String("host"):
 
489
                    dbus.String(self.host, variant_level=1),
 
490
                dbus.String("created"):
 
491
                    _datetime_to_dbus(self.created, variant_level=1),
 
492
                dbus.String("last_enabled"):
 
493
                    (_datetime_to_dbus(self.last_enabled,
 
494
                                       variant_level=1)
 
495
                     if self.last_enabled is not None
 
496
                     else dbus.Boolean(False, variant_level=1)),
 
497
                dbus.String("enabled"):
 
498
                    dbus.Boolean(self.enabled, variant_level=1),
 
499
                dbus.String("last_checked_ok"):
 
500
                    (_datetime_to_dbus(self.last_checked_ok,
 
501
                                       variant_level=1)
 
502
                     if self.last_checked_ok is not None
 
503
                     else dbus.Boolean (False, variant_level=1)),
 
504
                dbus.String("timeout"):
 
505
                    dbus.UInt64(self.timeout_milliseconds(),
 
506
                                variant_level=1),
 
507
                dbus.String("interval"):
 
508
                    dbus.UInt64(self.interval_milliseconds(),
 
509
                                variant_level=1),
 
510
                dbus.String("checker"):
 
511
                    dbus.String(self.checker_command,
 
512
                                variant_level=1),
 
513
                dbus.String("checker_running"):
 
514
                    dbus.Boolean(self.checker is not None,
 
515
                                 variant_level=1),
 
516
                dbus.String("object_path"):
 
517
                    dbus.ObjectPath(self.dbus_object_path,
 
518
                                    variant_level=1)
 
519
                }, signature="sv")
 
520
    
 
521
    # IsStillValid - method
 
522
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
523
                    (still_valid))
 
524
    IsStillValid.__name__ = "IsStillValid"
 
525
    
 
526
    # PropertyChanged - signal
 
527
    @dbus.service.signal(_interface, signature="sv")
 
528
    def PropertyChanged(self, property, value):
 
529
        "D-Bus signal"
 
530
        pass
 
531
    
 
532
    # SetChecker - method
 
533
    @dbus.service.method(_interface, in_signature="s")
 
534
    def SetChecker(self, checker):
 
535
        "D-Bus setter method"
 
536
        self.checker_command = checker
 
537
        # Emit D-Bus signal
 
538
        self.PropertyChanged(dbus.String(u"checker"),
 
539
                             dbus.String(self.checker_command,
 
540
                                         variant_level=1))
 
541
    
 
542
    # SetHost - method
 
543
    @dbus.service.method(_interface, in_signature="s")
 
544
    def SetHost(self, host):
 
545
        "D-Bus setter method"
 
546
        self.host = host
 
547
        # Emit D-Bus signal
 
548
        self.PropertyChanged(dbus.String(u"host"),
 
549
                             dbus.String(self.host, variant_level=1))
 
550
    
 
551
    # SetInterval - method
 
552
    @dbus.service.method(_interface, in_signature="t")
 
553
    def SetInterval(self, milliseconds):
 
554
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
555
        # Emit D-Bus signal
 
556
        self.PropertyChanged(dbus.String(u"interval"),
 
557
                             (dbus.UInt64(self.interval_milliseconds(),
 
558
                                          variant_level=1)))
 
559
    
 
560
    # SetSecret - method
 
561
    @dbus.service.method(_interface, in_signature="ay",
 
562
                         byte_arrays=True)
 
563
    def SetSecret(self, secret):
 
564
        "D-Bus setter method"
 
565
        self.secret = str(secret)
 
566
    
 
567
    # SetTimeout - method
 
568
    @dbus.service.method(_interface, in_signature="t")
 
569
    def SetTimeout(self, milliseconds):
 
570
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
571
        # Emit D-Bus signal
 
572
        self.PropertyChanged(dbus.String(u"timeout"),
 
573
                             (dbus.UInt64(self.timeout_milliseconds(),
 
574
                                          variant_level=1)))
 
575
    
 
576
    # Enable - method
 
577
    Enable = dbus.service.method(_interface)(enable)
 
578
    Enable.__name__ = "Enable"
 
579
    
 
580
    # StartChecker - method
 
581
    @dbus.service.method(_interface)
 
582
    def StartChecker(self):
 
583
        "D-Bus method"
 
584
        self.start_checker()
 
585
    
 
586
    # Disable - method
 
587
    @dbus.service.method(_interface)
 
588
    def Disable(self):
 
589
        "D-Bus method"
 
590
        self.disable()
 
591
    
 
592
    # StopChecker - method
 
593
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
594
    StopChecker.__name__ = "StopChecker"
 
595
    
 
596
    del _interface
383
597
 
384
598
 
385
599
def peer_certificate(session):
386
600
    "Return the peer's OpenPGP certificate as a bytestring"
387
601
    # 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:
 
602
    if (gnutls.library.functions
 
603
        .gnutls_certificate_type_get(session._c_object)
 
604
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
391
605
        # ...do the normal thing
392
606
        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))
 
607
    list_size = ctypes.c_uint(1)
 
608
    cert_list = (gnutls.library.functions
 
609
                 .gnutls_certificate_get_peers
 
610
                 (session._c_object, ctypes.byref(list_size)))
 
611
    if not bool(cert_list) and list_size.value != 0:
 
612
        raise gnutls.errors.GNUTLSError("error getting peer"
 
613
                                        " certificate")
396
614
    if list_size.value == 0:
397
615
        return None
398
616
    cert = cert_list[0]
402
620
def fingerprint(openpgp):
403
621
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
404
622
    # 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)))
 
623
    datum = (gnutls.library.types
 
624
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
625
                                         ctypes.POINTER
 
626
                                         (ctypes.c_ubyte)),
 
627
                             ctypes.c_uint(len(openpgp))))
409
628
    # New empty GnuTLS certificate
410
629
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
411
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
412
 
        (ctypes.byref(crt))
 
630
    (gnutls.library.functions
 
631
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
413
632
    # 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)
 
633
    (gnutls.library.functions
 
634
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
635
                                gnutls.library.constants
 
636
                                .GNUTLS_OPENPGP_FMT_RAW))
417
637
    # 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))
 
638
    crtverify = ctypes.c_uint()
 
639
    (gnutls.library.functions
 
640
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
421
641
    if crtverify.value != 0:
422
642
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
643
        raise gnutls.errors.CertificateSecurityError("Verify failed")
424
644
    # New buffer for the fingerprint
425
 
    buffer = ctypes.create_string_buffer(20)
426
 
    buffer_length = ctypes.c_size_t()
 
645
    buf = ctypes.create_string_buffer(20)
 
646
    buf_len = ctypes.c_size_t()
427
647
    # 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))
 
648
    (gnutls.library.functions
 
649
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
650
                                         ctypes.byref(buf_len)))
430
651
    # Deinit the certificate
431
652
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
432
653
    # Convert the buffer to a Python bytestring
433
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
654
    fpr = ctypes.string_at(buf, buf_len.value)
434
655
    # Convert the bytestring to hexadecimal notation
435
656
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
436
657
    return hex_fpr
437
658
 
438
659
 
439
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
660
class TCP_handler(SocketServer.BaseRequestHandler, object):
440
661
    """A TCP request handler class.
441
662
    Instantiated by IPv6_TCPServer for each request to handle it.
442
663
    Note: This will run in its own forked process."""
443
664
    
444
665
    def handle(self):
445
666
        logger.info(u"TCP connection from: %s",
446
 
                     unicode(self.client_address))
447
 
        session = gnutls.connection.ClientSession\
448
 
                  (self.request, gnutls.connection.X509Credentials())
 
667
                    unicode(self.client_address))
 
668
        session = (gnutls.connection
 
669
                   .ClientSession(self.request,
 
670
                                  gnutls.connection
 
671
                                  .X509Credentials()))
449
672
        
450
673
        line = self.request.makefile().readline()
451
674
        logger.debug(u"Protocol version: %r", line)
462
685
        # using OpenPGP certificates.
463
686
        
464
687
        #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);
 
688
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
689
        #                     "+DHE-DSS"))
 
690
        # Use a fallback default, since this MUST be set.
 
691
        priority = self.server.settings.get("priority", "NORMAL")
 
692
        (gnutls.library.functions
 
693
         .gnutls_priority_set_direct(session._c_object,
 
694
                                     priority, None))
473
695
        
474
696
        try:
475
697
            session.handshake()
478
700
            # Do not run session.bye() here: the session is not
479
701
            # established.  Just abandon the request.
480
702
            return
 
703
        logger.debug(u"Handshake succeeded")
481
704
        try:
482
705
            fpr = fingerprint(peer_certificate(session))
483
706
        except (TypeError, gnutls.errors.GNUTLSError), error:
485
708
            session.bye()
486
709
            return
487
710
        logger.debug(u"Fingerprint: %s", fpr)
488
 
        client = None
 
711
        
489
712
        for c in self.server.clients:
490
713
            if c.fingerprint == fpr:
491
714
                client = c
492
715
                break
493
 
        if not client:
 
716
        else:
494
717
            logger.warning(u"Client not found for fingerprint: %s",
495
718
                           fpr)
496
719
            session.bye()
503
726
                           vars(client))
504
727
            session.bye()
505
728
            return
 
729
        ## This won't work here, since we're in a fork.
 
730
        # client.checked_ok()
506
731
        sent_size = 0
507
732
        while sent_size < len(client.secret):
508
733
            sent = session.send(client.secret[sent_size:])
513
738
        session.bye()
514
739
 
515
740
 
516
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
517
 
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
 
741
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
742
                     SocketServer.TCPServer, object):
 
743
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port.
518
744
    Attributes:
519
745
        settings:       Server settings
520
746
        clients:        Set() of Client objects
528
754
        if "clients" in kwargs:
529
755
            self.clients = kwargs["clients"]
530
756
            del kwargs["clients"]
 
757
        if "use_ipv6" in kwargs:
 
758
            if not kwargs["use_ipv6"]:
 
759
                self.address_family = socket.AF_INET
 
760
            del kwargs["use_ipv6"]
531
761
        self.enabled = False
532
 
        return super(type(self), self).__init__(*args, **kwargs)
 
762
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
533
763
    def server_bind(self):
534
764
        """This overrides the normal server_bind() function
535
765
        to bind to an interface if one was specified, and also NOT to
547
777
                                 u" bind to interface %s",
548
778
                                 self.settings["interface"])
549
779
                else:
550
 
                    raise error
 
780
                    raise
551
781
        # Only bind(2) the socket if we really need to.
552
782
        if self.server_address[0] or self.server_address[1]:
553
783
            if not self.server_address[0]:
554
 
                in6addr_any = "::"
555
 
                self.server_address = (in6addr_any,
 
784
                if self.address_family == socket.AF_INET6:
 
785
                    any_address = "::" # in6addr_any
 
786
                else:
 
787
                    any_address = socket.INADDR_ANY
 
788
                self.server_address = (any_address,
556
789
                                       self.server_address[1])
557
790
            elif not self.server_address[1]:
558
791
                self.server_address = (self.server_address[0],
564
797
#                                            if_nametoindex
565
798
#                                            (self.settings
566
799
#                                             ["interface"]))
567
 
            return super(type(self), self).server_bind()
 
800
            return super(IPv6_TCPServer, self).server_bind()
568
801
    def server_activate(self):
569
802
        if self.enabled:
570
 
            return super(type(self), self).server_activate()
 
803
            return super(IPv6_TCPServer, self).server_activate()
571
804
    def enable(self):
572
805
        self.enabled = True
573
806
 
574
807
 
575
808
def string_to_delta(interval):
576
809
    """Parse a string and return a datetime.timedelta
577
 
 
 
810
    
578
811
    >>> string_to_delta('7d')
579
812
    datetime.timedelta(7)
580
813
    >>> string_to_delta('60s')
591
824
    timevalue = datetime.timedelta(0)
592
825
    for s in interval.split():
593
826
        try:
594
 
            suffix=unicode(s[-1])
595
 
            value=int(s[:-1])
 
827
            suffix = unicode(s[-1])
 
828
            value = int(s[:-1])
596
829
            if suffix == u"d":
597
830
                delta = datetime.timedelta(value)
598
831
            elif suffix == u"s":
632
865
    elif state == avahi.ENTRY_GROUP_FAILURE:
633
866
        logger.critical(u"Avahi: Error in group state changed %s",
634
867
                        unicode(error))
635
 
        raise AvahiGroupError("State changed: %s", str(error))
 
868
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
636
869
 
637
870
def if_nametoindex(interface):
638
871
    """Call the C function if_nametoindex(), or equivalent"""
639
872
    global if_nametoindex
640
873
    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
 
874
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
875
                          (ctypes.util.find_library("c"))
 
876
                          .if_nametoindex)
645
877
    except (OSError, AttributeError):
646
878
        if "struct" not in sys.modules:
647
879
            import struct
650
882
        def if_nametoindex(interface):
651
883
            "Get an interface index the hard way, i.e. using fcntl()"
652
884
            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()
 
885
            with closing(socket.socket()) as s:
 
886
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
887
                                    struct.pack("16s16x", interface))
657
888
            interface_index = struct.unpack("I", ifreq[16:20])[0]
658
889
            return interface_index
659
890
    return if_nametoindex(interface)
683
914
 
684
915
 
685
916
def main():
686
 
    global main_loop_started
687
 
    main_loop_started = False
688
 
    
689
 
    parser = OptionParser(version = "%%prog %s" % version)
 
917
    parser = optparse.OptionParser(version = "%%prog %s" % version)
690
918
    parser.add_option("-i", "--interface", type="string",
691
919
                      metavar="IF", help="Bind to interface IF")
692
920
    parser.add_option("-a", "--address", type="string",
693
921
                      help="Address to listen for requests on")
694
922
    parser.add_option("-p", "--port", type="int",
695
923
                      help="Port number to receive requests on")
696
 
    parser.add_option("--check", action="store_true", default=False,
 
924
    parser.add_option("--check", action="store_true",
697
925
                      help="Run self-test")
698
926
    parser.add_option("--debug", action="store_true",
699
927
                      help="Debug mode; run in foreground and log to"
706
934
                      default="/etc/mandos", metavar="DIR",
707
935
                      help="Directory to search for configuration"
708
936
                      " files")
709
 
    (options, args) = parser.parse_args()
 
937
    parser.add_option("--no-dbus", action="store_false",
 
938
                      dest="use_dbus",
 
939
                      help="Do not provide D-Bus system bus"
 
940
                      " interface")
 
941
    parser.add_option("--no-ipv6", action="store_false",
 
942
                      dest="use_ipv6", help="Do not use IPv6")
 
943
    options = parser.parse_args()[0]
710
944
    
711
945
    if options.check:
712
946
        import doctest
721
955
                        "priority":
722
956
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
723
957
                        "servicename": "Mandos",
 
958
                        "use_dbus": "True",
 
959
                        "use_ipv6": "True",
724
960
                        }
725
961
    
726
962
    # Parse config file for server-global settings
729
965
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
730
966
    # Convert the SafeConfigParser object to a dict
731
967
    server_settings = server_config.defaults()
732
 
    # Use getboolean on the boolean config option
733
 
    server_settings["debug"] = server_config.getboolean\
734
 
                               ("DEFAULT", "debug")
 
968
    # Use the appropriate methods on the non-string config options
 
969
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
970
                                                        "debug")
 
971
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
972
                                                           "use_dbus")
 
973
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
974
                                                           "use_ipv6")
 
975
    if server_settings["port"]:
 
976
        server_settings["port"] = server_config.getint("DEFAULT",
 
977
                                                       "port")
735
978
    del server_config
736
979
    
737
980
    # Override the settings from the config file with command line
738
981
    # options, if set.
739
982
    for option in ("interface", "address", "port", "debug",
740
 
                   "priority", "servicename", "configdir"):
 
983
                   "priority", "servicename", "configdir",
 
984
                   "use_dbus", "use_ipv6"):
741
985
        value = getattr(options, option)
742
986
        if value is not None:
743
987
            server_settings[option] = value
744
988
    del options
745
989
    # Now we have our good server settings in "server_settings"
746
990
    
 
991
    # For convenience
747
992
    debug = server_settings["debug"]
 
993
    use_dbus = server_settings["use_dbus"]
 
994
    use_ipv6 = server_settings["use_ipv6"]
748
995
    
749
996
    if not debug:
750
997
        syslogger.setLevel(logging.WARNING)
751
998
        console.setLevel(logging.WARNING)
752
999
    
753
1000
    if server_settings["servicename"] != "Mandos":
754
 
        syslogger.setFormatter(logging.Formatter\
 
1001
        syslogger.setFormatter(logging.Formatter
755
1002
                               ('Mandos (%s): %%(levelname)s:'
756
1003
                                ' %%(message)s'
757
1004
                                % server_settings["servicename"]))
759
1006
    # Parse config file with clients
760
1007
    client_defaults = { "timeout": "1h",
761
1008
                        "interval": "5m",
762
 
                        "checker": "fping -q -- %(host)s",
 
1009
                        "checker": "fping -q -- %%(host)s",
763
1010
                        "host": "",
764
1011
                        }
765
1012
    client_config = ConfigParser.SafeConfigParser(client_defaults)
769
1016
    clients = Set()
770
1017
    tcp_server = IPv6_TCPServer((server_settings["address"],
771
1018
                                 server_settings["port"]),
772
 
                                tcp_handler,
 
1019
                                TCP_handler,
773
1020
                                settings=server_settings,
774
 
                                clients=clients)
 
1021
                                clients=clients, use_ipv6=use_ipv6)
775
1022
    pidfilename = "/var/run/mandos.pid"
776
1023
    try:
777
1024
        pidfile = open(pidfilename, "w")
778
 
    except IOError, error:
 
1025
    except IOError:
779
1026
        logger.error("Could not open file %r", pidfilename)
780
1027
    
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:
 
1028
    try:
 
1029
        uid = pwd.getpwnam("_mandos").pw_uid
 
1030
        gid = pwd.getpwnam("_mandos").pw_gid
 
1031
    except KeyError:
 
1032
        try:
 
1033
            uid = pwd.getpwnam("mandos").pw_uid
 
1034
            gid = pwd.getpwnam("mandos").pw_gid
 
1035
        except KeyError:
 
1036
            try:
 
1037
                uid = pwd.getpwnam("nobody").pw_uid
 
1038
                gid = pwd.getpwnam("nogroup").pw_gid
 
1039
            except KeyError:
 
1040
                uid = 65534
 
1041
                gid = 65534
 
1042
    try:
 
1043
        os.setgid(gid)
798
1044
        os.setuid(uid)
799
 
        os.setgid(gid)
800
1045
    except OSError, error:
801
1046
        if error[0] != errno.EPERM:
802
1047
            raise error
803
1048
    
 
1049
    # Enable all possible GnuTLS debugging
 
1050
    if debug:
 
1051
        # "Use a log level over 10 to enable all debugging options."
 
1052
        # - GnuTLS manual
 
1053
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1054
        
 
1055
        @gnutls.library.types.gnutls_log_func
 
1056
        def debug_gnutls(level, string):
 
1057
            logger.debug("GnuTLS: %s", string[:-1])
 
1058
        
 
1059
        (gnutls.library.functions
 
1060
         .gnutls_global_set_log_function(debug_gnutls))
 
1061
    
804
1062
    global service
 
1063
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
805
1064
    service = AvahiService(name = server_settings["servicename"],
806
 
                           type = "_mandos._tcp", );
 
1065
                           servicetype = "_mandos._tcp",
 
1066
                           protocol = protocol)
807
1067
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
1068
        service.interface = (if_nametoindex
 
1069
                             (server_settings["interface"]))
810
1070
    
811
1071
    global main_loop
812
1072
    global bus
819
1079
                                           avahi.DBUS_PATH_SERVER),
820
1080
                            avahi.DBUS_INTERFACE_SERVER)
821
1081
    # 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()
 
1082
    if use_dbus:
 
1083
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
828
1084
    
829
1085
    clients.update(Set(Client(name = section,
830
 
                              stop_hook = remove_from_clients,
831
1086
                              config
832
 
                              = dict(client_config.items(section)))
 
1087
                              = dict(client_config.items(section)),
 
1088
                              use_dbus = use_dbus)
833
1089
                       for section in client_config.sections()))
834
1090
    if not clients:
835
 
        logger.critical(u"No clients defined")
836
 
        sys.exit(1)
 
1091
        logger.warning(u"No clients defined")
837
1092
    
838
1093
    if debug:
839
1094
        # Redirect stdin so all checkers get /dev/null
852
1107
        pidfile.write(str(pid) + "\n")
853
1108
        pidfile.close()
854
1109
        del pidfile
855
 
    except IOError, err:
 
1110
    except IOError:
856
1111
        logger.error(u"Could not write to file %r with PID %d",
857
1112
                     pidfilename, pid)
858
1113
    except NameError:
871
1126
        
872
1127
        while clients:
873
1128
            client = clients.pop()
874
 
            client.stop_hook = None
875
 
            client.stop()
 
1129
            client.disable_hook = None
 
1130
            client.disable()
876
1131
    
877
1132
    atexit.register(cleanup)
878
1133
    
881
1136
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
882
1137
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
883
1138
    
 
1139
    if use_dbus:
 
1140
        class MandosServer(dbus.service.Object):
 
1141
            """A D-Bus proxy object"""
 
1142
            def __init__(self):
 
1143
                dbus.service.Object.__init__(self, bus, "/")
 
1144
            _interface = u"se.bsnet.fukt.Mandos"
 
1145
            
 
1146
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1147
            def ClientAdded(self, objpath, properties):
 
1148
                "D-Bus signal"
 
1149
                pass
 
1150
            
 
1151
            @dbus.service.signal(_interface, signature="os")
 
1152
            def ClientRemoved(self, objpath, name):
 
1153
                "D-Bus signal"
 
1154
                pass
 
1155
            
 
1156
            @dbus.service.method(_interface, out_signature="ao")
 
1157
            def GetAllClients(self):
 
1158
                "D-Bus method"
 
1159
                return dbus.Array(c.dbus_object_path for c in clients)
 
1160
            
 
1161
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
1162
            def GetAllClientsWithProperties(self):
 
1163
                "D-Bus method"
 
1164
                return dbus.Dictionary(
 
1165
                    ((c.dbus_object_path, c.GetAllProperties())
 
1166
                     for c in clients),
 
1167
                    signature="oa{sv}")
 
1168
            
 
1169
            @dbus.service.method(_interface, in_signature="o")
 
1170
            def RemoveClient(self, object_path):
 
1171
                "D-Bus method"
 
1172
                for c in clients:
 
1173
                    if c.dbus_object_path == object_path:
 
1174
                        clients.remove(c)
 
1175
                        # Don't signal anything except ClientRemoved
 
1176
                        c.use_dbus = False
 
1177
                        c.disable()
 
1178
                        # Emit D-Bus signal
 
1179
                        self.ClientRemoved(object_path, c.name)
 
1180
                        return
 
1181
                raise KeyError
 
1182
            
 
1183
            del _interface
 
1184
        
 
1185
        mandos_server = MandosServer()
 
1186
    
884
1187
    for client in clients:
885
 
        client.start()
 
1188
        if use_dbus:
 
1189
            # Emit D-Bus signal
 
1190
            mandos_server.ClientAdded(client.dbus_object_path,
 
1191
                                      client.GetAllProperties())
 
1192
        client.enable()
886
1193
    
887
1194
    tcp_server.enable()
888
1195
    tcp_server.server_activate()
889
1196
    
890
1197
    # Find out what port we got
891
1198
    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())
 
1199
    if use_ipv6:
 
1200
        logger.info(u"Now listening on address %r, port %d,"
 
1201
                    " flowinfo %d, scope_id %d"
 
1202
                    % tcp_server.socket.getsockname())
 
1203
    else:                       # IPv4
 
1204
        logger.info(u"Now listening on address %r, port %d"
 
1205
                    % tcp_server.socket.getsockname())
894
1206
    
895
1207
    #service.interface = tcp_server.socket.getsockname()[3]
896
1208
    
906
1218
        
907
1219
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
908
1220
                             lambda *args, **kwargs:
909
 
                             tcp_server.handle_request\
910
 
                             (*args[2:], **kwargs) or True)
 
1221
                             (tcp_server.handle_request
 
1222
                              (*args[2:], **kwargs) or True))
911
1223
        
912
1224
        logger.debug(u"Starting main loop")
913
 
        main_loop_started = True
914
1225
        main_loop.run()
915
1226
    except AvahiError, error:
916
 
        logger.critical(u"AvahiError: %s" + unicode(error))
 
1227
        logger.critical(u"AvahiError: %s", error)
917
1228
        sys.exit(1)
918
1229
    except KeyboardInterrupt:
919
1230
        if debug:
920
 
            print
 
1231
            print >> sys.stderr
 
1232
        logger.debug("Server received KeyboardInterrupt")
 
1233
    logger.debug("Server exiting")
921
1234
 
922
1235
if __name__ == '__main__':
923
1236
    main()