/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-09-30 07:23:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080930072339-jn15gyrtfpdk2dhx
* .bzrignore: Added "man" directory (created by "make install-html").

* Makefile: Add "common.ent" dependency to all manual pages.
  (htmldir, version, SED): New variables.
  (CFLAGS): Add -D option to define VERSION to $(version).
  (MANPOST, HTMLPOST): Use $(SED).
  (PROGS): Use $(CPROGS)
  (CPROGS): New; C-only programs.
  (objects): Use $(CPROGS).
  (common.ent, mandos, mandos-keygen): New targets; update version
                                       number to $(version).
  (clean): Use $(CPROGS).
  (check): Depend on "all".
  (install-html): Install to $(htmldir).

* common.ent: New file with "version" entity.

* mandos-clients.conf.xml: Use "common.ent".
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.xml: - '' -

* plugin-runner.c (argp_program_version): Use VERSION.
* plugins.d/mandos-client.c (argp_program_version): - '' -
* plugins.d/password-prompt.c (argp_program_version): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
16
15
# 
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
31
30
# Contact the authors at <mandos@fukt.bsnet.se>.
32
31
# 
33
32
 
34
 
from __future__ import division, with_statement, absolute_import
 
33
from __future__ import division
35
34
 
36
35
import SocketServer
37
36
import socket
38
 
import optparse
 
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
 
from contextlib import closing
60
58
 
61
59
import dbus
62
 
import dbus.service
63
60
import gobject
64
61
import avahi
65
62
from dbus.mainloop.glib import DBusGMainLoop
66
63
import ctypes
67
64
import ctypes.util
68
65
 
69
 
version = "1.0.8"
 
66
version = "1.0"
70
67
 
71
68
logger = logging.Logger('mandos')
72
 
syslogger = (logging.handlers.SysLogHandler
73
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
 
              address = "/dev/log"))
75
 
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos [%(process)d]: %(levelname)s:'
77
 
                        ' %(message)s'))
 
69
syslogger = logging.handlers.SysLogHandler\
 
70
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
71
             address = "/dev/log")
 
72
syslogger.setFormatter(logging.Formatter\
 
73
                        ('Mandos: %(levelname)s: %(message)s'))
78
74
logger.addHandler(syslogger)
79
75
 
80
76
console = logging.StreamHandler()
81
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
 
                                       ' %(levelname)s: %(message)s'))
 
77
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
78
                                       ' %(message)s'))
83
79
logger.addHandler(console)
84
80
 
85
81
class AvahiError(Exception):
86
 
    def __init__(self, value, *args, **kwargs):
 
82
    def __init__(self, value):
87
83
        self.value = value
88
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
89
 
    def __unicode__(self):
90
 
        return unicode(repr(self.value))
 
84
        super(AvahiError, self).__init__()
 
85
    def __str__(self):
 
86
        return repr(self.value)
91
87
 
92
88
class AvahiServiceError(AvahiError):
93
89
    pass
113
109
                  a sensible number of times
114
110
    """
115
111
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
 
                 servicetype = None, port = None, TXT = None,
117
 
                 domain = "", host = "", max_renames = 32768,
118
 
                 protocol = avahi.PROTO_UNSPEC):
 
112
                 servicetype = None, port = None, TXT = None, domain = "",
 
113
                 host = "", max_renames = 32768):
119
114
        self.interface = interface
120
115
        self.name = name
121
116
        self.type = servicetype
122
117
        self.port = port
123
 
        self.TXT = TXT if TXT is not None else []
 
118
        if TXT is None:
 
119
            self.TXT = []
 
120
        else:
 
121
            self.TXT = TXT
124
122
        self.domain = domain
125
123
        self.host = host
126
124
        self.rename_count = 0
127
125
        self.max_renames = max_renames
128
 
        self.protocol = protocol
129
126
    def rename(self):
130
127
        """Derived from the Avahi example code"""
131
128
        if self.rename_count >= self.max_renames:
132
129
            logger.critical(u"No suitable Zeroconf service name found"
133
130
                            u" after %i retries, exiting.",
134
131
                            self.rename_count)
135
 
            raise AvahiServiceError(u"Too many renames")
 
132
            raise AvahiServiceError("Too many renames")
136
133
        self.name = server.GetAlternativeServiceName(self.name)
137
134
        logger.info(u"Changing Zeroconf service name to %r ...",
138
135
                    str(self.name))
139
 
        syslogger.setFormatter(logging.Formatter
140
 
                               ('Mandos (%s) [%%(process)d]:'
141
 
                                ' %%(levelname)s: %%(message)s'
142
 
                                % self.name))
 
136
        syslogger.setFormatter(logging.Formatter\
 
137
                               ('Mandos (%s): %%(levelname)s:'
 
138
                               ' %%(message)s' % self.name))
143
139
        self.remove()
144
140
        self.add()
145
141
        self.rename_count += 1
151
147
        """Derived from the Avahi example code"""
152
148
        global group
153
149
        if group is None:
154
 
            group = dbus.Interface(bus.get_object
155
 
                                   (avahi.DBUS_NAME,
 
150
            group = dbus.Interface\
 
151
                    (bus.get_object(avahi.DBUS_NAME,
156
152
                                    server.EntryGroupNew()),
157
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
158
154
            group.connect_to_signal('StateChanged',
159
155
                                    entry_group_state_changed)
160
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
161
157
                     service.name, service.type)
162
158
        group.AddService(
163
159
                self.interface,         # interface
164
 
                self.protocol,          # protocol
 
160
                avahi.PROTO_INET6,      # protocol
165
161
                dbus.UInt32(0),         # flags
166
162
                self.name, self.type,
167
163
                self.domain, self.host,
174
170
# End of Avahi example code
175
171
 
176
172
 
177
 
def _datetime_to_dbus(dt, variant_level=0):
178
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
179
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
180
 
 
181
 
 
182
173
class Client(object):
183
174
    """A representation of a client host served by this server.
184
175
    Attributes:
185
 
    name:       string; from the config file, used in log messages and
186
 
                        D-Bus identifiers
 
176
    name:      string; from the config file, used in log messages
187
177
    fingerprint: string (40 or 32 hexadecimal digits); used to
188
178
                 uniquely identify the client
189
 
    secret:     bytestring; sent verbatim (over TLS) to client
190
 
    host:       string; available for use by the checker command
191
 
    created:    datetime.datetime(); (UTC) object creation
192
 
    last_enabled: datetime.datetime(); (UTC)
193
 
    enabled:    bool()
194
 
    last_checked_ok: datetime.datetime(); (UTC) or None
195
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
196
 
                                      until this client is invalid
197
 
    interval:   datetime.timedelta(); How often to start a new checker
198
 
    disable_hook:  If set, called by disable() as disable_hook(self)
199
 
    checker:    subprocess.Popen(); a running checker process used
200
 
                                    to see if the client lives.
201
 
                                    'None' if no process is running.
 
179
    secret:    bytestring; sent verbatim (over TLS) to client
 
180
    host:      string; available for use by the checker command
 
181
    created:   datetime.datetime(); object creation, not client host
 
182
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
183
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
184
                                     until this client is invalid
 
185
    interval:  datetime.timedelta(); How often to start a new checker
 
186
    stop_hook: If set, called by stop() as stop_hook(self)
 
187
    checker:   subprocess.Popen(); a running checker process used
 
188
                                   to see if the client lives.
 
189
                                   'None' if no process is running.
202
190
    checker_initiator_tag: a gobject event source tag, or None
203
 
    disable_initiator_tag:    - '' -
 
