/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: 2009-01-31 10:33:17 UTC
  • mfrom: (24.1.129 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090131103317-wzqvyr532sjcjt7u
Merge from Björn:

* mandos-ctl: New option "--remove-client".  Only default to listing
              clients if no clients were given on the command line.
* plugins.d/mandos-client.c: Lower kernel log level while bringing up
                             network interface.  New option "--delay"
                             to control the maximum delay to wait for
                             running interface.
* plugins.d/mandos-client.xml (SYNOPSIS, OPTIONS): New option
                                                   "--delay".

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