/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

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

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

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16
15
# 
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
31
30
# Contact the authors at <mandos@fukt.bsnet.se>.
32
31
# 
33
32
 
34
 
from __future__ import division, with_statement, absolute_import
 
33
from __future__ import division
35
34
 
36
35
import SocketServer
37
36
import socket
38
 
import optparse
 
37
import select
 
38
from optparse import OptionParser
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
55
55
import stat
56
56
import logging
57
57
import logging.handlers
58
 
import pwd
59
 
from contextlib import closing
60
58
 
61
59
import dbus
62
 
import dbus.service
63
60
import gobject
64
61
import avahi
65
62
from dbus.mainloop.glib import DBusGMainLoop
66
63
import ctypes
67
 
import ctypes.util
68
64
 
69
 
version = "1.0.5"
 
65
version = "1.0"
70
66
 
71
67
logger = logging.Logger('mandos')
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'))
 
68
syslogger = logging.handlers.SysLogHandler\
 
69
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
70
             address = "/dev/log")
 
71
syslogger.setFormatter(logging.Formatter\
 
72
                        ('Mandos: %(levelname)s: %(message)s'))
78
73
logger.addHandler(syslogger)
79
74
 
80
75
console = logging.StreamHandler()
81
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
 
                                       ' %(levelname)s: %(message)s'))
 
76
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
77
                                       ' %(message)s'))
83
78
logger.addHandler(console)
84
79
 
85
80
class AvahiError(Exception):
86
 
    def __init__(self, value, *args, **kwargs):
 
81
    def __init__(self, value):
87
82
        self.value = value
88
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
89
 
    def __unicode__(self):
90
 
        return unicode(repr(self.value))
 
83
    def __str__(self):
 
84
        return repr(self.value)
91
85
 
92
86
class AvahiServiceError(AvahiError):
93
87
    pass
113
107
                  a sensible number of times
114
108
    """
115
109
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
 
                 servicetype = None, port = None, TXT = None,
117
 
                 domain = "", host = "", max_renames = 32768,
118
 
                 protocol = avahi.PROTO_UNSPEC):
 
110
                 type = None, port = None, TXT = None, domain = "",
 
111
                 host = "", max_renames = 32768):
119
112
        self.interface = interface
120
113
        self.name = name
121
 
        self.type = servicetype
 
114
        self.type = type
122
115
        self.port = port
123
 
        self.TXT = TXT if TXT is not None else []
 
116
        if TXT is None:
 
117
            self.TXT = []
 
118
        else:
 
119
            self.TXT = TXT
124
120
        self.domain = domain
125
121
        self.host = host
126
122
        self.rename_count = 0
127
123
        self.max_renames = max_renames
128
 
        self.protocol = protocol
129
124
    def rename(self):
130
125
        """Derived from the Avahi example code"""
131
126
        if self.rename_count >= self.max_renames:
132
127
            logger.critical(u"No suitable Zeroconf service name found"
133
128
                            u" after %i retries, exiting.",
134
 
                            self.rename_count)
135
 
            raise AvahiServiceError(u"Too many renames")
 
129
                            rename_count)
 
130
            raise AvahiServiceError("Too many renames")
136
131
        self.name = server.GetAlternativeServiceName(self.name)
137
132
        logger.info(u"Changing Zeroconf service name to %r ...",
138
133
                    str(self.name))
139
 
        syslogger.setFormatter(logging.Formatter
 
134
        syslogger.setFormatter(logging.Formatter\
140
135
                               ('Mandos (%s): %%(levelname)s:'
141
 
                                ' %%(message)s' % self.name))
 
136
                               ' %%(message)s' % self.name))
142
137
        self.remove()
143
138
        self.add()
144
139
        self.rename_count += 1
150
145
        """Derived from the Avahi example code"""
151
146
        global group
152
147
        if group is None:
153
 
            group = dbus.Interface(bus.get_object
154
 
                                   (avahi.DBUS_NAME,
 
148
            group = dbus.Interface\
 
149
                    (bus.get_object(avahi.DBUS_NAME,
155
150
                                    server.EntryGroupNew()),
156
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
157
152
            group.connect_to_signal('StateChanged',
158
153
                                    entry_group_state_changed)
159
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
160
155
                     service.name, service.type)
161
156
        group.AddService(
162
157
                self.interface,         # interface
163
 
                self.protocol,          # protocol
 
158
                avahi.PROTO_INET6,      # protocol
164
159
                dbus.UInt32(0),         # flags
165
160
                self.name, self.type,
166
161
                self.domain, self.host,
173
168
# End of Avahi example code
174
169
 
175
170
 
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):
 
171
class Client(object):
182
172
    """A representation of a client host served by this server.
