/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-07 21:45:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080807214541-pyg8itw6kphz1dy5
* plugbasedclient.c: Renamed to "mandos-client.c".  All users changed.

* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
                            All users changed.

* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
                          All users changed.

* server.conf: Renamed to "mandos.conf".  All users changed.

* server.py: Renamed to "mandos".
  (daemon): Have default values for arguments. Caller changed.

* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
                                                       "clean".
  (check, run-client, run-server): New.

* network-protocol.txt: New.

Show diffs side-by-side

added added

removed removed

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