191
    stop_initiator_tag:    - '' -
204
192
    checker_callback_tag:  - '' -
205
193
    checker_command: string; External command which is run to check if
206
194
                     client lives.  %() expansions are done at
207
195
                     runtime with vars(self) as dict, so that for
208
196
                     instance %(name)s can be used in the command.
209
 
    current_checker_command: string; current running checker_command
 
197
    Private attibutes:
 
198
    _timeout: Real variable for 'timeout'
 
199
    _interval: Real variable for 'interval'
 
200
    _timeout_milliseconds: Used when calling gobject.timeout_add()
 
201
    _interval_milliseconds: - '' -
210
202
    """
211
 
    def timeout_milliseconds(self):
212
 
        "Return the 'timeout' attribute in milliseconds"
213
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
214
 
                + (self.timeout.seconds * 1000)
215
 
                + (self.timeout.microseconds // 1000))
216
 
    
217
 
    def interval_milliseconds(self):
218
 
        "Return the 'interval' attribute in milliseconds"
219
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
220
 
                + (self.interval.seconds * 1000)
221
 
                + (self.interval.microseconds // 1000))
222
 
    
223
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
203
    def _set_timeout(self, timeout):
 
204
        "Setter function for 'timeout' attribute"
 
205
        self._timeout = timeout
 
206
        self._timeout_milliseconds = ((self.timeout.days
 
207
                                       * 24 * 60 * 60 * 1000)
 
208
                                      + (self.timeout.seconds * 1000)
 
209
                                      + (self.timeout.microseconds
 
210
                                         // 1000))
 
211
    timeout = property(lambda self: self._timeout,
 
212
                       _set_timeout)
 
213
    del _set_timeout
 
214
    def _set_interval(self, interval):
 
215
        "Setter function for 'interval' attribute"
 
216
        self._interval = interval
 
217
        self._interval_milliseconds = ((self.interval.days
 
218
                                        * 24 * 60 * 60 * 1000)
 
219
                                       + (self.interval.seconds
 
220
                                          * 1000)
 
221
                                       + (self.interval.microseconds
 
222
                                          // 1000))
 
223
    interval = property(lambda self: self._interval,
 
224
                        _set_interval)
 
225
    del _set_interval
 
226
    def __init__(self, name = None, stop_hook=None, config=None):
224
227
        """Note: the 'checker' key in 'config' sets the
225
228
        'checker_command' attribute and *not* the 'checker'
226
229
        attribute."""
227
 
        self.name = name
228
230
        if config is None:
229
231
            config = {}
 
232
        self.name = name
230
233
        logger.debug(u"Creating client %r", self.name)
231
234
        # Uppercase and remove spaces from fingerprint for later
232
235
        # comparison purposes with return value from the fingerprint()
233
236
        # function
234
 
        self.fingerprint = (config["fingerprint"].upper()
235
 
                            .replace(u" ", u""))
 
237
        self.fingerprint = config["fingerprint"].upper()\
 
238
                           .replace(u" ", u"")
236
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
237
240
        if "secret" in config:
238
241
            self.secret = config["secret"].decode(u"base64")
239
242
        elif "secfile" in config:
240
 
            with closing(open(os.path.expanduser
241
 
                              (os.path.expandvars
242
 
                               (config["secfile"])))) as secfile:
243
 
                self.secret = secfile.read()
 
243
            secfile = open(config["secfile"])
 
244
            self.secret = secfile.read()
 
245
            secfile.close()
244
246
        else:
245
247
            raise TypeError(u"No secret or secfile for client %s"
246
248
                            % self.name)
247
249
        self.host = config.get("host", "")
248
 
        self.created = datetime.datetime.utcnow()
249
 
        self.enabled = False
250
 
        self.last_enabled = None
 
250
        self.created = datetime.datetime.now()
251
251
        self.last_checked_ok = None
252
252
        self.timeout = string_to_delta(config["timeout"])
253
253
        self.interval = string_to_delta(config["interval"])
254
 
        self.disable_hook = disable_hook
 
254
        self.stop_hook = stop_hook
255
255
        self.checker = None
256
256
        self.checker_initiator_tag = None
257
 
        self.disable_initiator_tag = None
 
257
        self.stop_initiator_tag = None
258
258
        self.checker_callback_tag = None
259
 
        self.checker_command = config["checker"]
260
 
        self.current_checker_command = None
261
 
        self.last_connect = None
262
 
    
263
 
    def enable(self):
 
259
        self.check_command = config["checker"]
 
260
    def start(self):
264
261
        """Start this client's checker and timeout hooks"""
265
 
        self.last_enabled = datetime.datetime.utcnow()
266
262
        # Schedule a new checker to be started an 'interval' from now,
267
263
        # and every interval from then on.
268
 
        self.checker_initiator_tag = (gobject.timeout_add
269
 
                                      (self.interval_milliseconds(),
270
 
                                       self.start_checker))
 
264
        self.checker_initiator_tag = gobject.timeout_add\
 
265
                                     (self._interval_milliseconds,
 
266
                                      self.start_checker)
271
267
        # Also start a new checker *right now*.
272
268
        self.start_checker()
273
 
        # Schedule a disable() when 'timeout' has passed
274
 
        self.disable_initiator_tag = (gobject.timeout_add
275
 
                                   (self.timeout_milliseconds(),
276
 
                                    self.disable))
277
 
        self.enabled = True
278
 
    
279
 
    def disable(self):
280
 
        """Disable this client."""
281
 
        if not getattr(self, "enabled", False):
 
269
        # Schedule a stop() when 'timeout' has passed
 
270
        self.stop_initiator_tag = gobject.timeout_add\
 
271
                                  (self._timeout_milliseconds,
 
272
                                   self.stop)
 
273
    def stop(self):
 
274
        """Stop this client.
 
275
        The possibility that a client might be restarted is left open,
 
276
        but not currently used."""
 
277
        # If this client doesn't have a secret, it is already stopped.
 
278
        if hasattr(self, "secret") and self.secret:
 
279
            logger.info(u"Stopping client %s", self.name)
 
280
            self.secret = None
 
281
        else:
282
282
            return False
283
 
        logger.info(u"Disabling client %s", self.name)
284
 
        if getattr(self, "disable_initiator_tag", False):
285
 
            gobject.source_remove(self.disable_initiator_tag)
286
 
            self.disable_initiator_tag = None
 
283
        if getattr(self, "stop_initiator_tag", False):
 
284
            gobject.source_remove(self.stop_initiator_tag)
 
285
            self.stop_initiator_tag = None
287
286
        if getattr(self, "checker_initiator_tag", False):
288
287
            gobject.source_remove(self.checker_initiator_tag)
289
288
            self.checker_initiator_tag = None
290
289
        self.stop_checker()
291
 
        if self.disable_hook:
292
 
            self.disable_hook(self)
293
 
        self.enabled = False
 
290
        if self.stop_hook:
 
291
            self.stop_hook(self)
294
292
        # Do not run this again if called by a gobject.timeout_add
295
293
        return False
296
 
    
297
294
    def __del__(self):
298
 
        self.disable_hook = None
299
 
        self.disable()
300
 
    
301
 
    def checker_callback(self, pid, condition, command):
 
295
        self.stop_hook = None
 
296
        self.stop()
 
297
    def checker_callback(self, pid, condition):
302
298
        """The checker has completed, so take appropriate actions."""
 
299
        now = datetime.datetime.now()
303
300
        self.checker_callback_tag = None
304
301
        self.checker = None
305
 
        if os.WIFEXITED(condition):