183
173
    Attributes:
184
 
    name:       string; from the config file, used in log messages and
185
 
                        D-Bus identifiers
 
174
    name:      string; from the config file, used in log messages
186
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
187
176
                 uniquely identify the client
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.
 
177
    secret:    bytestring; sent verbatim (over TLS) to client
 
178
    host:      string; available for use by the checker command
 
179
    created:   datetime.datetime(); object creation, not client host
 
180
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
181
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
182
                                     until this client is invalid
 
183
    interval:  datetime.timedelta(); How often to start a new checker
 
184
    stop_hook: If set, called by stop() as stop_hook(self)
 
185
    checker:   subprocess.Popen(); a running checker process used
 
186
                                   to see if the client lives.
 
187
                                   'None' if no process is running.
201
188
    checker_initiator_tag: a gobject event source tag, or None
202
 
    disable_initiator_tag:    - '' -
 
189
    stop_initiator_tag:    - '' -
203
190
    checker_callback_tag:  - '' -
204
191
    checker_command: string; External command which is run to check if
205
192
                     client lives.  %() expansions are done at
206
193
                     runtime with vars(self) as dict, so that for
207
194
                     instance %(name)s can be used in the command.
208
 
    use_dbus: bool(); Whether to provide D-Bus interface and signals
209
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
 
195
    Private attibutes:
 
196
    _timeout: Real variable for 'timeout'
 
197
    _interval: Real variable for 'interval'
 
198
    _timeout_milliseconds: Used when calling gobject.timeout_add()
 
199
    _interval_milliseconds: - '' -
210
200
    """
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):
 
201
    def _set_timeout(self, timeout):
 
202
        "Setter function for 'timeout' attribute"
 
203
        self._timeout = timeout
 
204
        self._timeout_milliseconds = ((self.timeout.days
 
205
                                       * 24 * 60 * 60 * 1000)
 
206
                                      + (self.timeout.seconds * 1000)
 
207
                                      + (self.timeout.microseconds
 
208
                                         // 1000))
 
209
    timeout = property(lambda self: self._timeout,
 
210
                       _set_timeout)
 
211
    del _set_timeout
 
212
    def _set_interval(self, interval):
 
213
        "Setter function for 'interval' attribute"
 
214
        self._interval = interval
 
215
        self._interval_milliseconds = ((self.interval.days
 
216
                                        * 24 * 60 * 60 * 1000)
 
217
                                       + (self.interval.seconds
 
218
                                          * 1000)
 
219
                                       + (self.interval.microseconds
 
220
                                          // 1000))
 
221
    interval = property(lambda self: self._interval,
 
222
                        _set_interval)
 
223
    del _set_interval
 
224
    def __init__(self, name = None, stop_hook=None, config={}):
225
225
        """Note: the 'checker' key in 'config' sets the
226
226
        'checker_command' attribute and *not* the 'checker'
