/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* plugin-runner.c (main): If debugging, print name of failed plugins.

Show diffs side-by-side

added added

removed removed

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