/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

* clients.conf.xml: Renamed to "mandos-clients.conf.xml".

* Makefile (DOCBOOKTOMAN, DOCS): New
  (all): Include $(DOCS)
  (%.5: %.xml, %.8: %.xml, %.8mandos: %.xml): New.
  (clean): Also remove $(DOCS)

Show diffs side-by-side

added added

removed removed

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