/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-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
 
class Client(dbus.service.Object):
 
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
210
 
    use_dbus: bool(); Whether to provide D-Bus interface and signals
211
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
 
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: - '' -
212
202
    """
213
 
    def timeout_milliseconds(self):
214
 
        "Return the 'timeout' attribute in milliseconds"
215
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
216
 
                + (self.timeout.seconds * 1000)
217
 
                + (self.timeout.microseconds // 1000))
218
 
    
219
 
    def interval_milliseconds(self):
220
 
        "Return the 'interval' attribute in milliseconds"
221
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
222
 
                + (self.interval.seconds * 1000)
223
 
                + (self.interval.microseconds // 1000))
224
 
    
225
 
    def __init__(self, name = None, disable_hook=None, config=None,
226
 
                 use_dbus=True):
 
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):
227
227
        """Note: the 'checker' key in 'config' sets the
228
228
        'checker_command' attribute and *not* the 'checker'
229
229
        attribute."""
230
 
        self.name = name
231
230
        if config is None:
232
231
            config = {}
 
232
        self.name = name
233
233
        logger.debug(u"Creating client %r", self.name)
234
 
        self.use_dbus = False   # During __init__
235
234
        # Uppercase and remove spaces from fingerprint for later
236
235
        # comparison purposes with return value from the fingerprint()
237
236
        # function
238
 
        self.fingerprint = (config["fingerprint"].upper()
239
 
                            .replace(u" ", u""))
 
237
        self.fingerprint = config["fingerprint"].upper()\
 
238
                           .replace(u" ", u"")
240
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
241
240
        if "secret" in config:
242
241
            self.secret = config["secret"].decode(u"base64")
243
242
        elif "secfile" in config:
244
 
            with closing(open(os.path.expanduser
245
 
                              (os.path.expandvars
246
 
                               (config["secfile"])))) as secfile:
247
 
                self.secret = secfile.read()
 
243
            secfile = open(config["secfile"])
 
244
            self.secret = secfile.read()
 
245
            secfile.close()
248
246
        else:
249
247
            raise TypeError(u"No secret or secfile for client %s"
250
248
                            % self.name)
251
249
        self.host = config.get("host", "")
252
 
        self.created = datetime.datetime.utcnow()
253
 
        self.enabled = False
254
 
        self.last_enabled = None
 
250
        self.created = datetime.datetime.now()
255
251
        self.last_checked_ok = None
256
252
        self.timeout = string_to_delta(config["timeout"])
257
253
        self.interval = string_to_delta(config["interval"])
258
 
        self.disable_hook = disable_hook
 
254
        self.stop_hook = stop_hook
259
255
        self.checker = None
260
256
        self.checker_initiator_tag = None
261
 
        self.disable_initiator_tag = None
 
257
        self.stop_initiator_tag = None
262
258
        self.checker_callback_tag = None
263
 
        self.checker_command = config["checker"]
264
 
        self.current_checker_command = None
265
 
        self.last_connect = None
266
 
        # Only now, when this client is initialized, can it show up on
267
 
        # the D-Bus
268
 
        self.use_dbus = use_dbus
269
 
        if self.use_dbus:
270
 
            self.dbus_object_path = (dbus.ObjectPath
271
 
                                     ("/clients/"
272
 
                                      + self.name.replace(".", "_")))
273
 
            dbus.service.Object.__init__(self, bus,
274
 
                                         self.dbus_object_path)
275
 
    
276
 
    def enable(self):
 
259
        self.check_command = config["checker"]
 
260
    def start(self):
277
261
        """Start this client's checker and timeout hooks"""
278
 
        self.last_enabled = datetime.datetime.utcnow()
279
262
        # Schedule a new checker to be started an 'interval' from now,
280
263
        # and every interval from then on.
281
 
        self.checker_initiator_tag = (gobject.timeout_add
282
 
                                      (self.interval_milliseconds(),
283
 
                                       self.start_checker))
 
264
        self.checker_initiator_tag = gobject.timeout_add\
 
265
                                     (self._interval_milliseconds,
 
266
                                      self.start_checker)
284
267
        # Also start a new checker *right now*.
285
268
        self.start_checker()
286
 
        # Schedule a disable() when 'timeout' has passed
287
 
        self.disable_initiator_tag = (gobject.timeout_add
288
 
                                   (self.timeout_milliseconds(),
289
 
                                    self.disable))
290
 
        self.enabled = True
291
 
        if self.use_dbus:
292
 
            # Emit D-Bus signals
293
 
            self.PropertyChanged(dbus.String(u"enabled"),
294
 
                                 dbus.Boolean(True, variant_level=1))
295
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
296
 
                                 (_datetime_to_dbus(self.last_enabled,
297
 
                                                    variant_level=1)))
298
 
    
299
 
    def disable(self):
300
 
        """Disable this client."""
301
 
        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:
302
282
            return False
303
 
        logger.info(u"Disabling client %s", self.name)
304
 
        if getattr(self, "disable_initiator_tag", False):
305
 
            gobject.source_remove(self.disable_initiator_tag)
306
 
            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
307
286
        if getattr(self, "checker_initiator_tag", False):
308
287
            gobject.source_remove(self.checker_initiator_tag)
309
288
            self.checker_initiator_tag = None
310
289
        self.stop_checker()
311
 
        if self.disable_hook:
312
 
            self.disable_hook(self)
313
 
        self.enabled = False
314
 
        if self.use_dbus:
315
 
            # Emit D-Bus signal
316
 
            self.PropertyChanged(dbus.String(u"enabled"),
317
 
                                 dbus.Boolean(False, variant_level=1))
 
290
        if self.stop_hook:
 
291
            self.stop_hook(self)
318
292
        # Do not run this again if called by a gobject.timeout_add
319
293
        return False
320
 
    
321
294
    def __del__(self):
322
 
        self.disable_hook = None
323
 
        self.disable()
324
 
    
325
 
    def checker_callback(self, pid, condition, command):
 
295
        self.stop_hook = None
 
296
        self.stop()
 
297
    def checker_callback(self, pid, condition):
326
298
        """The checker has completed, so take appropriate actions."""
 
299
        now = datetime.datetime.now()
327
300
        self.checker_callback_tag = None
328
301
        self.checker = None
329
 
        if self.use_dbus:
330
 
            # Emit D-Bus signal
331
 
            self.PropertyChanged(dbus.String(u"checker_running"),
332
 
                                 dbus.Boolean(False, variant_level=1))
333
 
        if os.WIFEXITED(condition):
334
 
            exitstatus = os.WEXITSTATUS(condition)
335
 
            if exitstatus == 0:
336
 
                logger.info(u"Checker for %(name)s succeeded",
337
 
                            vars(self))
338
 
                self.checked_ok()
339
 
            else:
340
 
                logger.info(u"Checker for %(name)s failed",
341
 
                            vars(self))
342
 
            if self.use_dbus:
343
 
                # Emit D-Bus signal
344
 
                self.CheckerCompleted(dbus.Int16(exitstatus),
345
 
                                      dbus.Int64(condition),
346
 
                                      dbus.String(command))
347
 
        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):
348
312
            logger.warning(u"Checker for %(name)s crashed?",
349
313
                           vars(self))
350
 
            if self.use_dbus:
351
 
                # Emit D-Bus signal
352
 
                self.CheckerCompleted(dbus.Int16(-1),
353
 
                                      dbus.Int64(condition),
354
 
                                      dbus.String(command))
355
 
    
356
 
    def checked_ok(self):
357
 
        """Bump up the timeout for this client.
358
 
        This should only be called when the client has been seen,
359
 
        alive and well.
360
 
        """
361
 
        self.last_checked_ok = datetime.datetime.utcnow()
362
 
        gobject.source_remove(self.disable_initiator_tag)
363
 
        self.disable_initiator_tag = (gobject.timeout_add
364
 
                                      (self.timeout_milliseconds(),
365
 
                                       self.disable))
366
 
        if self.use_dbus:
367
 
            # Emit D-Bus signal
368
 
            self.PropertyChanged(
369
 
                dbus.String(u"last_checked_ok"),
370
 
                (_datetime_to_dbus(self.last_checked_ok,
371
 
                                   variant_level=1)))
372
 
    
 
314
        else:
 
315
            logger.info(u"Checker for %(name)s failed",
 
316
                        vars(self))
373
317
    def start_checker(self):