306
 
            exitstatus = os.WEXITSTATUS(condition)
307
 
            if exitstatus == 0:
308
 
                logger.info(u"Checker for %(name)s succeeded",
309
 
                            vars(self))
310
 
                self.checked_ok()
311
 
            else:
312
 
                logger.info(u"Checker for %(name)s failed",
313
 
                            vars(self))
314
 
        else:
 
302
        if os.WIFEXITED(condition) \
 
303
               and (os.WEXITSTATUS(condition) == 0):
 
304
            logger.info(u"Checker for %(name)s succeeded",
 
305
                        vars(self))
 
306
            self.last_checked_ok = now
 
307
            gobject.source_remove(self.stop_initiator_tag)
 
308
            self.stop_initiator_tag = gobject.timeout_add\
 
309
                                      (self._timeout_milliseconds,
 
310
                                       self.stop)
 
311
        elif not os.WIFEXITED(condition):
315
312
            logger.warning(u"Checker for %(name)s crashed?",
316
313
                           vars(self))
317
 
    
318
 
    def checked_ok(self):
319
 
        """Bump up the timeout for this client.
320
 
        This should only be called when the client has been seen,
321
 
        alive and well.
322
 
        """
323
 
        self.last_checked_ok = datetime.datetime.utcnow()
324
 
        gobject.source_remove(self.disable_initiator_tag)
325
 
        self.disable_initiator_tag = (gobject.timeout_add
326
 
                                      (self.timeout_milliseconds(),
327
 
                                       self.disable))
328
 
    
 
314
        else:
 
315
            logger.info(u"Checker for %(name)s failed",
 
316
                        vars(self))
329
317
    def start_checker(self):
330
318
        """Start a new checker subprocess if one is not running.
331
319
        If a checker already exists, leave it running and do
338
326
        # checkers alone, the checker would have to take more time
339
327
        # than 'timeout' for the client to be declared invalid, which
340
328
        # is as it should be.
341
 
        
342
 
        # If a checker exists, make sure it is not a zombie
343
 
        if self.checker is not None:
344
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
345
 
            if pid:
346
 
                logger.warning("Checker was a zombie")
347
 
                gobject.source_remove(self.checker_callback_tag)
348
 
                self.checker_callback(pid, status,
349
 
                                      self.current_checker_command)
350
 
        # Start a new checker if needed
351
329
        if self.checker is None:
352
330
            try:
353
 
                # In case checker_command has exactly one % operator
354
 
                command = self.checker_command % self.host
 
331
                # In case check_command has exactly one % operator
 
332
                command = self.check_command % self.host
355
333
            except TypeError:
356
334
                # Escape attributes for the shell
357
335
                escaped_attrs = dict((key, re.escape(str(val)))
358
336
                                     for key, val in
359
337
                                     vars(self).iteritems())
360
338
                try:
361
 
                    command = self.checker_command % escaped_attrs
 
339
                    command = self.check_command % escaped_attrs
362
340
                except TypeError, error:
363
341
                    logger.error(u'Could not format string "%s":'
364
 
                                 u' %s', self.checker_command, error)
 
342
                                 u' %s', self.check_command, error)
365
343
                    return True # Try again later
366
 
            self.current_checker_command = command
367
344
            try:
368
345
                logger.info(u"Starting checker %r for %s",
369
346
                            command, self.name)
374
351
                self.checker = subprocess.Popen(command,
375
352
                                                close_fds=True,
376
353
                                                shell=True, cwd="/")
377
 
                self.checker_callback_tag = (gobject.child_watch_add
378
 
                                             (self.checker.pid,
379
 
                                              self.checker_callback,
380
 
                                              data=command))
381
 
                # The checker may have completed before the gobject
382
 
                # watch was added.  Check for this.
383
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
384
 
                if pid:
385
 
                    gobject.source_remove(self.checker_callback_tag)
386
 
                    self.checker_callback(pid, status, command)
 
354
                self.checker_callback_tag = gobject.child_watch_add\
 
355
                                            (self.checker.pid,
 
356
                                             self.checker_callback)
387
357
            except OSError, error:
388
358
                logger.error(u"Failed to start subprocess: %s",
389
359
                             error)
390
360
        # Re-run this periodically if run by gobject.timeout_add
391
361
        return True
392
 
    
393
362
    def stop_checker(self):
394
363
        """Force the checker process, if any, to stop."""
395
364
        if self.checker_callback_tag:
407
376
            if error.errno != errno.ESRCH: # No such process
408
377
                raise
409
378
        self.checker = None
410
 
    
411
379
    def still_valid(self):
412
380
        """Has the timeout not yet passed for this client?"""
413
 
        if not getattr(self, "enabled", False):
414
 
            return False
415
 
        now = datetime.datetime.utcnow()
 
381
        now = datetime.datetime.now()
416
382
        if self.last_checked_ok is None:
417
383
            return now < (self.created + self.timeout)
418
384
        else:
419
385
            return now < (self.last_checked_ok + self.timeout)
420
386
 
421
387
 
422
 
class ClientDBus(Client, dbus.service.Object):
423
 
    """A Client class using D-Bus
424
 
    Attributes:
425
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
426
 
    """
427
 
    # dbus.service.Object doesn't use super(), so we can't either.
428
 
    
429
 
    def __init__(self, *args, **kwargs):
430
 
        Client.__init__(self, *args, **kwargs)
431
 
        # Only now, when this client is initialized, can it show up on
432
 
        # the D-Bus
433
 
        self.dbus_object_path = (dbus.ObjectPath
434
 
                                 ("/clients/"
435
 
                                  + self.name.replace(".", "_")))
436
 
        dbus.service.Object.__init__(self, bus,
437
 
                                     self.dbus_object_path)
438
 
    def enable(self):
439
 
        oldstate = getattr(self, "enabled", False)
440
 
        r = Client.enable(self)
441
 
        if oldstate != self.enabled:
442
 
            # Emit D-Bus signals
443
 
            self.PropertyChanged(dbus.String(u"enabled"),
444
 
                                 dbus.Boolean(True, variant_level=1))
445
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
446
 
                                 (_datetime_to_dbus(self.last_enabled,
447
 
                                                    variant_level=1)))
448
 
        return r
449
 
    
450
 
    def disable(self, signal = True):
451
 
        oldstate = getattr(self, "enabled", False)
452
 
        r = Client.disable(self)
453
 
        if signal and oldstate != self.enabled:
454
 
            # Emit D-Bus signal
455
 
            self.PropertyChanged(dbus.String(u"enabled"),
456
 
                                 dbus.Boolean(False, variant_level=1))
457
 
        return r
458
 
    
459
 
    def __del__(self, *args, **kwargs):
460
 
        try:
461
 
            self.remove_from_connection()
462
 
        except LookupError:
463
 
            pass
464
 
        if hasattr(dbus.service.Object, "__del__"):
465
 
            dbus.service.Object.__del__(self, *args, **kwargs)
466
 
        Client.__del__(self, *args, **kwargs)
467
 
    
468
 
    def checker_callback(self, pid, condition, command,
469
 
                         *args, **kwargs):
470
 
        self.checker_callback_tag = None
471
 
        self.checker = None
472
 
        # Emit D-Bus signal
473
 
        self.PropertyChanged(dbus.String(u"checker_running"),
474
 
                             dbus.Boolean(False, variant_level=1))
475
 
        if os.WIFEXITED(condition):
476
 
            exitstatus = os.WEXITSTATUS(condition)
477
 
            # Emit D-Bus signal
478
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
479
 
                                  dbus.Int64(condition),
480
 
                                  dbus.String(command))
481
 
        else:
482
 
            # Emit D-Bus signal
483
 
            self.CheckerCompleted(dbus.Int16(-1),
484
 
                                  dbus.Int64(condition),
485
 
                                  dbus.String(command))
486
 
        
487
 
        return Client.checker_callback(self, pid, condition, command,
488
 
                                       *args, **kwargs)
489
 
    
490
 
    def checked_ok(self, *args, **kwargs):
491
 
        r = Client.checked_ok(self, *args, **kwargs)
492
 
        # Emit D-Bus signal
493
 
        self.PropertyChanged(
494
 
            dbus.String(u"last_checked_ok"),
495
 
            (_datetime_to_dbus(self.last_checked_ok,
496
 
                               variant_level=1)))
497
 
        return r
498
 
    
499
 
    def start_checker(self, *args, **kwargs):
500
 
        old_checker = self.checker
501
 
        if self.checker is not None:
502
 
            old_checker_pid = self.checker.pid
503
 
        else:
504
 
            old_checker_pid = None
505
 
        r = Client.start_checker(self, *args, **kwargs)
506
 
        # Only if new checker process was started
507
 
        if (self.checker is not None
508
 
            and old_checker_pid != self.checker.pid):
509
 
            # Emit D-Bus signal
510
 
            self.CheckerStarted(self.current_checker_command)
511
 
            self.PropertyChanged(
512
 
                dbus.String("checker_running"),
513
 
                dbus.Boolean(True, variant_level=1))
514
 
        return r
515
 
    
516
 
    def stop_checker(self, *args, **kwargs):
517
 
        old_checker = getattr(self, "checker", None)
518
 
        r = Client.stop_checker(self, *args, **kwargs)
519
 
        if (old_checker is not None
520
 
            and getattr(self, "checker", None) is None):
521
 
            self.PropertyChanged(dbus.String(u"checker_running"),
522
 
                                 dbus.Boolean(False, variant_level=1))
523
 
        return r
524
 
    
525
 
    ## D-Bus methods & signals
526
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
527
 
    
528
 
    # CheckedOK - method
529
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
530
 
    CheckedOK.__name__ = "CheckedOK"
531
 
    
532
 
    # CheckerCompleted - signal
533
 
    @dbus.service.signal(_interface, signature="nxs")
534
 
    def CheckerCompleted(self, exitcode, waitstatus, command):
535
 
        "D-Bus signal"
536
 
        pass
537
 
    
538
 
    # CheckerStarted - signal
539
 
    @dbus.service.signal(_interface, signature="s")
540
 
    def CheckerStarted(self, command):
541
 
        "D-Bus signal"
542
 
        pass
543
 
    
544
 
    # GetAllProperties - method
545
 
    @dbus.service.method(_interface, out_signature="a{sv}")
546
 
    def GetAllProperties(self):
547
 
        "D-Bus method"
548
 
        return dbus.Dictionary({
549
 
                dbus.String("name"):
550
 
                    dbus.String(self.name, variant_level=1),
551
 
                dbus.String("fingerprint"):
552
 
                    dbus.String(self.fingerprint, variant_level=1),
553
 
                dbus.String("host"):
554
 
                    dbus.String(self.host, variant_level=1),
555
 
                dbus.String("created"):
556
 
                    _datetime_to_dbus(self.created, variant_level=1),
557
 
                dbus.String("last_enabled"):
558
 
                    (_datetime_to_dbus(self.last_enabled,
559
 
                                       variant_level=1)
560
 
                     if self.last_enabled is not None
561
 
                     else dbus.Boolean(False, variant_level=1)),
562
 
                dbus.String("enabled"):
563
 
                    dbus.Boolean(self.enabled, variant_level=1),
564
 
                dbus.String("last_checked_ok"):
565
 
                    (_datetime_to_dbus(self.last_checked_ok,
566
 
                                       variant_level=1)
567
 
                     if self.last_checked_ok is not None
568
 
                     else dbus.Boolean (False, variant_level=1)),
569
 
                dbus.String("timeout"):
570
 
                    dbus.UInt64(self.timeout_milliseconds(),
571
 
                                variant_level=1),
572
 
                dbus.String("interval"):
573
 
                    dbus.UInt64(self.interval_milliseconds(),
574
 
                                variant_level=1),
575
 
                dbus.String("checker"):
576
 
                    dbus.String(self.checker_command,
577
 
                                variant_level=1),
578
 
                dbus.String("checker_running"):
579
 
                    dbus.Boolean(self.checker is not None,
580
 
                                 variant_level=1),
581
 
                dbus.String("object_path"):
582
 
                    dbus.ObjectPath(self.dbus_object_path,
583
 
                                    variant_level=1)
584
 
                }, signature="sv")
585
 
    
586
 
    # IsStillValid - method
587
 
    @dbus.service.method(_interface, out_signature="b")
588
 
    def IsStillValid(self):
589
 
        return self.still_valid()
590
 
    
591
 
    # PropertyChanged - signal
592
 
    @dbus.service.signal(_interface, signature="sv")
593
 
    def PropertyChanged(self, property, value):
594
 
        "D-Bus signal"
595
 
        pass
596
 
    
597
 
    # ReceivedSecret - signal
598
 
    @dbus.service.signal(_interface)
599
 
    def ReceivedSecret(self):
600
 
        "D-Bus signal"
601
 
        pass
602
 
    
603
 
    # Rejected - signal
604
 
    @dbus.service.signal(_interface)
605
 
    def Rejected(self):
606
 
        "D-Bus signal"
607
 
        pass
608
 
    
609
 
    # SetChecker - method
610
 
    @dbus.service.method(_interface, in_signature="s")
611
 
    def SetChecker(self, checker):
612
 
        "D-Bus setter method"
613
 
        self.checker_command = checker
614
 
        # Emit D-Bus signal
615
 
        self.PropertyChanged(dbus.String(u"checker"),
616
 
                             dbus.String(self.checker_command,
617
 
                                         variant_level=1))
618
 
    
619
 
    # SetHost - method
620
 
    @dbus.service.method(_interface, in_signature="s")
621
 
    def SetHost(self, host):
622
 
        "D-Bus setter method"
623
 
        self.host = host
624
 
        # Emit D-Bus signal
625
 
        self.PropertyChanged(dbus.String(u"host"),
626
 
                             dbus.String(self.host, variant_level=1))
627
 
    
628
 
    # SetInterval - method
629
 
    @dbus.service.method(_interface, in_signature="t")
630
 
    def SetInterval(self, milliseconds):
631
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
632
 
        # Emit D-Bus signal
633
 
        self.PropertyChanged(dbus.String(u"interval"),
634
 
                             (dbus.UInt64(self.interval_milliseconds(),
635
 
                                          variant_level=1)))
636
 
    
637
 
    # SetSecret - method
638
 
    @dbus.service.method(_interface, in_signature="ay",
639
 
                         byte_arrays=True)
640
 
    def SetSecret(self, secret):
641
 
        "D-Bus setter method"
642
 
        self.secret = str(secret)
643
 
    
644
 
    # SetTimeout - method
645
 
    @dbus.service.method(_interface, in_signature="t")
646
 
    def SetTimeout(self, milliseconds):
647
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
648
 
        # Emit D-Bus signal
649
 
        self.PropertyChanged(dbus.String(u"timeout"),
650
 
                             (dbus.UInt64(self.timeout_milliseconds(),
651
 
                                          variant_level=1)))
652
 
    
653
 
    # Enable - method
654
 
    Enable = dbus.service.method(_interface)(enable)
655
 
    Enable.__name__ = "Enable"
656
 
    
657
 
    # StartChecker - method
658
 
    @dbus.service.method(_interface)
659
 
    def StartChecker(self):
660
 
        "D-Bus method"
661
 
        self.start_checker()
662
 
    
663
 
    # Disable - method
664
 
    @dbus.service.method(_interface)
665
 
    def Disable(self):
666
 
        "D-Bus method"
667
 
        self.disable()
668
 
    
669
 
    # StopChecker - method
670
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
671
 
    StopChecker.__name__ = "StopChecker"
672
 
    
673
 
    del _interface
674
 
 
675
 
 
676
388
def peer_certificate(session):
677
389
    "Return the peer's OpenPGP certificate as a bytestring"
678
390
    # If not an OpenPGP certificate...
679
 
    if (gnutls.library.functions
680
 
        .gnutls_certificate_type_get(session._c_object)
681
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
391
    if gnutls.library.functions.gnutls_certificate_type_get\
 
392
            (session._c_object) \
 
393
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
682
394
        # ...do the normal thing
683
395
        return session.peer_certificate
684
 
    list_size = ctypes.c_uint(1)
685
 
    cert_list = (gnutls.library.functions
686
 
                 .gnutls_certificate_get_peers
687
 
                 (session._c_object, ctypes.byref(list_size)))
688
 
    if not bool(cert_list) and list_size.value != 0:
689
 
        raise gnutls.errors.GNUTLSError("error getting peer"
690
 
                                        " certificate")
 
396
    list_size = ctypes.c_uint()
 
397
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
398
        (session._c_object, ctypes.byref(list_size))
691
399
    if list_size.value == 0:
692
400
        return None
693
401
    cert = cert_list[0]
697
405
def fingerprint(openpgp):
698
406
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
699
407
    # New GnuTLS "datum" with the OpenPGP public key
700
 
    datum = (gnutls.library.types
701
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
702
 
                                         ctypes.POINTER
703
 
                                         (ctypes.c_ubyte)),
704
 
                             ctypes.c_uint(len(openpgp))))
 
408
    datum = gnutls.library.types.gnutls_datum_t\
 
409
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
410
                     ctypes.POINTER(ctypes.c_ubyte)),
 
411
         ctypes.c_uint(len(openpgp)))
705
412
    # New empty GnuTLS certificate
706
413
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
707
 
    (gnutls.library.functions
708
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
414
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
415
        (ctypes.byref(crt))
709
416
    # Import the OpenPGP public key into the certificate
710
 
    (gnutls.library.functions
711
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
712
 
                                gnutls.library.constants
713
 
                                .GNUTLS_OPENPGP_FMT_RAW))
 
417
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
418
                    (crt, ctypes.byref(datum),
 
419
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
714
420
    # Verify the self signature in the key
715
421
    crtverify = ctypes.c_uint()
716
 
    (gnutls.library.functions
717
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
422
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
423
        (crt, 0, ctypes.byref(crtverify))
718
424
    if crtverify.value != 0:
719
425
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
720
426
        raise gnutls.errors.CertificateSecurityError("Verify failed")
722
428
    buf = ctypes.create_string_buffer(20)
723
429
    buf_len = ctypes.c_size_t()
724
430
    # Get the fingerprint from the certificate into the buffer
725
 
    (gnutls.library.functions
726
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
727
 
                                         ctypes.byref(buf_len)))
 
431
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
432
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
728
433
    # Deinit the certificate
729
434
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
730
435
    # Convert the buffer to a Python bytestring
741
446
    
742
447
    def handle(self):
743
448
        logger.info(u"TCP connection from: %s",
744
 
                    unicode(self.client_address))
745
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
746
 
        # Open IPC pipe to parent process
747
 
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
748
 
            session = (gnutls.connection
749
 
                       .ClientSession(self.request,
750
 
                                      gnutls.connection
751
 
                                      .X509Credentials()))
752
 
            
753
 
            line = self.request.makefile().readline()
754
 
            logger.debug(u"Protocol version: %r", line)
755
 
            try:
756
 
                if int(line.strip().split()[0]) > 1:
757
 
                    raise RuntimeError
758
 
            except (ValueError, IndexError, RuntimeError), error:
759
 
                logger.error(u"Unknown protocol version: %s", error)
760
 
                return
761
 
            
762
 
            # Note: gnutls.connection.X509Credentials is really a
763
 
            # generic GnuTLS certificate credentials object so long as
764
 
            # no X.509 keys are added to it.  Therefore, we can use it
765
 
            # here despite using OpenPGP certificates.
766
 
            
767
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
768
 
            #                     "+AES-256-CBC", "+SHA1",
769
 
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
770
 
            #                     "+DHE-DSS"))
771
 
            # Use a fallback default, since this MUST be set.
772
 
            priority = self.server.settings.get("priority", "NORMAL")
773
 
            (gnutls.library.functions
774
 
             .gnutls_priority_set_direct(session._c_object,
775
 
                                         priority, None))
776
 
            
777
 
            try:
778
 
                session.handshake()
779
 
            except gnutls.errors.GNUTLSError, error:
780
 
                logger.warning(u"Handshake failed: %s", error)
781
 
                # Do not run session.bye() here: the session is not
782
 
                # established.  Just abandon the request.
783
 
                return
784
 
            logger.debug(u"Handshake succeeded")
785
 
            try:
786
 
                fpr = fingerprint(peer_certificate(session))
787
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
788
 
                logger.warning(u"Bad certificate: %s", error)
789
 
                session.bye()
790
 
                return
791
 
            logger.debug(u"Fingerprint: %s", fpr)
792
 
            
793
 
            for c in self.server.clients:
794
 
                if c.fingerprint == fpr:
795
 
                    client = c
796
 
                    break
797
 
            else:
798
 
                logger.warning(u"Client not found for fingerprint: %s",
799
 
                               fpr)
800
 
                ipc.write("NOTFOUND %s\n" % fpr)
801
 
                session.bye()
802
 
                return
803
 
            # Have to check if client.still_valid(), since it is
804
 
            # possible that the client timed out while establishing
805
 
            # the GnuTLS session.
806
 
            if not client.still_valid():
807
 
                logger.warning(u"Client %(name)s is invalid",
808
 
                               vars(client))
809
 
                ipc.write("INVALID %s\n" % client.name)
810
 
                session.bye()
811
 
                return
812
 
            ipc.write("SENDING %s\n" % client.name)
813
 
            sent_size = 0
814
 
            while sent_size < len(client.secret):
815
 
                sent = session.send(client.secret[sent_size:])
816
 
                logger.debug(u"Sent: %d, remaining: %d",
817
 
                             sent, len(client.secret)
818
 
                             - (sent_size + sent))
819
 
                sent_size += sent
820
 
            session.bye()
821
 
 
822
 
 
823
 
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
824
 
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
825
 
    Assumes a gobject.MainLoop event loop.
826
 
    """