227
227
        attribute."""
228
228
        self.name = name
229
 
        if config is None:
230
 
            config = {}
231
229
        logger.debug(u"Creating client %r", self.name)
232
 
        self.use_dbus = False   # During __init__
233
230
        # Uppercase and remove spaces from fingerprint for later
234
231
        # comparison purposes with return value from the fingerprint()
235
232
        # function
236
 
        self.fingerprint = (config["fingerprint"].upper()
237
 
                            .replace(u" ", u""))
 
233
        self.fingerprint = config["fingerprint"].upper()\
 
234
                           .replace(u" ", u"")
238
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
239
236
        if "secret" in config:
240
237
            self.secret = config["secret"].decode(u"base64")
241
238
        elif "secfile" in config:
242
 
            with closing(open(os.path.expanduser
243
 
                              (os.path.expandvars
244
 
                               (config["secfile"])))) as secfile:
245
 
                self.secret = secfile.read()
 
239
            sf = open(config["secfile"])
 
240
            self.secret = sf.read()
 
241
            sf.close()
246
242
        else:
247
243
            raise TypeError(u"No secret or secfile for client %s"
248
244
                            % self.name)
249
245
        self.host = config.get("host", "")
250
 
        self.created = datetime.datetime.utcnow()
251
 
        self.enabled = False
252
 
        self.last_enabled = None
 
246
        self.created = datetime.datetime.now()
253
247
        self.last_checked_ok = None
254
248
        self.timeout = string_to_delta(config["timeout"])
255
249
        self.interval = string_to_delta(config["interval"])
256
 
        self.disable_hook = disable_hook
 
250
        self.stop_hook = stop_hook
257
251
        self.checker = None
258
252
        self.checker_initiator_tag = None
259
 
        self.disable_initiator_tag = None
 
253
        self.stop_initiator_tag = None
260
254
        self.checker_callback_tag = None
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):
 
255
        self.check_command = config["checker"]
 
256
    def start(self):
274
257
        """Start this client's checker and timeout hooks"""
275
 
        self.last_enabled = datetime.datetime.utcnow()
276
258
        # Schedule a new checker to be started an 'interval' from now,
277
259
        # and every interval from then on.
278
 
        self.checker_initiator_tag = (gobject.timeout_add
279
 
                                      (self.interval_milliseconds(),
280
 
                                       self.start_checker))
 
260
        self.checker_initiator_tag = gobject.timeout_add\
 
261
                                     (self._interval_milliseconds,
 
262
                                      self.start_checker)
281
263
        # Also start a new checker *right now*.
282
264
        self.start_checker()
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):
 
265
        # Schedule a stop() when 'timeout' has passed
 
266
        self.stop_initiator_tag = gobject.timeout_add\
 
267
                                  (self._timeout_milliseconds,
 
268
                                   self.stop)
 
269
    def stop(self):
 
270
        """Stop this client.
 
271
        The possibility that a client might be restarted is left open,
 
272
        but not currently used."""
 
273
        # If this client doesn't have a secret, it is already stopped.
 
274
        if hasattr(self, "secret") and self.secret:
 
275
            logger.info(u"Stopping client %s", self.name)
 
276
            self.secret = None
 
277
        else:
299
278
            return False
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
 
279
        if getattr(self, "stop_initiator_tag", False):
 
280
            gobject.source_remove(self.stop_initiator_tag)
 
281
            self.stop_initiator_tag = None
304
282
        if getattr(self, "checker_initiator_tag", False):
305
283
            gobject.source_remove(self.checker_initiator_tag)
306
284
            self.checker_initiator_tag = None
307
285
        self.stop_checker()
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))
 
286
        if self.stop_hook:
 
287
            self.stop_hook(self)
315
288
        # Do not run this again if called by a gobject.timeout_add
316
289
        return False
317
 
    
318
290
    def __del__(self):
319
 
        self.disable_hook = None
320
 
        self.disable()
321
 
    
322
 
    def checker_callback(self, pid, condition, command):
 
291
        self.stop_hook = None
 
292
        self.stop()
 
293
    def checker_callback(self, pid, condition):
323
294
        """The checker has completed, so take appropriate actions."""
 
295
        now = datetime.datetime.now()
324
296
        self.checker_callback_tag = None
325
297
        self.checker = None
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:
 
298
        if os.WIFEXITED(condition) \
 
299
               and (os.WEXITSTATUS(condition) == 0):
 
300
            logger.info(u"Checker for %(name)s succeeded",
 
301
                        vars(self))
 
302
            self.last_checked_ok = now
 
303
            gobject.source_remove(self.stop_initiator_tag)
 
304
            self.stop_initiator_tag = gobject.timeout_add\
 
305
                                      (self._timeout_milliseconds,
 
306
                                       self.stop)
 
307
        elif not os.WIFEXITED(condition):