374
318
        """Start a new checker subprocess if one is not running.
375
319
        If a checker already exists, leave it running and do
382
326
        # checkers alone, the checker would have to take more time
383
327
        # than 'timeout' for the client to be declared invalid, which
384
328
        # is as it should be.
385
 
        
386
 
        # If a checker exists, make sure it is not a zombie
387
 
        if self.checker is not None:
388
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
389
 
            if pid:
390
 
                logger.warning("Checker was a zombie")
391
 
                gobject.source_remove(self.checker_callback_tag)
392
 
                self.checker_callback(pid, status,
393
 
                                      self.current_checker_command)
394
 
        # Start a new checker if needed
395
329
        if self.checker is None:
396
330
            try:
397
 
                # In case checker_command has exactly one % operator
398
 
                command = self.checker_command % self.host
 
331
                # In case check_command has exactly one % operator
 
332
                command = self.check_command % self.host
399
333
            except TypeError:
400
334
                # Escape attributes for the shell
401
335
                escaped_attrs = dict((key, re.escape(str(val)))
402
336
                                     for key, val in
403
337
                                     vars(self).iteritems())
404
338
                try:
405
 
                    command = self.checker_command % escaped_attrs
 
339
                    command = self.check_command % escaped_attrs
406
340
                except TypeError, error:
407
341
                    logger.error(u'Could not format string "%s":'
408
 
                                 u' %s', self.checker_command, error)
 
342
                                 u' %s', self.check_command, error)
409
343
                    return True # Try again later
410
 
                self.current_checker_command = command
411
344
            try:
412
345
                logger.info(u"Starting checker %r for %s",
413
346
                            command, self.name)
418
351
                self.checker = subprocess.Popen(command,
419
352
                                                close_fds=True,
420
353
                                                shell=True, cwd="/")
421
 
                if self.use_dbus:
422
 
                    # Emit D-Bus signal
423
 
                    self.CheckerStarted(command)
424
 
                    self.PropertyChanged(
425
 
                        dbus.String("checker_running"),
426
 
                        dbus.Boolean(True, variant_level=1))
427
 
                self.checker_callback_tag = (gobject.child_watch_add
428
 
                                             (self.checker.pid,
429
 
                                              self.checker_callback,
430
 
                                              data=command))
431
 
                # The checker may have completed before the gobject
432
 
                # watch was added.  Check for this.
433
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
434
 
                if pid:
435
 
                    gobject.source_remove(self.checker_callback_tag)
436
 
                    self.checker_callback(pid, status, command)
 
354
                self.checker_callback_tag = gobject.child_watch_add\
 
355
                                            (self.checker.pid,
 
356
                                             self.checker_callback)
437
357
            except OSError, error:
438
358
                logger.error(u"Failed to start subprocess: %s",
439
359
                             error)
440
360
        # Re-run this periodically if run by gobject.timeout_add
441
361
        return True
442
 
    
443
362
    def stop_checker(self):
444
363
        """Force the checker process, if any, to stop."""
445
364
        if self.checker_callback_tag:
457
376
            if error.errno != errno.ESRCH: # No such process
458
377
                raise
459
378
        self.checker = None
460
 
        if self.use_dbus:
461
 
            self.PropertyChanged(dbus.String(u"checker_running"),
462
 
                                 dbus.Boolean(False, variant_level=1))
463
 
    
464
379
    def still_valid(self):
465
380
        """Has the timeout not yet passed for this client?"""
466
 
        if not getattr(self, "enabled", False):
467
 
            return False
468
 
        now = datetime.datetime.utcnow()
 
381
        now = datetime.datetime.now()
469
382
        if self.last_checked_ok is None:
470
383
            return now < (self.created + self.timeout)
471
384
        else:
472
385
            return now < (self.last_checked_ok + self.timeout)
473
 
    
474
 
    ## D-Bus methods & signals
475
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
476
 
    
477
 
    # CheckedOK - method
478
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
479
 
    CheckedOK.__name__ = "CheckedOK"
480
 
    
481
 
    # CheckerCompleted - signal
482
 
    @dbus.service.signal(_interface, signature="nxs")
483
 
    def CheckerCompleted(self, exitcode, waitstatus, command):
484
 
        "D-Bus signal"
485
 
        pass
486
 
    
487
 
    # CheckerStarted - signal
488
 
    @dbus.service.signal(_interface, signature="s")
489
 
    def CheckerStarted(self, command):
490
 
        "D-Bus signal"
491
 
        pass
492
 
    
493
 
    # GetAllProperties - method
494
 
    @dbus.service.method(_interface, out_signature="a{sv}")
495
 
    def GetAllProperties(self):
496
 
        "D-Bus method"
497
 
        return dbus.Dictionary({
498
 
                dbus.String("name"):
499
 
                    dbus.String(self.name, variant_level=1),
500
 
                dbus.String("fingerprint"):
501
 
                    dbus.String(self.fingerprint, variant_level=1),
502
 
                dbus.String("host"):
503
 
                    dbus.String(self.host, variant_level=1),
504
 
                dbus.String("created"):
505
 
                    _datetime_to_dbus(self.created, variant_level=1),
506
 
                dbus.String("last_enabled"):
507
 
                    (_datetime_to_dbus(self.last_enabled,
508
 
                                       variant_level=1)
509
 
                     if self.last_enabled is not None
510
 
                     else dbus.Boolean(False, variant_level=1)),
511
 
                dbus.String("enabled"):
512
 
                    dbus.Boolean(self.enabled, variant_level=1),
513
 
                dbus.String("last_checked_ok"):
514
 
                    (_datetime_to_dbus(self.last_checked_ok,
515
 
                                       variant_level=1)
516
 
                     if self.last_checked_ok is not None
517
 
                     else dbus.Boolean (False, variant_level=1)),
518
 
                dbus.String("timeout"):
519
 
                    dbus.UInt64(self.timeout_milliseconds(),
520
 
                                variant_level=1),
521
 
                dbus.String("interval"):
522
 
                    dbus.UInt64(self.interval_milliseconds(),
523
 
                                variant_level=1),
524
 
                dbus.String("checker"):
525
 
                    dbus.String(self.checker_command,
526
 
                                variant_level=1),
527
 
                dbus.String("checker_running"):
528
 
                    dbus.Boolean(self.checker is not None,
529
 
                                 variant_level=1),
530
 
                dbus.String("object_path"):
531
 
                    dbus.ObjectPath(self.dbus_object_path,
532
 
                                    variant_level=1)
533
 
                }, signature="sv")
534
 
    
535
 
    # IsStillValid - method
536
 
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
537
 
                    (still_valid))
538
 
    IsStillValid.__name__ = "IsStillValid"
539
 
    
540
 
    # PropertyChanged - signal
541
 
    @dbus.service.signal(_interface, signature="sv")
542
 
    def PropertyChanged(self, property, value):
543
 
        "D-Bus signal"
544
 
        pass
545
 
    
546
 
    # ReceivedSecret - signal
547
 
    @dbus.service.signal(_interface)
548
 
    def ReceivedSecret(self):
549
 
        "D-Bus signal"
550
 
        pass
551
 
    
552
 
    # Rejected - signal
553
 
    @dbus.service.signal(_interface)
554
 
    def Rejected(self):
555
 
        "D-Bus signal"
556
 
        pass
557
 
    
558
 
    # SetChecker - method
559
 
    @dbus.service.method(_interface, in_signature="s")
560
 
    def SetChecker(self, checker):
561
 
        "D-Bus setter method"
562
 
        self.checker_command = checker
563
 
        # Emit D-Bus signal
564
 
        self.PropertyChanged(dbus.String(u"checker"),
565
 
                             dbus.String(self.checker_command,
566
 
                                         variant_level=1))
567
 
    
568
 
    # SetHost - method
569
 
    @dbus.service.method(_interface, in_signature="s")
570
 
    def SetHost(self, host):
571
 
        "D-Bus setter method"
572
 
        self.host = host
573
 
        # Emit D-Bus signal
574
 
        self.PropertyChanged(dbus.String(u"host"),
575
 
                             dbus.String(self.host, variant_level=1))
576
 
    
577
 
    # SetInterval - method
578
 
    @dbus.service.method(_interface, in_signature="t")
579
 
    def SetInterval(self, milliseconds):
580
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
581
 
        # Emit D-Bus signal
582
 
        self.PropertyChanged(dbus.String(u"interval"),
583
 
                             (dbus.UInt64(self.interval_milliseconds(),
584
 
                                          variant_level=1)))
585
 
    
586
 
    # SetSecret - method
587
 
    @dbus.service.method(_interface, in_signature="ay",
588
 
                         byte_arrays=True)
589
 
    def SetSecret(self, secret):
590
 
        "D-Bus setter method"
591
 
        self.secret = str(secret)
592
 
    
593
 
    # SetTimeout - method
594
 
    @dbus.service.method(_interface, in_signature="t")
595
 
    def SetTimeout(self, milliseconds):
596
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
597
 
        # Emit D-Bus signal
598
 
        self.PropertyChanged(dbus.String(u"timeout"),
599
 
                             (dbus.UInt64(self.timeout_milliseconds(),
600
 
                                          variant_level=1)))
601
 
    
602
 
    # Enable - method
603
 
    Enable = dbus.service.method(_interface)(enable)
604
 
    Enable.__name__ = "Enable"
605
 
    
606
 
    # StartChecker - method
607
 
    @dbus.service.method(_interface)
608
 
    def StartChecker(self):
609
 
        "D-Bus method"
610
 
        self.start_checker()
611
 
    
612
 
    # Disable - method
613
 
    @dbus.service.method(_interface)
614
 
    def Disable(self):
615
 
        "D-Bus method"
616
 
        self.disable()
617
 
    
618
 
    # StopChecker - method
619
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
620
 
    StopChecker.__name__ = "StopChecker"
621
 
    
622
 
    del _interface
623
386
 
624
387
 
625
388
def peer_certificate(session):
626
389
    "Return the peer's OpenPGP certificate as a bytestring"
627
390
    # If not an OpenPGP certificate...
628
 
    if (gnutls.library.functions
629
 
        .gnutls_certificate_type_get(session._c_object)
630
 
        != 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:
631
394
        # ...do the normal thing
632
395
        return session.peer_certificate
633
 
    list_size = ctypes.c_uint(1)
634
 
    cert_list = (gnutls.library.functions
635
 
                 .gnutls_certificate_get_peers
636
 
                 (session._c_object, ctypes.byref(list_size)))
637
 
    if not bool(cert_list) and list_size.value != 0:
638
 
        raise gnutls.errors.GNUTLSError("error getting peer"
639
 
                                        " 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))
640
399
    if list_size.value == 0:
641
400
        return None
642
401
    cert = cert_list[0]
646
405
def fingerprint(openpgp):
647
406
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
648
407
    # New GnuTLS "datum" with the OpenPGP public key
649
 
    datum = (gnutls.library.types
650
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
651
 
                                         ctypes.POINTER
652
 
                                         (ctypes.c_ubyte)),
653
 
                             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)))
654
412
    # New empty GnuTLS certificate
655
413
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
656
 
    (gnutls.library.functions
657
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
414
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
415
        (ctypes.byref(crt))
658
416
    # Import the OpenPGP public key into the certificate
659
 
    (gnutls.library.functions
660
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
661
 
                                gnutls.library.constants
662
 
                                .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)
663
420
    # Verify the self signature in the key
664
421
    crtverify = ctypes.c_uint()
665
 
    (gnutls.library.functions
666
 
     .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))
667
424
    if crtverify.value != 0:
668
425
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
669
426
        raise gnutls.errors.CertificateSecurityError("Verify failed")
671
428
    buf = ctypes.create_string_buffer(20)
672
429
    buf_len = ctypes.c_size_t()
673
430
    # Get the fingerprint from the certificate into the buffer
674
 
    (gnutls.library.functions
675
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
676
 
                                         ctypes.byref(buf_len)))
 
431
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
432
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
677
433
    # Deinit the certificate
678
434
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
679
435
    # Convert the buffer to a Python bytestring
690
446
    
691
447
    def handle(self):
692
448
        logger.info(u"TCP connection from: %s",
693
 
                    unicode(self.client_address))
694
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
695
 
        # Open IPC pipe to parent process
696
 
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
697
 
            session = (gnutls.connection
698
 
                       .ClientSession(self.request,
699
 
                                      gnutls.connection
700
 
                                      .X509Credentials()))
701
 
            
702
 
            line = self.request.makefile().readline()
703
 
            logger.debug(u"Protocol version: %r", line)
704
 
            try:
705
 
                if int(line.strip().split()[0]) > 1:
706
 
                    raise RuntimeError
707
 
            except (ValueError, IndexError, RuntimeError), error:
708
 
                logger.error(u"Unknown protocol version: %s", error)
709
 
                return
710
 
            
711
 
            # Note: gnutls.connection.X509Credentials is really a
712
 
            # generic GnuTLS certificate credentials object so long as
713
 
            # no X.509 keys are added to it.  Therefore, we can use it
714
 
            # here despite using OpenPGP certificates.
715
 
            
716
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
717
 
            #                     "+AES-256-CBC", "+SHA1",
718
 
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
719
 
            #                     "+DHE-DSS"))
720
 
            # Use a fallback default, since this MUST be set.
721
 
            priority = self.server.settings.get("priority", "NORMAL")
722
 
            (gnutls.library.functions
723
 
             .gnutls_priority_set_direct(session._c_object,
724
 
                                         priority, None))
725
 
            
726
 
            try:
727
 
                session.handshake()
728
 
            except gnutls.errors.GNUTLSError, error:
729
 
                logger.warning(u"Handshake failed: %s", error)
730
 
                # Do not run session.bye() here: the session is not
731
 
                # established.  Just abandon the request.
732
 
                return
733
 
            logger.debug(u"Handshake succeeded")
734
 
            try:
735
 
                fpr = fingerprint(peer_certificate(session))
736
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
737
 
                logger.warning(u"Bad certificate: %s", error)
738
 
                session.bye()
739
 
                return
740
 
            logger.debug(u"Fingerprint: %s", fpr)
741
 
            
742
 
            for c in self.server.clients:
743
 
                if c.fingerprint == fpr:
744
 
                    client = c
745
 
                    break
746
 
            else:
747
 
                logger.warning(u"Client not found for fingerprint: %s",
748
 
                               fpr)
749
 
                ipc.write("NOTFOUND %s\n" % fpr)
750
 
                session.bye()
751
 
                return
752
 
            # Have to check if client.still_valid(), since it is
753
 
            # possible that the client timed out while establishing
754
 
            # the GnuTLS session.
755
 
            if not client.still_valid():
756
 
                logger.warning(u"Client %(name)s is invalid",
757
 
                               vars(client))
758
 
                ipc.write("INVALID %s\n" % client.name)
759
 
                session.bye()
760
 
                return
761
 
            ipc.write("SENDING %s\n" % client.name)
762
 
            sent_size = 0
763
 
            while sent_size < len(client.secret):
764
 
                sent = session.send(client.secret[sent_size:])
765
 
                logger.debug(u"Sent: %d, remaining: %d",
766
 
                             sent, len(client.secret)
767
 
                             - (sent_size + sent))
768
 
                sent_size += sent
769
 
            session.bye()
770
 
 
771
 
 
772
 
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
773
 
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
774
 
    Assumes a gobject.MainLoop event loop.
775
 
    """
