/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-12 19:22:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080812192234-8bm17713ltih9ud1
* initramfs-tools-hook: New.
* initramfs-tools-hook-conf: New.

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