827
 
    def process_request(self, request, client_address):
828
 
        """This overrides and wraps the original process_request().
829
 
        This function creates a new pipe in self.pipe 
830
 
        """
831
 
        self.pipe = os.pipe()
832
 
        super(ForkingMixInWithPipe,
833
 
              self).process_request(request, client_address)
834
 
        os.close(self.pipe[1])  # close write end
835
 
        # Call "handle_ipc" for both data and EOF events
836
 
        gobject.io_add_watch(self.pipe[0],
837
 
                             gobject.IO_IN | gobject.IO_HUP,
838
 
                             self.handle_ipc)
839
 
    def handle_ipc(source, condition):
840
 
        """Dummy function; override as necessary"""
841
 
        os.close(source)
842
 
        return False
843
 
 
844
 
 
845
 
class IPv6_TCPServer(ForkingMixInWithPipe,
846
 
                     SocketServer.TCPServer, object):
847
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
449
                     unicode(self.client_address))
 
450
        session = gnutls.connection.ClientSession\
 
451
                  (self.request, gnutls.connection.X509Credentials())
 
452
        
 
453
        line = self.request.makefile().readline()
 
454
        logger.debug(u"Protocol version: %r", line)
 
455
        try:
 
456
            if int(line.strip().split()[0]) > 1:
 