776
 
    def process_request(self, request, client_address):
777
 
        """This overrides and wraps the original process_request().
778
 
        This function creates a new pipe in self.pipe 
779
 
        """
780
 
        self.pipe = os.pipe()
781
 
        super(ForkingMixInWithPipe,
782
 
              self).process_request(request, client_address)
783
 
        os.close(self.pipe[1])  # close write end
784
 
        # Call "handle_ipc" for both data and EOF events
785
 
        gobject.io_add_watch(self.pipe[0],
786
 
                             gobject.IO_IN | gobject.IO_HUP,
787
 
                             self.handle_ipc)
788
 
    def handle_ipc(source, condition):
789
 
        """Dummy function; override as necessary"""
790
 
        os.close(source)
791
 
        return False
792
 
 
793
 
 
794
 
class IPv6_TCPServer(ForkingMixInWithPipe,
795
 
                     SocketServer.TCPServer, object):
796
 
    """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.
797
521
    Attributes:
798
522
        settings:       Server settings
799
523
        clients:        Set() of Client objects
807
531
        if "clients" in kwargs:
808
532
            self.clients = kwargs["clients"]
809
533
            del kwargs["clients"]
810
 
        if "use_ipv6" in kwargs:
811
 
            if not kwargs["use_ipv6"]:
812
 
                self.address_family = socket.AF_INET
813
 
            del kwargs["use_ipv6"]
814
534
        self.enabled = False
815
535
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
816
536
    def server_bind(self):
830
550
                                 u" bind to interface %s",
831
551
                                 self.settings["interface"])
832
552
                else:
833
 
                    raise
 
553
                    raise error
834
554
        # Only bind(2) the socket if we really need to.
835
555
        if self.server_address[0] or self.server_address[1]:
836
556
            if not self.server_address[0]:
837
 
                if self.address_family == socket.AF_INET6:
838
 
                    any_address = "::" # in6addr_any
839
 
                else:
840
 
                    any_address = socket.INADDR_ANY
841
 
                self.server_address = (any_address,
 
557
                in6addr_any = "::"
 
558
                self.server_address = (in6addr_any,
842
559
                                       self.server_address[1])
843
560
            elif not self.server_address[1]:
844
561
                self.server_address = (self.server_address[0],
856
573
            return super(IPv6_TCPServer, self).server_activate()
857
574
    def enable(self):
858
575
        self.enabled = True
859
 
    def handle_ipc(self, source, condition, file_objects={}):
860
 
        condition_names = {
861
 
            gobject.IO_IN: "IN", # There is data to read.
862
 
            gobject.IO_OUT: "OUT", # Data can be written (without
863
 
                                   # blocking).
864
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
865
 
            gobject.IO_ERR: "ERR", # Error condition.
866
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
867
 
                                   # broken, usually for pipes and
868
 
                                   # sockets).
869
 
            }
870
 
        conditions_string = ' | '.join(name
871
 
                                       for cond, name in
872
 
                                       condition_names.iteritems()
873
 
                                       if cond & condition)
874
 
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
875
 
                     conditions_string)
876
 
        
877
 
        # Turn the pipe file descriptor into a Python file object
878
 
        if source not in file_objects:
879
 
            file_objects[source] = os.fdopen(source, "r", 1)
880
 
        
881
 
        # Read a line from the file object
882
 
        cmdline = file_objects[source].readline()
883
 
        if not cmdline:             # Empty line means end of file
884
 
            # close the IPC pipe
885
 
            file_objects[source].close()
886
 
            del file_objects[source]
887
 
            
888
 
            # Stop calling this function
889
 
            return False
890
 
        
891
 
        logger.debug("IPC command: %r\n" % cmdline)
892
 
        
893
 
        # Parse and act on command
894
 
        cmd, args = cmdline.split(None, 1)
895
 
        if cmd == "NOTFOUND":
896
 
            if self.settings["use_dbus"]:
897
 
                # Emit D-Bus signal
898
 
                mandos_dbus_service.ClientNotFound(args)
899
 
        elif cmd == "INVALID":
900
 
            if self.settings["use_dbus"]:
901
 
                for client in self.clients:
902
 
                    if client.name == args:
903
 
                        # Emit D-Bus signal
904
 
                        client.Rejected()
905
 
                        break
906
 
        elif cmd == "SENDING":
907
 
            for client in self.clients:
908
 
                if client.name == args:
909
 
                    client.checked_ok()
910
 
                    if self.settings["use_dbus"]:
911
 
                        # Emit D-Bus signal
912
 
                        client.ReceivedSecret()
913
 
                    break
914
 
        else:
915
 
            logger.error("Unknown IPC command: %r", cmdline)
916
 
        
917
 
        # Keep calling this function
918
 
        return True
919
576
 
920
577
 
921
578
def string_to_delta(interval):
922
579
    """Parse a string and return a datetime.timedelta
