/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-02-14 18:07:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090214180705-vu6b7j4i2v2hibgg
Use "getconf" to get correct LFS compile and link flags.

* Makefile (GPGME_CFLAGS): Added output of "getconf LFS_CFLAGS".
  (GPGME_LIBS): Added output of "getconf LFS_LIBS" and
                "getconf LFS_LDFLAGS".
* plugins.d/mandos-client.c: Only define "_LARGEFILE_SOURCE" and
                             "_FILE_OFFSET_BITS" if they are not
                             already defined.

Show diffs side-by-side

added added

removed removed

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