345
308
            logger.warning(u"Checker for %(name)s crashed?",
346
309
                           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
 
    
 
310
        else:
 
311
            logger.info(u"Checker for %(name)s failed",
 
312
                        vars(self))
370
313
    def start_checker(self):
371
314
        """Start a new checker subprocess if one is not running.
372
315
        If a checker already exists, leave it running and do
381
324
        # is as it should be.
382
325
        if self.checker is None:
383
326
            try:
384
 
                # In case checker_command has exactly one % operator
385
 
                command = self.checker_command % self.host
 
327
                # In case check_command has exactly one % operator
 
328
                command = self.check_command % self.host
386
329
            except TypeError:
387
330
                # Escape attributes for the shell
388
331
                escaped_attrs = dict((key, re.escape(str(val)))
389
332
                                     for key, val in
390
333
                                     vars(self).iteritems())
391
334
                try:
392
 
                    command = self.checker_command % escaped_attrs
 
335
                    command = self.check_command % escaped_attrs
393
336
                except TypeError, error:
394
337
                    logger.error(u'Could not format string "%s":'
395
 
                                 u' %s', self.checker_command, error)
 
338
                                 u' %s', self.check_command, error)
396
339
                    return True # Try again later
397
340
            try:
398
341
                logger.info(u"Starting checker %r for %s",
404
347
                self.checker = subprocess.Popen(command,
405
348
                                                close_fds=True,
406
349
                                                shell=True, cwd="/")
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)
 
350
                self.checker_callback_tag = gobject.child_watch_add\
 
351
                                            (self.checker.pid,
 
352
                                             self.checker_callback)
423
353
            except OSError, error:
424
354
                logger.error(u"Failed to start subprocess: %s",
425
355
                             error)
426
356
        # Re-run this periodically if run by gobject.timeout_add
427
357
        return True
428
 
    
429
358
    def stop_checker(self):
430
359
        """Force the checker process, if any, to stop."""
431
360
        if self.checker_callback_tag:
443
372
            if error.errno != errno.ESRCH: # No such process
444
373
                raise
445
374
        self.checker = None
446
 
        if self.use_dbus:
447
 
            self.PropertyChanged(dbus.String(u"checker_running"),
448
 
                                 dbus.Boolean(False, variant_level=1))
449
 
    
450
375
    def still_valid(self):
451
376
        """Has the timeout not yet passed for this client?"""
452
 
        if not getattr(self, "enabled", False):
453
 
            return False
454
 
        now = datetime.datetime.utcnow()
 
377
        now = datetime.datetime.now()
455
378
        if self.last_checked_ok is None:
456
379
            return now < (self.created + self.timeout)
457
380
        else:
458
381
            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
597
382
 
598
383
 
599
384
def peer_certificate(session):
600
385
    "Return the peer's OpenPGP certificate as a bytestring"
601
386
    # If not an OpenPGP certificate...
602
 
    if (gnutls.library.functions
603
 
        .gnutls_certificate_type_get(session._c_object)
604
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
387
    if gnutls.library.functions.gnutls_certificate_type_get\
 
388
            (session._c_object) \
 
389
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
605
390
        # ...do the normal thing
606
391
        return session.peer_certificate
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")
 
392
    list_size = ctypes.c_uint()
 
393
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
394
        (session._c_object, ctypes.byref(list_size))
614
395
    if list_size.value == 0:
615
396
        return None
616
397
    cert = cert_list[0]
620
401
def fingerprint(openpgp):
621
402
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
622
403
    # New GnuTLS "datum" with the OpenPGP public key
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))))
 
404
    datum = gnutls.library.types.gnutls_datum_t\
 
405
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
406
                     ctypes.POINTER(ctypes.c_ubyte)),
 
407
         ctypes.c_uint(len(openpgp)))
628
408
    # New empty GnuTLS certificate
629
409
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
630
 
    (gnutls.library.functions
631
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
410
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
411
        (ctypes.byref(crt))
632
412
    # Import the OpenPGP public key into the certificate
633
 
    (gnutls.library.functions
634
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
635
 
                                gnutls.library.constants
636
 
                                .GNUTLS_OPENPGP_FMT_RAW))
 
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
414
                    (crt, ctypes.byref(datum),
 
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
637
416
    # Verify the self signature in the key
638
 
    crtverify = ctypes.c_uint()
639
 
    (gnutls.library.functions
640
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
417
    crtverify = ctypes.c_uint();
 
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
419
        (crt, 0, ctypes.byref(crtverify))
641
420
    if crtverify.value != 0:
642
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
643
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
644
423
    # New buffer for the fingerprint
645
 
    buf = ctypes.create_string_buffer(20)
646
 
    buf_len = ctypes.c_size_t()
 
424
    buffer = ctypes.create_string_buffer(20)
 
425
    buffer_length = ctypes.c_size_t()
647
426
    # Get the fingerprint from the certificate into the buffer
648
 
    (gnutls.library.functions
649
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
650
 
                                         ctypes.byref(buf_len)))
 
427
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
428
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
651
429
    # Deinit the certificate
652
430
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
653
431
    # Convert the buffer to a Python bytestring
654
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
432
    fpr = ctypes.string_at(buffer, buffer_length.value)
655
433
    # Convert the bytestring to hexadecimal notation
656
434
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
657
435
    return hex_fpr
658
436
 
659
437
 
660
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
438
class tcp_handler(SocketServer.BaseRequestHandler, object):
661
439
    """A TCP request handler class.
662
440
    Instantiated by IPv6_TCPServer for each request to handle it.
663
441
    Note: This will run in its own forked process."""
664
442
    
665
443
    def handle(self):
666
444
        logger.info(u"TCP connection from: %s",
667
 
                    unicode(self.client_address))
668
 
        session = (gnutls.connection
669
 
                   .ClientSession(self.request,
670
 
                                  gnutls.connection
671
 
                                  .X509Credentials()))
 
445
                     unicode(self.client_address))
 
446
        session = gnutls.connection.ClientSession\
 
447
                  (self.request, gnutls.connection.X509Credentials())
672
448
        
673
449
        line = self.request.makefile().readline()
674
450
        logger.debug(u"Protocol version: %r", line)
685
461
        # using OpenPGP certificates.
686
462
        
687
463
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
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))
 
464
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
465
        #                "+DHE-DSS"))
 
466
        priority = "NORMAL"             # Fallback default, since this
 
467
                                        # MUST be set.
 
468
        if self.server.settings["priority"]:
 
469
            priority = self.server.settings["priority"]
 
470
        gnutls.library.functions.gnutls_priority_set_direct\
 
471
            (session._c_object, priority, None);
695
472
        
696
473
        try:
697
474
            session.handshake()
700
477
            # Do not run session.bye() here: the session is not
701
478
            # established.  Just abandon the request.
702
479
            return
703
 
        logger.debug(u"Handshake succeeded")
704
480
        try:
705
481
            fpr = fingerprint(peer_certificate(session))
706
482
        except (TypeError, gnutls.errors.GNUTLSError), error:
708
484
            session.bye()
709
485
            return
710
486
        logger.debug(u"Fingerprint: %s", fpr)
711
 
        
 
487
        client = None
712
488
        for c in self.server.clients:
713
489
            if c.fingerprint == fpr:
714
490
                client = c
715
491
                break
716
 
        else:
 
492
        if not client:
717
493
            logger.warning(u"Client not found for fingerprint: %s",
718
494
                           fpr)
719
495
            session.bye()
726
502
                           vars(client))
727
503
            session.bye()
728
504
            return
729
 
        ## This won't work here, since we're in a fork.
730
 
        # client.checked_ok()
731
505
        sent_size = 0
732
506
        while sent_size < len(client.secret):
733
507
            sent = session.send(client.secret[sent_size:])
738
512
        session.bye()
739
513
 
740
514
 
741
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
742
 
                     SocketServer.TCPServer, object):
743
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port.
 
515
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
516
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
744
517
    Attributes:
745
518
        settings:       Server settings
746
519
        clients:        Set() of Client objects
747
 
        enabled:        Boolean; whether this server is activated yet
748
520
    """
749
521
    address_family = socket.AF_INET6
750
522
    def __init__(self, *args, **kwargs):
754
526
        if "clients" in kwargs:
755
527
            self.clients = kwargs["clients"]
756
528
            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"]
761
 
        self.enabled = False
762
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
529
        return super(type(self), self).__init__(*args, **kwargs)
763
530
    def server_bind(self):
764
531
        """This overrides the normal server_bind() function
765
532
        to bind to an interface if one was specified, and also NOT to
777
544
                                 u" bind to interface %s",
778
545
                                 self.settings["interface"])
779
546
                else:
780
 
                    raise
 
547
                    raise error
781
548
        # Only bind(2) the socket if we really need to.
782
549
        if self.server_address[0] or self.server_address[1]:
783
550
            if not self.server_address[0]:
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,
 
551
                in6addr_any = "::"
 
552
                self.server_address = (in6addr_any,
789
553
                                       self.server_address[1])
790
554
            elif not self.server_address[1]:
791
555
                self.server_address = (self.server_address[0],
797
561
#                                            if_nametoindex
798
562
#                                            (self.settings
799
563
#                                             ["interface"]))
800
 
            return super(IPv6_TCPServer, self).server_bind()
801
 
    def server_activate(self):
802
 
        if self.enabled:
803
 
            return super(IPv6_TCPServer, self).server_activate()
804
 
    def enable(self):
805
 
        self.enabled = True
 
564
            return super(type(self), self).server_bind()
806
565
 
807
566
 
808
567
def string_to_delta(interval):
809
568
    """Parse a string and return a datetime.timedelta
810
 
    
 
569
 
811
570
    >>> string_to_delta('7d')
812
571
    datetime.timedelta(7)
813
572
    >>> string_to_delta('60s')
824
583
    timevalue = datetime.timedelta(0)
825
584
    for s in interval.split():
826
585
        try:
827
 
            suffix = unicode(s[-1])
828
 
            value = int(s[:-1])
 
586
            suffix=unicode(s[-1])
 
587
            value=int(s[:-1])
829
588
            if suffix == u"d":
830
589
                delta = datetime.timedelta(value)
831
590
            elif suffix == u"s":
865
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
866
625
        logger.critical(u"Avahi: Error in group state changed %s",
867
626
                        unicode(error))
868
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
627
        raise AvahiGroupError("State changed: %s", str(error))
869
628
 
870
629
def if_nametoindex(interface):
871
630
    """Call the C function if_nametoindex(), or equivalent"""
872
631
    global if_nametoindex
873
632
    try:
874
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
875
 
                          (ctypes.util.find_library("c"))
876
 
                          .if_nametoindex)
 