923
 
    
 
580
 
924
581
    >>> string_to_delta('7d')
925
582
    datetime.timedelta(7)
926
583
    >>> string_to_delta('60s')
978
635
    elif state == avahi.ENTRY_GROUP_FAILURE:
979
636
        logger.critical(u"Avahi: Error in group state changed %s",
980
637
                        unicode(error))
981
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
638
        raise AvahiGroupError("State changed: %s", str(error))
982
639
 
983
640
def if_nametoindex(interface):
984
641
    """Call the C function if_nametoindex(), or equivalent"""
985
642
    global if_nametoindex
986
643
    try:
987
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
988
 
                          (ctypes.util.find_library("c"))
989
 
                          .if_nametoindex)
 
644
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
645
            (ctypes.util.find_library("c")).if_nametoindex
990
646
    except (OSError, AttributeError):
991
647
        if "struct" not in sys.modules:
992
648
            import struct
995
651
        def if_nametoindex(interface):
996
652
            "Get an interface index the hard way, i.e. using fcntl()"
997
653
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
998
 
            with closing(socket.socket()) as s:
999
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1000
 
                                    struct.pack("16s16x", interface))
 
654
            s = socket.socket()
 
655
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
656
                                struct.pack("16s16x", interface))
 
657
            s.close()
1001
658
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1002
659
            return interface_index