457
                raise RuntimeError
 
458
        except (ValueError, IndexError, RuntimeError), error:
 
459
            logger.error(u"Unknown protocol version: %s", error)
 
460
            return
 
461
        
 
462
        # Note: gnutls.connection.X509Credentials is really a generic
 
463
        # GnuTLS certificate credentials object so long as no X.509
 
464
        # keys are added to it.  Therefore, we can use it here despite
 
465
        # using OpenPGP certificates.
 
466
        
 
467
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
468
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
469
        #                "+DHE-DSS"))
 
470
        priority = "NORMAL"             # Fallback default, since this
 
471
                                        # MUST be set.
 
472
        if self.server.settings["priority"]:
 
473
            priority = self.server.settings["priority"]
 
474
        gnutls.library.functions.gnutls_priority_set_direct\
 
475
            (session._c_object, priority, None)
 
476
        
 
477
        try:
 
478
            session.handshake()
 
479
        except gnutls.errors.GNUTLSError, error:
 
480
            logger.warning(u"Handshake failed: %s", error)
 
481
            # Do not run session.bye() here: the session is not
 
482
            # established.  Just abandon the request.
 
483
            return
 
484
        try:
 
485
            fpr = fingerprint(peer_certificate(session))
 
486
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
487
            logger.warning(u"Bad certificate: %s", error)
 
488
            session.bye()
 
489
            return
 
490
        logger.debug(u"Fingerprint: %s", fpr)
 
491
        client = None
 
492
        for c in self.server.clients:
 
493
            if c.fingerprint == fpr:
 
494
                client = c
 
495
                break
 
496
        if not client:
 
497
            logger.warning(u"Client not found for fingerprint: %s",
 
498
                           fpr)
 
499
            session.bye()
 
500
            return
 
501
        # Have to check if client.still_valid(), since it is possible
 
502
        # that the client timed out while establishing the GnuTLS
 
503
        # session.
 
504
        if not client.still_valid():
 
505
            logger.warning(u"Client %(name)s is invalid",
 
506
                           vars(client))
 
507
            session.bye()
 
508
            return
 
509
        sent_size = 0
 
510
        while sent_size < len(client.secret):
 
511
            sent = session.send(client.secret[sent_size:])
 
512
            logger.debug(u"Sent: %d, remaining: %d",
 
513
                         sent, len(client.secret)
 
514
                         - (sent_size + sent))
 
515
            sent_size += sent
 
516
        session.bye()
 
517
 
 
518
 
 
519
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
520
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
848
521
    Attributes:
849
522
        settings:       Server settings
850
523
        clients:        Set() of Client objects
858
531
        if "clients" in kwargs:
859
532
            self.clients = kwargs["clients"]
860
533
            del kwargs["clients"]
861
 
        if "use_ipv6" in kwargs:
862
 
            if not kwargs["use_ipv6"]:
863
 
                self.address_family = socket.AF_INET
864
 
            del kwargs["use_ipv6"]
865
534
        self.enabled = False
866
535
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
867
536
    def server_bind(self):
881
550
                                 u" bind to interface %s",
882
551
                                 self.settings["interface"])
883
552
                else:
884
 
                    raise
 
553
                    raise error
885
554
        # Only bind(2) the socket if we really need to.
886
555
        if self.server_address[0] or self.server_address[1]:
887
556
            if not self.server_address[0]:
888
 
                if self.address_family == socket.AF_INET6:
889
 
                    any_address = "::" # in6addr_any
890
 
                else:
891
 
                    any_address = socket.INADDR_ANY