633
        if "ctypes.util" not in sys.modules:
 
634
            import ctypes.util
 
635
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
636
            (ctypes.util.find_library("c")).if_nametoindex
877
637
    except (OSError, AttributeError):
878
638
        if "struct" not in sys.modules:
879
639
            import struct
882
642
        def if_nametoindex(interface):
883
643
            "Get an interface index the hard way, i.e. using fcntl()"
884
644
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
885
 
            with closing(socket.socket()) as s:
886
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
887
 
                                    struct.pack("16s16x", interface))
 
645
            s = socket.socket()
 
646
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
647
                                struct.pack("16s16x", interface))
 
648
            s.close()
888
649
            interface_index = struct.unpack("I", ifreq[16:20])[0]
889
650
            return interface_index
890
651
    return if_nametoindex(interface)
914
675
 
915
676
 
916
677
def main():
917
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
678
    global main_loop_started
 
679
    main_loop_started = False
 
680
    
 
681
    parser = OptionParser(version = "%%prog %s" % version)
918
682
    parser.add_option("-i", "--interface", type="string",
919
683
                      metavar="IF", help="Bind to interface IF")
920
684
    parser.add_option("-a", "--address", type="string",
921
685
                      help="Address to listen for requests on")
922
686
    parser.add_option("-p", "--port", type="int",
923
687
                      help="Port number to receive requests on")