1003
660
    return if_nametoindex(interface)
1027
684
 
1028
685
 
1029
686
def main():
1030
 
    
1031
 
    ######################################################################
1032
 
    # Parsing of options, both command line and config file
1033
 
    
1034
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
687
    parser = OptionParser(version = "%%prog %s" % version)
1035
688
    parser.add_option("-i", "--interface", type="string",
1036
689
                      metavar="IF", help="Bind to interface IF")
1037
690
    parser.add_option("-a", "--address", type="string",
1038
691
                      help="Address to listen for requests on")
1039
692
    parser.add_option("-p", "--port", type="int",
1040
693
                      help="Port number to receive requests on")
1041
 
    parser.add_option("--check", action="store_true",
 
694
    parser.add_option("--check", action="store_true", default=False,
1042
695
                      help="Run self-test")
1043
696
    parser.add_option("--debug", action="store_true",
1044
697
                      help="Debug mode; run in foreground and log to"
1051
704
                      default="/etc/mandos", metavar="DIR",
1052
705
                      help="Directory to search for configuration"
1053
706
                      " files")
1054
 
    parser.add_option("--no-dbus", action="store_false",
1055
 
                      dest="use_dbus",
1056
 
                      help="Do not provide D-Bus system bus"
1057
 
                      " interface")
1058
 
    parser.add_option("--no-ipv6", action="store_false",
1059
 
                      dest="use_ipv6", help="Do not use IPv6")
1060
707
    options = parser.parse_args()[0]
1061
708
    
1062
709
    if options.check:
1072
719
                        "priority":
1073
720
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1074
721
                        "servicename": "Mandos",
1075
 
                        "use_dbus": "True",
1076
 
                        "use_ipv6": "True",
1077
722
                        }
1078
723
    
1079
724
    # Parse config file for server-global settings
1082
727
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1083
728
    # Convert the SafeConfigParser object to a dict
1084
729
    server_settings = server_config.defaults()
1085
 
    # Use the appropriate methods on the non-string config options
1086
 
    server_settings["debug"] = server_config.getboolean("DEFAULT",
1087
 
                                                        "debug")
1088
 
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
1089
 
                                                           "use_dbus")
1090
 
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
1091
 
                                                           "use_ipv6")
