/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

tally count of used symbols
return codes from functions checked.

Show diffs side-by-side

added added

removed removed

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