924
 
    parser.add_option("--check", action="store_true",
 
688
    parser.add_option("--check", action="store_true", default=False,
925
689
                      help="Run self-test")
926
690
    parser.add_option("--debug", action="store_true",
927
691
                      help="Debug mode; run in foreground and log to"
934
698
                      default="/etc/mandos", metavar="DIR",
935
699
                      help="Directory to search for configuration"
936
700
                      " files")
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]
 
701
    (options, args) = parser.parse_args()
944
702
    
945
703
    if options.check:
946
704
        import doctest
955
713
                        "priority":
956
714
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
957
715
                        "servicename": "Mandos",
958
 
                        "use_dbus": "True",
959
 
                        "use_ipv6": "True",
960
716
                        }
961
717
    
962
718
    # Parse config file for server-global settings
965
721
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
966
722
    # Convert the SafeConfigParser object to a dict
967
723
    server_settings = server_config.defaults()
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")
 
724
    # Use getboolean on the boolean config option
 
725
    server_settings["debug"] = server_config.getboolean\
 
726
                               ("DEFAULT", "debug")
978
727
    del server_config
979
728
    
980
729
    # Override the settings from the config file with command line
981
730
    # options, if set.
982
731
    for option in ("interface", "address", "port", "debug",
983
 
                   "priority", "servicename", "configdir",
984
 
                   "use_dbus", "use_ipv6"):
 