1092
 
    if server_settings["port"]:
1093
 
        server_settings["port"] = server_config.getint("DEFAULT",
1094
 
                                                       "port")
 
730
    # Use getboolean on the boolean config option
 
731
    server_settings["debug"] = server_config.getboolean\
 
732
                               ("DEFAULT", "debug")
1095
733
    del server_config
1096
734
    
1097
735
    # Override the settings from the config file with command line
1098
736
    # options, if set.
1099
737
    for option in ("interface", "address", "port", "debug",
1100
 
                   "priority", "servicename", "configdir",
1101
 
                   "use_dbus", "use_ipv6"):
 
738
                   "priority", "servicename", "configdir"):
1102
739
        value = getattr(options, option)
1103
740
        if value is not None:
1104
741
            server_settings[option] = value
1105
742
    del options
1106
743
    # Now we have our good server settings in "server_settings"
1107
744
    
1108
 
    ##################################################################
1109
 
    
1110
 
    # For convenience
1111
745
    debug = server_settings["debug"]
1112
 
    use_dbus = server_settings["use_dbus"]
1113
 
    use_ipv6 = server_settings["use_ipv6"]
1114
746
    
1115
747
    if not debug:
1116
748
        syslogger.setLevel(logging.WARNING)
1117
749
        console.setLevel(logging.WARNING)
1118
750
    
1119
751
    if server_settings["servicename"] != "Mandos":
1120
 
        syslogger.setFormatter(logging.Formatter
1121
 
                               ('Mandos (%s) [%%(process)d]:'
1122
 
                                ' %%(levelname)s: %%(message)s'
 
752
        syslogger.setFormatter(logging.Formatter\
 
753
                               ('Mandos (%s): %%(levelname)s:'
 
754
                                ' %%(message)s'
1123
755
                                % server_settings["servicename"]))
1124
756
    
1125
757
    # Parse config file with clients
1126
758
    client_defaults = { "timeout": "1h",
1127
759
                        "interval": "5m",
1128
 
                        "checker": "fping -q -- %%(host)s",
 
760
                        "checker": "fping -q -- %(host)s",
1129
761
                        "host": "",
1130
762
                        }
1131
763
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1132
764
    client_config.read(os.path.join(server_settings["configdir"],
1133
765
                                    "clients.conf"))
1134
 
 
1135
 
    global mandos_dbus_service
1136
 
    mandos_dbus_service = None
1137
766
    
1138
767
    clients = Set()
1139
768
    tcp_server = IPv6_TCPServer((server_settings["address"],
1140
769
                                 server_settings["port"]),
1141
770
                                TCP_handler,
1142
771
                                settings=server_settings,
1143
 
                                clients=clients, use_ipv6=use_ipv6)
 
772
                                clients=clients)
1144
773
    pidfilename = "/var/run/mandos.pid"
1145
774
    try:
1146
775
        pidfile = open(pidfilename, "w")
1147
 
    except IOError:
 
776
    except IOError, error:
1148
777
        logger.error("Could not open file %r", pidfilename)
1149
778
    
1150
 
    try:
1151
 
        uid = pwd.getpwnam("_mandos").pw_uid
1152
 
        gid = pwd.getpwnam("_mandos").pw_gid
1153
 
    except KeyError:
1154
 
        try:
1155
 
            uid = pwd.getpwnam("mandos").pw_uid
1156
 
            gid = pwd.getpwnam("mandos").pw_gid
1157
 
        except KeyError:
1158
 
            try:
1159
 
                uid = pwd.getpwnam("nobody").pw_uid
1160
 
                gid = pwd.getpwnam("nogroup").pw_gid
1161
 
            except KeyError:
1162
 
                uid = 65534
1163
 
                gid = 65534
1164
 
    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)
1165
797
        os.setgid(gid)
1166
 
        os.setuid(uid)
1167
798
    except OSError, error:
1168
799
        if error[0] != errno.EPERM:
1169
800
            raise error
1170
801
    
1171
 
    # Enable all possible GnuTLS debugging
1172
 
    if debug:
1173
 
        # "Use a log level over 10 to enable all debugging options."
1174
 
        # - GnuTLS manual
1175
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
1176
 
        
1177
 
        @gnutls.library.types.gnutls_log_func
1178
 
        def debug_gnutls(level, string):
1179
 
            logger.debug("GnuTLS: %s", string[:-1])
1180
 
        
1181
 
        (gnutls.library.functions
1182
 
         .gnutls_global_set_log_function(debug_gnutls))
1183
 
    
1184
802
    global service
1185
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1186
803
    service = AvahiService(name = server_settings["servicename"],
1187
 
                           servicetype = "_mandos._tcp",
1188
 
                           protocol = protocol)
 
804
                           servicetype = "_mandos._tcp", )
1189
805
    if server_settings["interface"]:
1190
 
        service.interface = (if_nametoindex
1191
 
                             (server_settings["interface"]))
 
806
        service.interface = if_nametoindex\
 
807
                            (server_settings["interface"])
1192
808
    
1193
809
    global main_loop
1194
810
    global bus
1201
817
                                           avahi.DBUS_PATH_SERVER),
1202
818
                            avahi.DBUS_INTERFACE_SERVER)
1203
819
    # End of Avahi example code
1204
 
    if use_dbus:
1205
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
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()
1206
826
    
