/mandos/release

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

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-04 20:43:31 UTC
  • mfrom: (24.1.17 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080804204331-zgu42g8ii997h1l2
* ca.pem: Removed.
* cert.pem: - '' -
* client-cert.pem: - '' -
* client-key.pem: - '' -
* crl.pem: - '' -
* key.pem: - '' -

* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
                                    to be a union.  All users changed.

* server.py: Changed log severity for many log messages.
  (Client.__init__): Take all config file settins as a dict instead of
                     as keyword arguments.

Show diffs side-by-side

added added

removed removed

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