732
                   "priority", "servicename", "configdir"):
985
733
        value = getattr(options, option)
986
734
        if value is not None:
987
735
            server_settings[option] = value
988
736
    del options
989
737
    # Now we have our good server settings in "server_settings"
990
738
    
991
 
    # For convenience
992
739
    debug = server_settings["debug"]
993
 
    use_dbus = server_settings["use_dbus"]
994
 
    use_ipv6 = server_settings["use_ipv6"]
995
740
    
996
741
    if not debug:
997
742
        syslogger.setLevel(logging.WARNING)
998
743
        console.setLevel(logging.WARNING)
999
744
    
1000
745
    if server_settings["servicename"] != "Mandos":
1001
 
        syslogger.setFormatter(logging.Formatter
 
746
        syslogger.setFormatter(logging.Formatter\
1002
747
                               ('Mandos (%s): %%(levelname)s:'
1003
748
                                ' %%(message)s'
1004
749
                                % server_settings["servicename"]))
1006
751
    # Parse config file with clients
1007
752
    client_defaults = { "timeout": "1h",
1008
753
                        "interval": "5m",
1009
 
                        "checker": "fping -q -- %%(host)s",
 
754
                        "checker": "fping -q -- %(host)s",
1010
755
                        "host": "",
1011
756
                        }
1012
757
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1013
758
    client_config.read(os.path.join(server_settings["configdir"],
1014
759
                                    "clients.conf"))
1015
760
    
1016
 
    clients = Set()
1017
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
1018
 
                                 server_settings["port"]),
1019
 
                                TCP_handler,
1020
 
                                settings=server_settings,
1021
 
                                clients=clients, use_ipv6=use_ipv6)
1022
 
    pidfilename = "/var/run/mandos.pid"
1023
 
    try:
1024
 
        pidfile = open(pidfilename, "w")
1025
 
    except IOError:
1026
 
        logger.error("Could not open file %r", pidfilename)
1027
 
    
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)
1044
 
        os.setuid(uid)
1045
 
    except OSError, error:
1046
 
        if error[0] != errno.EPERM:
1047
 
            raise error
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
 
    
1062
761
    global service
1063
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1064
762
    service = AvahiService(name = server_settings["servicename"],
1065
 
                           servicetype = "_mandos._tcp",
1066
 
                           protocol = protocol)
 
763
                           type = "_mandos._tcp", );
1067
764
    if server_settings["interface"]:
1068
 
        service.interface = (if_nametoindex
1069
 
                             (server_settings["interface"]))
 
765
        service.interface = if_nametoindex\
 
766
                            (server_settings["interface"])
1070
767
    
1071
768
    global main_loop
1072
769
    global bus
1079
776
                                           avahi.DBUS_PATH_SERVER),
1080
777
                            avahi.DBUS_INTERFACE_SERVER)
1081
778
    # End of Avahi example code