1207
827
    clients.update(Set(Client(name = section,
 
828
                              stop_hook = remove_from_clients,
1208
829
                              config
1209
 
                              = dict(client_config.items(section)),
1210
 
                              use_dbus = use_dbus)
 
830
                              = dict(client_config.items(section)))
1211
831
                       for section in client_config.sections()))
1212
832
    if not clients:
1213
 
        logger.warning(u"No clients defined")
 
833
        logger.critical(u"No clients defined")
 
834
        sys.exit(1)
1214
835
    
1215
836
    if debug:
1216
837
        # Redirect stdin so all checkers get /dev/null
1225
846
        daemon()
1226
847
    
1227
848
    try:
1228
 
        with closing(pidfile):
1229
 
            pid = os.getpid()
1230
 
            pidfile.write(str(pid) + "\n")
 
849
        pid = os.getpid()
 
850
        pidfile.write(str(pid) + "\n")
 
851
        pidfile.close()
1231
852
        del pidfile
1232
853
    except IOError:
1233
854
        logger.error(u"Could not write to file %r with PID %d",
1248
869
        
1249
870
        while clients:
1250
871
            client = clients.pop()
1251
 
            client.disable_hook = None
1252
 
            client.disable()
 
872
            client.stop_hook = None
 
873
            client.stop()
1253
874
    
1254
875
    atexit.register(cleanup)
1255
876
    
1258
879
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1259
880
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1260
881
    
1261
 
    if use_dbus:
1262
 
        class MandosDBusService(dbus.service.Object):
1263
 
            """A D-Bus proxy object"""
1264
 
            def __init__(self):
1265
 
                dbus.service.Object.__init__(self, bus, "/")
1266
 
            _interface = u"se.bsnet.fukt.Mandos"
1267
 
            
1268
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1269
 
            def ClientAdded(self, objpath, properties):
1270
 
                "D-Bus signal"
1271
 
                pass
1272
 
            
1273
 
            @dbus.service.signal(_interface, signature="s")
1274
 
            def ClientNotFound(self, fingerprint):
1275
 
                "D-Bus signal"
1276
 
                pass
1277
 
            
1278
 
            @dbus.service.signal(_interface, signature="os")
1279
 
            def ClientRemoved(self, objpath, name):
1280
 
                "D-Bus signal"
1281
 
                pass
1282
 
            
1283
 
            @dbus.service.method(_interface, out_signature="ao")
1284
 
            def GetAllClients(self):
1285
 
                "D-Bus method"
1286
 
                return dbus.Array(c.dbus_object_path for c in clients)
1287
 
            
1288
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1289
 
            def GetAllClientsWithProperties(self):
1290
 
                "D-Bus method"
1291
 
                return dbus.Dictionary(
1292
 
                    ((c.dbus_object_path, c.GetAllProperties())
1293
 
                     for c in clients),
1294
 
                    signature="oa{sv}")
1295
 
            
1296
 
            @dbus.service.method(_interface, in_signature="o")
1297
 
            def RemoveClient(self, object_path):
1298
 
                "D-Bus method"
1299
 
                for c in clients:
1300
 
                    if c.dbus_object_path == object_path:
1301
 
                        clients.remove(c)
1302
 
                        # Don't signal anything except ClientRemoved
1303
 
                        c.use_dbus = False
1304
 
                        c.disable()
1305
 
                        # Emit D-Bus signal
1306
 
                        self.ClientRemoved(object_path, c.name)
1307
 
                        return
1308
 
                raise KeyError
1309
 
            
1310
 
            del _interface
1311
 
        
1312
 
        mandos_dbus_service = MandosDBusService()
1313
 
    
1314
882
    for client in clients:
1315
 
        if use_dbus:
1316
 
            # Emit D-Bus signal
1317
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1318
 
                                            client.GetAllProperties())
1319
 
        client.enable()
 
883
        client.start()
1320
884
    
1321
885
    tcp_server.enable()
1322
886
    tcp_server.server_activate()
1323
887
    
1324
888
    # Find out what port we got
1325
889
    service.port = tcp_server.socket.getsockname()[1]
1326
 
    if use_ipv6:
1327
 
        logger.info(u"Now listening on address %r, port %d,"
1328
 
                    " flowinfo %d, scope_id %d"
1329
 
                    % tcp_server.socket.getsockname())
1330
 
    else:                       # IPv4
1331
 
        logger.info(u"Now listening on address %r, port %d"
1332
 
                    % 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())
1333
892
    
1334
893
    #service.interface = tcp_server.socket.getsockname()[3]
1335
894
    
1345
904
        
1346
905
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1347
906
                             lambda *args, **kwargs:
1348
 
                             (tcp_server.handle_request
1349
 
                              (*args[2:], **kwargs) or True))
 
907
                             tcp_server.handle_request\
 
908
                             (*args[2:], **kwargs) or True)
1350
909
        
1351
910
        logger.debug(u"Starting main loop")
1352
911
        main_loop.run()
1353
912
    except AvahiError, error:
1354
 
        logger.critical(u"AvahiError: %s", error)
 
913
        logger.critical(u"AvahiError: %s" + unicode(error))
1355
914
        sys.exit(1)
1356
915
    except KeyboardInterrupt:
1357
916
        if debug:
1358
 
            print >> sys.stderr
1359
 
        logger.debug("Server received KeyboardInterrupt")
1360
 
    logger.debug("Server exiting")
 
917
            print
1361
918
 
1362
919
if __name__ == '__main__':
1363
920
    main()