892
 
                self.server_address = (any_address,
 
557
                in6addr_any = "::"
 
558
                self.server_address = (in6addr_any,
893
559
                                       self.server_address[1])
894
560
            elif not self.server_address[1]:
895
561
                self.server_address = (self.server_address[0],
907
573
            return super(IPv6_TCPServer, self).server_activate()
908
574
    def enable(self):
909
575
        self.enabled = True
910
 
    def handle_ipc(self, source, condition, file_objects={}):
911
 
        condition_names = {
912
 
            gobject.IO_IN: "IN", # There is data to read.
913
 
            gobject.IO_OUT: "OUT", # Data can be written (without
914
 
                                   # blocking).
915
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
916
 
            gobject.IO_ERR: "ERR", # Error condition.
917
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
918
 
                                   # broken, usually for pipes and
919
 
                                   # sockets).
920
 
            }
921
 
        conditions_string = ' | '.join(name
922
 
                                       for cond, name in
923
 
                                       condition_names.iteritems()
924
 
                                       if cond & condition)
925
 
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
926
 
                     conditions_string)
927
 
        
928
 
        # Turn the pipe file descriptor into a Python file object
929
 
        if source not in file_objects:
930
 
            file_objects[source] = os.fdopen(source, "r", 1)
931
 
        
932
 
        # Read a line from the file object
933
 
        cmdline = file_objects[source].readline()
934
 
        if not cmdline:             # Empty line means end of file
935
 
            # close the IPC pipe
936
 
            file_objects[source].close()
937
 
            del file_objects[source]
938
 
            
939
 
            # Stop calling this function
940
 
            return False
941
 
        
942
 
        logger.debug("IPC command: %r\n" % cmdline)
943
 
        
944
 
        # Parse and act on command
945
 
        cmd, args = cmdline.split(None, 1)
946
 
        if cmd == "NOTFOUND":
947
 
            if self.settings["use_dbus"]:
948
 
                # Emit D-Bus signal
949
 
                mandos_dbus_service.ClientNotFound(args)
950
 
        elif cmd == "INVALID":
951
 
            if self.settings["use_dbus"]:
952
 
                for client in self.clients:
953
 
                    if client.name == args:
954
 
                        # Emit D-Bus signal
955
 
                        client.Rejected()
956
 
                        break
957
 
        elif cmd == "SENDING":
958
 
            for client in self.clients:
959
 
                if client.name == args:
960
 
                    client.checked_ok()
961
 
                    if self.settings["use_dbus"]:
962
 
                        # Emit D-Bus signal
963
 
                        client.ReceivedSecret()
964
 
                    break
965
 
        else:
966
 
            logger.error("Unknown IPC command: %r", cmdline)
967
 
        
968
 
        # Keep calling this function
969
 
        return True
970
576
 
971
577
 
972
578
def string_to_delta(interval):
973
579
    """Parse a string and return a datetime.timedelta
974
 
    
 
580
 
975
581
    >>> string_to_delta('7d')
976
582
    datetime.timedelta(7)
977
583
    >>> string_to_delta('60s')
1029
635
    elif state == avahi.ENTRY_GROUP_FAILURE:
1030
636
        logger.critical(u"Avahi: Error in group state changed %s",
1031
637
                        unicode(error))
1032
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
638
        raise AvahiGroupError("State changed: %s", str(error))
1033
639
 
1034
640
def if_nametoindex(interface):
1035
641
    """Call the C function if_nametoindex(), or equivalent"""
1036
642
    global if_nametoindex
1037
643
    try:
1038
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1039
 
                          (ctypes.util.find_library("c"))
1040
 
                          .if_nametoindex)
 
644
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
645
            (ctypes.util.find_library("c")).if_nametoindex
1041
646
    except (OSError, AttributeError):
1042
647
        if "struct" not in sys.modules:
1043
648
            import struct
1046
651
        def if_nametoindex(interface):
1047
652
            "Get an interface index the hard way, i.e. using fcntl()"
1048
653
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1049
 
            with closing(socket.socket()) as s:
1050
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1051
 
                                    struct.pack("16s16x", interface))
 
654
            s = socket.socket()
 
655
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
656
                                struct.pack("16s16x", interface))
 
657
            s.close()
1052
658
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1053
659
            return interface_index
1054
660
    return if_nametoindex(interface)
1078
684
 
1079
685
 
1080
686
def main():
1081
 
    
1082
 
    ######################################################################
1083
 
    # Parsing of options, both command line and config file
1084
 
    
1085
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
687
    parser = OptionParser(version = "%%prog %s" % version)
1086
688
    parser.add_option("-i", "--interface", type="string",
1087
689
                      metavar="IF", help="Bind to interface IF")
1088
690
    parser.add_option("-a", "--address", type="string",
1089
691
                      help="Address to listen for requests on")
1090
692
    parser.add_option("-p", "--port", type="int",
1091
693
                      help="Port number to receive requests on")
1092
 
    parser.add_option("--check", action="store_true",
 
694
    parser.add_option("--check", action="store_true", default=False,
1093
695
                      help="Run self-test")
1094
696
    parser.add_option("--debug", action="store_true",
1095
697
                      help="Debug mode; run in foreground and log to"
1102
704
                      default="/etc/mandos", metavar="DIR",
1103
705
                      help="Directory to search for configuration"
1104
706
                      " files")
1105
 
    parser.add_option("--no-dbus", action="store_false",
1106
 
                      dest="use_dbus",
1107
 
                      help="Do not provide D-Bus system bus"
1108
 
                      " interface")
1109
 
    parser.add_option("--no-ipv6", action="store_false",
1110
 
                      dest="use_ipv6", help="Do not use IPv6")
1111
707
    options = parser.parse_args()[0]
1112
708
    
1113
709
    if options.check:
1123
719
                        "priority":
1124
720
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1125
721
                        "servicename": "Mandos",
1126
 
                        "use_dbus": "True",
1127
 
                        "use_ipv6": "True",
1128
722
                        }
1129
723
    
1130
724
    # Parse config file for server-global settings
1133
727
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1134
728
    # Convert the SafeConfigParser object to a dict
1135
729
    server_settings = server_config.defaults()
1136
 
    # Use the appropriate methods on the non-string config options
1137
 
    server_settings["debug"] = server_config.getboolean("DEFAULT",
1138
 
                                                        "debug")
1139
 
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
1140
 
                                                           "use_dbus")
1141
 
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
1142
 
                                                           "use_ipv6")
1143
 
    if server_settings["port"]:
1144
 
        server_settings["port"] = server_config.getint("DEFAULT",
1145
 
                                                       "port")
 
730
    # Use getboolean on the boolean config option
 
731
    server_settings["debug"] = server_config.getboolean\
 
732
                               ("DEFAULT", "debug")
1146
733
    del server_config
1147
734
    
1148
735
    # Override the settings from the config file with command line
1149
736
    # options, if set.
1150
737
    for option in ("interface", "address", "port", "debug",
1151
 
                   "priority", "servicename", "configdir",
1152
 
                   "use_dbus", "use_ipv6"):
 
738
                   "priority", "servicename", "configdir"):
1153
739
        value = getattr(options, option)
1154
740
        if value is not None:
1155
741
            server_settings[option] = value
1156
742
    del options
1157
743
    # Now we have our good server settings in "server_settings"
1158
744
    
1159
 
    ##################################################################
1160
 
    
1161
 
    # For convenience
1162
745
    debug = server_settings["debug"]
1163
 
    use_dbus = server_settings["use_dbus"]
1164
 
    use_ipv6 = server_settings["use_ipv6"]
1165
746
    
1166
747
    if not debug:
1167
748
        syslogger.setLevel(logging.WARNING)
1168
749
        console.setLevel(logging.WARNING)
1169
750
    
1170
751
    if server_settings["servicename"] != "Mandos":
1171
 
        syslogger.setFormatter(logging.Formatter
1172
 
                               ('Mandos (%s) [%%(process)d]:'
1173
 
                                ' %%(levelname)s: %%(message)s'
 
752
        syslogger.setFormatter(logging.Formatter\
 
753
                               ('Mandos (%s): %%(levelname)s:'
 
754
                                ' %%(message)s'
1174
755
                                % server_settings["servicename"]))
1175
756
    
1176
757
    # Parse config file with clients
1177
758
    client_defaults = { "timeout": "1h",
1178
759
                        "interval": "5m",
1179
 
                        "checker": "fping -q -- %%(host)s",
 
760
                        "checker": "fping -q -- %(host)s",
1180
761
                        "host": "",
1181
762
                        }
1182
763
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1183
764
    client_config.read(os.path.join(server_settings["configdir"],
1184
765
                                    "clients.conf"))
1185
 
 
1186
 
    global mandos_dbus_service
1187
 
    mandos_dbus_service = None
1188
766
    
1189
767
    clients = Set()
1190
768
    tcp_server = IPv6_TCPServer((server_settings["address"],
1191
769
                                 server_settings["port"]),
1192
770
                                TCP_handler,
1193
771
                                settings=server_settings,
1194
 
                                clients=clients, use_ipv6=use_ipv6)
 
772
                                clients=clients)
1195
773
    pidfilename = "/var/run/mandos.pid"
1196
774
    try:
1197
775
        pidfile = open(pidfilename, "w")
1198
 
    except IOError:
 
776
    except IOError, error:
1199
777
        logger.error("Could not open file %r", pidfilename)
1200
778
    
1201
 
    try:
1202
 
        uid = pwd.getpwnam("_mandos").pw_uid
1203
 
        gid = pwd.getpwnam("_mandos").pw_gid
1204
 
    except KeyError:
1205
 
        try:
1206
 
            uid = pwd.getpwnam("mandos").pw_uid
1207
 
            gid = pwd.getpwnam("mandos").pw_gid
1208
 
        except KeyError:
1209
 
            try:
1210
 
                uid = pwd.getpwnam("nobody").pw_uid
1211
 
                gid = pwd.getpwnam("nogroup").pw_gid
1212
 
            except KeyError:
1213
 
                uid = 65534
1214
 
                gid = 65534
1215
 
    try:
 
779
    uid = 65534
 
780
    gid = 65534
 
781
    try:
 
782
        uid = pwd.getpwnam("mandos").pw_uid
 
783
    except KeyError:
 
784
        try:
 
785
            uid = pwd.getpwnam("nobody").pw_uid
 
786
        except KeyError:
 
787
            pass
 
788
    try:
 
789
        gid = pwd.getpwnam("mandos").pw_gid
 
790
    except KeyError:
 
791
        try:
 
792
            gid = pwd.getpwnam("nogroup").pw_gid
 
793
        except KeyError:
 
794
            pass
 
795
    try:
 
796
        os.setuid(uid)
1216
797
        os.setgid(gid)
1217
 
        os.setuid(uid)
1218
798
    except OSError, error:
1219
799
        if error[0] != errno.EPERM:
1220
800
            raise error
1221
801
    
1222
 
    # Enable all possible GnuTLS debugging
1223
 
    if debug:
1224
 
        # "Use a log level over 10 to enable all debugging options."
1225
 
        # - GnuTLS manual
1226
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
1227
 
        
1228
 
        @gnutls.library.types.gnutls_log_func
1229
 
        def debug_gnutls(level, string):
1230
 
            logger.debug("GnuTLS: %s", string[:-1])
1231
 
        
1232
 
        (gnutls.library.functions
1233
 
         .gnutls_global_set_log_function(debug_gnutls))
1234
 
    
1235
802
    global service
1236
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1237
803
    service = AvahiService(name = server_settings["servicename"],
1238
 
                           servicetype = "_mandos._tcp",
1239
 
                           protocol = protocol)
 
804
                           servicetype = "_mandos._tcp", )
1240
805
    if server_settings["interface"]:
1241
 
        service.interface = (if_nametoindex
1242
 
                             (server_settings["interface"]))
 
806
        service.interface = if_nametoindex\
 
807
                            (server_settings["interface"])
1243
808
    
1244
809
    global main_loop
1245
810
    global bus
1252
817
                                           avahi.DBUS_PATH_SERVER),
1253
818
                            avahi.DBUS_INTERFACE_SERVER)
1254
819
    # End of Avahi example code
1255
 
    if use_dbus:
1256
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1257
 
    
1258
 
    client_class = Client
1259
 
    if use_dbus:
1260
 
        client_class = ClientDBus
1261
 
    clients.update(Set(
1262
 
            client_class(name = section,
1263
 
                         config= dict(client_config.items(section)))
1264
 
            for section in client_config.sections()))
 
820
    
 
821
    def remove_from_clients(client):
 
822
        clients.remove(client)
 
823
        if not clients:
 
824
            logger.critical(u"No clients left, exiting")
 
825
            sys.exit()
 
826
    
 
827
    clients.update(Set(Client(name = section,
 
828
                              stop_hook = remove_from_clients,
 
829
                              config
 
830
                              = dict(client_config.items(section)))
 
831
                       for section in client_config.sections()))
1265
832
    if not clients:
1266
 
        logger.warning(u"No clients defined")
 
833
        logger.critical(u"No clients defined")
 
834
        sys.exit(1)
1267
835
    
1268
836
    if debug:
1269
837
        # Redirect stdin so all checkers get /dev/null
1278
846
        daemon()
1279
847
    
1280
848
    try:
1281
 
        with closing(pidfile):
1282
 
            pid = os.getpid()
1283
 
            pidfile.write(str(pid) + "\n")
 
849
        pid = os.getpid()
 
850
        pidfile.write(str(pid) + "\n")
 
851
        pidfile.close()
1284
852
        del pidfile
1285
853
    except IOError:
1286
854
        logger.error(u"Could not write to file %r with PID %d",
1301
869
        
1302
870
        while clients:
1303
871
            client = clients.pop()
1304
 
            client.disable_hook = None
1305
 
            client.disable()
 
872
            client.stop_hook = None
 
873
            client.stop()
1306
874
    
1307
875
    atexit.register(cleanup)
1308
876
    
1311
879
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1312
880
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1313
881
    
1314
 
    if use_dbus:
1315
 
        class MandosDBusService(dbus.service.Object):
1316
 
            """A D-Bus proxy object"""
1317
 
            def __init__(self):
1318
 
                dbus.service.Object.__init__(self, bus, "/")
1319
 
            _interface = u"se.bsnet.fukt.Mandos"
1320
 
            
1321
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1322
 
            def ClientAdded(self, objpath, properties):
1323
 
                "D-Bus signal"
1324
 
                pass
1325
 
            
1326
 
            @dbus.service.signal(_interface, signature="s")
1327
 
            def ClientNotFound(self, fingerprint):
1328
 
                "D-Bus signal"
1329
 
                pass
1330
 
            
1331
 
            @dbus.service.signal(_interface, signature="os")
1332
 
            def ClientRemoved(self, objpath, name):
1333
 
                "D-Bus signal"
1334
 
                pass
1335
 
            
1336
 
            @dbus.service.method(_interface, out_signature="ao")
1337
 
            def GetAllClients(self):
1338
 
                "D-Bus method"
1339
 
                return dbus.Array(c.dbus_object_path for c in clients)
1340
 
            
1341
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1342
 
            def GetAllClientsWithProperties(self):
1343
 
                "D-Bus method"
1344
 
                return dbus.Dictionary(
1345
 
                    ((c.dbus_object_path, c.GetAllProperties())
1346
 
                     for c in clients),
1347
 
                    signature="oa{sv}")
1348
 
            
1349
 
            @dbus.service.method(_interface, in_signature="o")
1350
 
            def RemoveClient(self, object_path):
1351
 
                "D-Bus method"
1352
 
                for c in clients:
1353
 
                    if c.dbus_object_path == object_path:
1354
 
                        clients.remove(c)
1355
 
                        c.remove_from_connection()
1356
 
                        # Don't signal anything except ClientRemoved
1357
 
                        c.disable(signal=False)
1358
 
                        # Emit D-Bus signal
1359
 
                        self.ClientRemoved(object_path, c.name)
1360
 
                        return
1361
 
                raise KeyError
1362
 
            
1363
 
            del _interface
1364
 
        
1365
 
        mandos_dbus_service = MandosDBusService()
1366
 
    
1367
882
    for client in clients:
1368
 
        if use_dbus:
1369
 
            # Emit D-Bus signal
1370
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1371
 
                                            client.GetAllProperties())
1372
 
        client.enable()
 
883
        client.start()
1373
884
    
1374
885
    tcp_server.enable()
1375
886
    tcp_server.server_activate()
1376
887
    
1377
888
    # Find out what port we got
1378
889
    service.port = tcp_server.socket.getsockname()[1]
1379
 
    if use_ipv6:
1380
 
        logger.info(u"Now listening on address %r, port %d,"
1381
 
                    " flowinfo %d, scope_id %d"
1382
 
                    % tcp_server.socket.getsockname())
1383
 
    else:                       # IPv4
1384
 
        logger.info(u"Now listening on address %r, port %d"
1385
 
                    % tcp_server.socket.getsockname())
 
890
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
891
                u" scope_id %d" % tcp_server.socket.getsockname())
1386
892
    
1387
893
    #service.interface = tcp_server.socket.getsockname()[3]
1388
894
    
1398
904
        
1399
905
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1400
906
                             lambda *args, **kwargs:
1401
 
                             (tcp_server.handle_request
1402
 
                              (*args[2:], **kwargs) or True))
 
907
                             tcp_server.handle_request\
 
908
                             (*args[2:], **kwargs) or True)
1403
909
        
1404
910
        logger.debug(u"Starting main loop")
1405
911
        main_loop.run()
1406
912
    except AvahiError, error:
1407
 
        logger.critical(u"AvahiError: %s", error)
 
913
        logger.critical(u"AvahiError: %s" + unicode(error))
1408
914
        sys.exit(1)
1409
915
    except KeyboardInterrupt:
1410
916
        if debug:
1411
 
            print >> sys.stderr
1412
 
        logger.debug("Server received KeyboardInterrupt")
1413
 
    logger.debug("Server exiting")
 
917
            print
1414
918
 
1415
919
if __name__ == '__main__':
1416
920
    main()