/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-01-31 10:33:17 UTC
  • mfrom: (24.1.129 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090131103317-wzqvyr532sjcjt7u
Merge from Björn:

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

Show diffs side-by-side

added added

removed removed

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