1082
 
    if use_dbus:
1083
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
779
    
 
780
    clients = Set()
 
781
    def remove_from_clients(client):
 
782
        clients.remove(client)
 
783
        if not clients:
 
784
            logger.critical(u"No clients left, exiting")
 
785
            sys.exit()
1084
786
    
1085
787
    clients.update(Set(Client(name = section,
 
788
                              stop_hook = remove_from_clients,
1086
789
                              config
1087
 
                              = dict(client_config.items(section)),
1088
 
                              use_dbus = use_dbus)
 
790
                              = dict(client_config.items(section)))
1089
791
                       for section in client_config.sections()))
1090
792
    if not clients:
1091
 
        logger.warning(u"No clients defined")
 
793
        logger.critical(u"No clients defined")
 
794
        sys.exit(1)
1092
795
    
1093
796
    if debug:
1094
797
        # Redirect stdin so all checkers get /dev/null
1102
805
        # Close all input and output, do double fork, etc.
1103
806
        daemon()
1104
807
    
 
808
    pidfilename = "/var/run/mandos/mandos.pid"
 
809
    pid = os.getpid()
1105
810
    try:
1106
 
        pid = os.getpid()
 
811
        pidfile = open(pidfilename, "w")
1107
812
        pidfile.write(str(pid) + "\n")
1108
813
        pidfile.close()
1109
814
        del pidfile
1110
 
    except IOError:
1111
 
        logger.error(u"Could not write to file %r with PID %d",
1112
 
                     pidfilename, pid)
1113
 
    except NameError:
1114
 
        # "pidfile" was never created
1115
 
        pass
1116
 
    del pidfilename
 
815
    except IOError, err:
 
816
        logger.error(u"Could not write %s file with PID %d",
 
817
                     pidfilename, os.getpid())
1117
818
    
1118
819
    def cleanup():
1119
820
        "Cleanup function; run on exit"
1126
827
        
1127
828
        while clients:
1128
829
            client = clients.pop()
1129
 
            client.disable_hook = None
1130
 
            client.disable()
 
830
            client.stop_hook = None
 
831
            client.stop()
1131
832
    
1132
833
    atexit.register(cleanup)
1133
834
    
1136
837
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1137
838
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1138
839
    
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
 
    
1187
840
    for client in clients:
1188
 
        if use_dbus:
1189
 
            # Emit D-Bus signal
1190
 
            mandos_server.ClientAdded(client.dbus_object_path,
1191
 
                                      client.GetAllProperties())
1192
 
        client.enable()
1193
 
    
1194
 
    tcp_server.enable()
1195
 
    tcp_server.server_activate()
1196
 
    
 
841
        client.start()
 
842
    
 
843
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
844
                                 server_settings["port"]),
 
845
                                tcp_handler,
 
846
                                settings=server_settings,
 
847
                                clients=clients)
1197
848
    # Find out what port we got
1198
849
    service.port = tcp_server.socket.getsockname()[1]
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())
 
850
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
851
                u" scope_id %d" % tcp_server.socket.getsockname())
1206
852
    
1207
853
    #service.interface = tcp_server.socket.getsockname()[3]
1208
854
    
1218
864
        
1219
865
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1220
866
                             lambda *args, **kwargs:
1221
 
                             (tcp_server.handle_request
1222
 
                              (*args[2:], **kwargs) or True))
 
867
                             tcp_server.handle_request\
 
868
                             (*args[2:], **kwargs) or True)
1223
869
        
1224
870
        logger.debug(u"Starting main loop")
 
871
        main_loop_started = True
1225
872
        main_loop.run()
1226
873
    except AvahiError, error:
1227
 
        logger.critical(u"AvahiError: %s", error)
 
874
        logger.critical(u"AvahiError: %s" + unicode(error))
1228
875
        sys.exit(1)
1229
876
    except KeyboardInterrupt:
1230
877
        if debug:
1231
 
            print >> sys.stderr
1232
 
        logger.debug("Server received KeyboardInterrupt")
1233
 
    logger.debug("Server exiting")
 
878
            print
1234
879
 
1235
880
if __name__ == '__main__':
1236
881
    main()