/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-12-29 02:44:54 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081229024454-nbsei556dwy5azr1
* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

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,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn
 
15
# Copyright © 2008 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
35
35
 
36
36
import SocketServer
37
37
import socket
38
 
import optparse
 
38
from optparse import OptionParser
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
57
57
import logging.handlers
58
58
import pwd
59
59
from contextlib import closing
60
 
import struct
61
 
import fcntl
62
60
 
63
61
import dbus
64
62
import dbus.service
68
66
import ctypes
69
67
import ctypes.util
70
68
 
71
 
try:
72
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
 
except AttributeError:
74
 
    try:
75
 
        from IN import SO_BINDTODEVICE
76
 
    except ImportError:
77
 
        # From /usr/include/asm/socket.h
78
 
        SO_BINDTODEVICE = 25
79
 
 
80
 
 
81
 
version = "1.0.8"
82
 
 
83
 
logger = logging.Logger(u'mandos')
 
69
version = "1.0.2"
 
70
 
 
71
logger = logging.Logger('mandos')
84
72
syslogger = (logging.handlers.SysLogHandler
85
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
86
74
              address = "/dev/log"))
87
75
syslogger.setFormatter(logging.Formatter
88
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
89
 
                        u' %(message)s'))
 
76
                       ('Mandos: %(levelname)s: %(message)s'))
90
77
logger.addHandler(syslogger)
91
78
 
92
79
console = logging.StreamHandler()
93
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
94
 
                                       u' %(levelname)s:'
95
 
                                       u' %(message)s'))
 
80
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
81
                                       ' %(message)s'))
96
82
logger.addHandler(console)
97
83
 
98
84
class AvahiError(Exception):
111
97
 
112
98
class AvahiService(object):
113
99
    """An Avahi (Zeroconf) service.
114
 
    
115
100
    Attributes:
116
101
    interface: integer; avahi.IF_UNSPEC or an interface index.
117
102
               Used to optionally bind to the specified interface.
118
 
    name: string; Example: u'Mandos'
119
 
    type: string; Example: u'_mandos._tcp'.
 
103
    name: string; Example: 'Mandos'
 
104
    type: string; Example: '_mandos._tcp'.
120
105
                  See <http://www.dns-sd.org/ServiceTypes.html>
121
106
    port: integer; what port to announce
122
107
    TXT: list of strings; TXT record for the service
128
113
    """
129
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
130
115
                 servicetype = None, port = None, TXT = None,
131
 
                 domain = u"", host = u"", max_renames = 32768,
132
 
                 protocol = avahi.PROTO_UNSPEC):
 
116
                 domain = "", host = "", max_renames = 32768):
133
117
        self.interface = interface
134
118
        self.name = name
135
119
        self.type = servicetype
139
123
        self.host = host
140
124
        self.rename_count = 0
141
125
        self.max_renames = max_renames
142
 
        self.protocol = protocol
143
126
    def rename(self):
144
127
        """Derived from the Avahi example code"""
145
128
        if self.rename_count >= self.max_renames:
149
132
            raise AvahiServiceError(u"Too many renames")
150
133
        self.name = server.GetAlternativeServiceName(self.name)
151
134
        logger.info(u"Changing Zeroconf service name to %r ...",
152
 
                    self.name)
 
135
                    str(self.name))
153
136
        syslogger.setFormatter(logging.Formatter
154
 
                               (u'Mandos (%s) [%%(process)d]:'
155
 
                                u' %%(levelname)s: %%(message)s'
156
 
                                % self.name))
 
137
                               ('Mandos (%s): %%(levelname)s:'
 
138
                                ' %%(message)s' % self.name))
157
139
        self.remove()
158
140
        self.add()
159
141
        self.rename_count += 1
175
157
                     service.name, service.type)
176
158
        group.AddService(
177
159
                self.interface,         # interface
178
 
                self.protocol,          # protocol
 
160
                avahi.PROTO_INET6,      # protocol
179
161
                dbus.UInt32(0),         # flags
180
162
                self.name, self.type,
181
163
                self.domain, self.host,
193
175
    return dbus.String(dt.isoformat(), variant_level=variant_level)
194
176
 
195
177
 
196
 
class Client(object):
 
178
class Client(dbus.service.Object):
197
179
    """A representation of a client host served by this server.
198
 
    
199
180
    Attributes:
200
 
    name:       string; from the config file, used in log messages and
201
 
                        D-Bus identifiers
 
181
    name:       string; from the config file, used in log messages
202
182
    fingerprint: string (40 or 32 hexadecimal digits); used to
203
183
                 uniquely identify the client
204
184
    secret:     bytestring; sent verbatim (over TLS) to client
221
201
                     client lives.  %() expansions are done at
222
202
                     runtime with vars(self) as dict, so that for
223
203
                     instance %(name)s can be used in the command.
224
 
    current_checker_command: string; current running checker_command
 
204
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
205
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
225
206
    """
226
 
    
227
 
    @staticmethod
228
 
    def _datetime_to_milliseconds(dt):
229
 
        "Convert a datetime.datetime() to milliseconds"
230
 
        return ((dt.days * 24 * 60 * 60 * 1000)
231
 
                + (dt.seconds * 1000)
232
 
                + (dt.microseconds // 1000))
233
 
    
234
207
    def timeout_milliseconds(self):
235
208
        "Return the 'timeout' attribute in milliseconds"
236
 
        return self._datetime_to_milliseconds(self.timeout)
 
209
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
210
                + (self.timeout.seconds * 1000)
 
211
                + (self.timeout.microseconds // 1000))
237
212
    
238
213
    def interval_milliseconds(self):
239
214
        "Return the 'interval' attribute in milliseconds"
240
 
        return self._datetime_to_milliseconds(self.interval)
 
215
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
216
                + (self.interval.seconds * 1000)
 
217
                + (self.interval.microseconds // 1000))
241
218
    
242
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
219
    def __init__(self, name = None, disable_hook=None, config=None,
 
220
                 use_dbus=True):
243
221
        """Note: the 'checker' key in 'config' sets the
244
222
        'checker_command' attribute and *not* the 'checker'
245
223
        attribute."""
247
225
        if config is None:
248
226
            config = {}
249
227
        logger.debug(u"Creating client %r", self.name)
 
228
        self.use_dbus = use_dbus
 
229
        if self.use_dbus:
 
230
            self.dbus_object_path = (dbus.ObjectPath
 
231
                                     ("/Mandos/clients/"
 
232
                                      + self.name.replace(".", "_")))
 
233
            dbus.service.Object.__init__(self, bus,
 
234
                                         self.dbus_object_path)
250
235
        # Uppercase and remove spaces from fingerprint for later
251
236
        # comparison purposes with return value from the fingerprint()
252
237
        # function
253
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
238
        self.fingerprint = (config["fingerprint"].upper()
254
239
                            .replace(u" ", u""))
255
240
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
256
 
        if u"secret" in config:
257
 
            self.secret = config[u"secret"].decode(u"base64")
258
 
        elif u"secfile" in config:
 
241
        if "secret" in config:
 
242
            self.secret = config["secret"].decode(u"base64")
 
243
        elif "secfile" in config:
259
244
            with closing(open(os.path.expanduser
260
245
                              (os.path.expandvars
261
 
                               (config[u"secfile"])))) as secfile:
 
246
                               (config["secfile"])))) as secfile:
262
247
                self.secret = secfile.read()
263
248
        else:
264
249
            raise TypeError(u"No secret or secfile for client %s"
265
250
                            % self.name)
266
 
        self.host = config.get(u"host", u"")
 
251
        self.host = config.get("host", "")
267
252
        self.created = datetime.datetime.utcnow()
268
253
        self.enabled = False
269
254
        self.last_enabled = None
270
255
        self.last_checked_ok = None
271
 
        self.timeout = string_to_delta(config[u"timeout"])
272
 
        self.interval = string_to_delta(config[u"interval"])
 
256
        self.timeout = string_to_delta(config["timeout"])
 
257
        self.interval = string_to_delta(config["interval"])
273
258
        self.disable_hook = disable_hook
274
259
        self.checker = None
275
260
        self.checker_initiator_tag = None
276
261
        self.disable_initiator_tag = None
277
262
        self.checker_callback_tag = None
278
 
        self.checker_command = config[u"checker"]
279
 
        self.current_checker_command = None
280
 
        self.last_connect = None
 
263
        self.checker_command = config["checker"]
281
264
    
282
265
    def enable(self):
283
266
        """Start this client's checker and timeout hooks"""
294
277
                                   (self.timeout_milliseconds(),
295
278
                                    self.disable))
296
279
        self.enabled = True
 
280
        if self.use_dbus:
 
281
            # Emit D-Bus signals
 
282
            self.PropertyChanged(dbus.String(u"enabled"),
 
283
                                 dbus.Boolean(True, variant_level=1))
 
284
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
285
                                 (_datetime_to_dbus(self.last_enabled,
 
286
                                                    variant_level=1)))
297
287
    
298
288
    def disable(self):
299
289
        """Disable this client."""
300
290
        if not getattr(self, "enabled", False):
301
291
            return False
302
292
        logger.info(u"Disabling client %s", self.name)
303
 
        if getattr(self, u"disable_initiator_tag", False):
 
293
        if getattr(self, "disable_initiator_tag", False):
304
294
            gobject.source_remove(self.disable_initiator_tag)
305
295
            self.disable_initiator_tag = None
306
 
        if getattr(self, u"checker_initiator_tag", False):
 
296
        if getattr(self, "checker_initiator_tag", False):
307
297
            gobject.source_remove(self.checker_initiator_tag)
308
298
            self.checker_initiator_tag = None
309
299
        self.stop_checker()
310
300
        if self.disable_hook:
311
301
            self.disable_hook(self)
312
302
        self.enabled = False
 
303
        if self.use_dbus:
 
304
            # Emit D-Bus signal
 
305
            self.PropertyChanged(dbus.String(u"enabled"),
 
306
                                 dbus.Boolean(False, variant_level=1))
313
307
        # Do not run this again if called by a gobject.timeout_add
314
308
        return False
315
309
    
321
315
        """The checker has completed, so take appropriate actions."""
322
316
        self.checker_callback_tag = None
323
317
        self.checker = None
324
 
        if os.WIFEXITED(condition):
325
 
            exitstatus = os.WEXITSTATUS(condition)
326
 
            if exitstatus == 0:
327
 
                logger.info(u"Checker for %(name)s succeeded",
328
 
                            vars(self))
329
 
                self.checked_ok()
330
 
            else:
331
 
                logger.info(u"Checker for %(name)s failed",
332
 
                            vars(self))
333
 
        else:
 
318
        if self.use_dbus:
 
319
            # Emit D-Bus signal
 
320
            self.PropertyChanged(dbus.String(u"checker_running"),
 
321
                                 dbus.Boolean(False, variant_level=1))
 
322
        if (os.WIFEXITED(condition)
 
323
            and (os.WEXITSTATUS(condition) == 0)):
 
324
            logger.info(u"Checker for %(name)s succeeded",
 
325
                        vars(self))
 
326
            if self.use_dbus:
 
327
                # Emit D-Bus signal
 
328
                self.CheckerCompleted(dbus.Boolean(True),
 
329
                                      dbus.UInt16(condition),
 
330
                                      dbus.String(command))
 
331
            self.bump_timeout()
 
332
        elif not os.WIFEXITED(condition):
334
333
            logger.warning(u"Checker for %(name)s crashed?",
335
334
                           vars(self))
 
335
            if self.use_dbus:
 
336
                # Emit D-Bus signal
 
337
                self.CheckerCompleted(dbus.Boolean(False),
 
338
                                      dbus.UInt16(condition),
 
339
                                      dbus.String(command))
 
340
        else:
 
341
            logger.info(u"Checker for %(name)s failed",
 
342
                        vars(self))
 
343
            if self.use_dbus:
 
344
                # Emit D-Bus signal
 
345
                self.CheckerCompleted(dbus.Boolean(False),
 
346
                                      dbus.UInt16(condition),
 
347
                                      dbus.String(command))
336
348
    
337
 
    def checked_ok(self):
 
349
    def bump_timeout(self):
338
350
        """Bump up the timeout for this client.
339
 
        
340
351
        This should only be called when the client has been seen,
341
352
        alive and well.
342
353
        """
345
356
        self.disable_initiator_tag = (gobject.timeout_add
346
357
                                      (self.timeout_milliseconds(),
347
358
                                       self.disable))
 
359
        if self.use_dbus:
 
360
            # Emit D-Bus signal
 
361
            self.PropertyChanged(
 
362
                dbus.String(u"last_checked_ok"),
 
363
                (_datetime_to_dbus(self.last_checked_ok,
 
364
                                   variant_level=1)))
348
365
    
349
366
    def start_checker(self):
350
367
        """Start a new checker subprocess if one is not running.
351
 
        
352
368
        If a checker already exists, leave it running and do
353
369
        nothing."""
354
370
        # The reason for not killing a running checker is that if we
359
375
        # checkers alone, the checker would have to take more time
360
376
        # than 'timeout' for the client to be declared invalid, which
361
377
        # is as it should be.
362
 
        
363
 
        # If a checker exists, make sure it is not a zombie
364
 
        if self.checker is not None:
365
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
366
 
            if pid:
367
 
                logger.warning(u"Checker was a zombie")
368
 
                gobject.source_remove(self.checker_callback_tag)
369
 
                self.checker_callback(pid, status,
370
 
                                      self.current_checker_command)
371
 
        # Start a new checker if needed
372
378
        if self.checker is None:
373
379
            try:
374
380
                # In case checker_command has exactly one % operator
375
381
                command = self.checker_command % self.host
376
382
            except TypeError:
377
383
                # Escape attributes for the shell
378
 
                escaped_attrs = dict((key,
379
 
                                      re.escape(unicode(str(val),
380
 
                                                        errors=
381
 
                                                        u'replace')))
 
384
                escaped_attrs = dict((key, re.escape(str(val)))
382
385
                                     for key, val in
383
386
                                     vars(self).iteritems())
384
387
                try:
387
390
                    logger.error(u'Could not format string "%s":'
388
391
                                 u' %s', self.checker_command, error)
389
392
                    return True # Try again later
390
 
            self.current_checker_command = command
391
393
            try:
392
394
                logger.info(u"Starting checker %r for %s",
393
395
                            command, self.name)
397
399
                # always replaced by /dev/null.)
398
400
                self.checker = subprocess.Popen(command,
399
401
                                                close_fds=True,
400
 
                                                shell=True, cwd=u"/")
 
402
                                                shell=True, cwd="/")
 
403
                if self.use_dbus:
 
404
                    # Emit D-Bus signal
 
405
                    self.CheckerStarted(command)
 
406
                    self.PropertyChanged(
 
407
                        dbus.String("checker_running"),
 
408
                        dbus.Boolean(True, variant_level=1))
401
409
                self.checker_callback_tag = (gobject.child_watch_add
402
410
                                             (self.checker.pid,
403
411
                                              self.checker_callback,
404
412
                                              data=command))
405
 
                # The checker may have completed before the gobject
406
 
                # watch was added.  Check for this.
407
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
408
 
                if pid:
409
 
                    gobject.source_remove(self.checker_callback_tag)
410
 
                    self.checker_callback(pid, status, command)
411
413
            except OSError, error:
412
414
                logger.error(u"Failed to start subprocess: %s",
413
415
                             error)
419
421
        if self.checker_callback_tag:
420
422
            gobject.source_remove(self.checker_callback_tag)
421
423
            self.checker_callback_tag = None
422
 
        if getattr(self, u"checker", None) is None:
 
424
        if getattr(self, "checker", None) is None:
423
425
            return
424
426
        logger.debug(u"Stopping checker for %(name)s", vars(self))
425
427
        try:
431
433
            if error.errno != errno.ESRCH: # No such process
432
434
                raise
433
435
        self.checker = None
 
436
        if self.use_dbus:
 
437
            self.PropertyChanged(dbus.String(u"checker_running"),
 
438
                                 dbus.Boolean(False, variant_level=1))
434
439
    
435
440
    def still_valid(self):
436
441
        """Has the timeout not yet passed for this client?"""
437
 
        if not getattr(self, u"enabled", False):
 
442
        if not getattr(self, "enabled", False):
438
443
            return False
439
444
        now = datetime.datetime.utcnow()
440
445
        if self.last_checked_ok is None:
441
446
            return now < (self.created + self.timeout)
442
447
        else:
443
448
            return now < (self.last_checked_ok + self.timeout)
444
 
 
445
 
 
446
 
class ClientDBus(Client, dbus.service.Object):
447
 
    """A Client class using D-Bus
448
 
    
449
 
    Attributes:
450
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
451
 
    """
452
 
    # dbus.service.Object doesn't use super(), so we can't either.
453
 
    
454
 
    def __init__(self, *args, **kwargs):
455
 
        Client.__init__(self, *args, **kwargs)
456
 
        # Only now, when this client is initialized, can it show up on
457
 
        # the D-Bus
458
 
        self.dbus_object_path = (dbus.ObjectPath
459
 
                                 (u"/clients/"
460
 
                                  + self.name.replace(u".", u"_")))
461
 
        dbus.service.Object.__init__(self, bus,
462
 
                                     self.dbus_object_path)
463
 
    def enable(self):
464
 
        oldstate = getattr(self, u"enabled", False)
465
 
        r = Client.enable(self)
466
 
        if oldstate != self.enabled:
467
 
            # Emit D-Bus signals
468
 
            self.PropertyChanged(dbus.String(u"enabled"),
469
 
                                 dbus.Boolean(True, variant_level=1))
470
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
471
 
                                 (_datetime_to_dbus(self.last_enabled,
472
 
                                                    variant_level=1)))
473
 
        return r
474
 
    
475
 
    def disable(self, signal = True):
476
 
        oldstate = getattr(self, u"enabled", False)
477
 
        r = Client.disable(self)
478
 
        if signal and oldstate != self.enabled:
479
 
            # Emit D-Bus signal
480
 
            self.PropertyChanged(dbus.String(u"enabled"),
481
 
                                 dbus.Boolean(False, variant_level=1))
482
 
        return r
483
 
    
484
 
    def __del__(self, *args, **kwargs):
485
 
        try:
486
 
            self.remove_from_connection()
487
 
        except LookupError:
488
 
            pass
489
 
        if hasattr(dbus.service.Object, u"__del__"):
490
 
            dbus.service.Object.__del__(self, *args, **kwargs)
491
 
        Client.__del__(self, *args, **kwargs)
492
 
    
493
 
    def checker_callback(self, pid, condition, command,
494
 
                         *args, **kwargs):
495
 
        self.checker_callback_tag = None
496
 
        self.checker = None
497
 
        # Emit D-Bus signal
498
 
        self.PropertyChanged(dbus.String(u"checker_running"),
499
 
                             dbus.Boolean(False, variant_level=1))
500
 
        if os.WIFEXITED(condition):
501
 
            exitstatus = os.WEXITSTATUS(condition)
502
 
            # Emit D-Bus signal
503
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
504
 
                                  dbus.Int64(condition),
505
 
                                  dbus.String(command))
506
 
        else:
507
 
            # Emit D-Bus signal
508
 
            self.CheckerCompleted(dbus.Int16(-1),
509
 
                                  dbus.Int64(condition),
510
 
                                  dbus.String(command))
511
 
        
512
 
        return Client.checker_callback(self, pid, condition, command,
513
 
                                       *args, **kwargs)
514
 
    
515
 
    def checked_ok(self, *args, **kwargs):
516
 
        r = Client.checked_ok(self, *args, **kwargs)
517
 
        # Emit D-Bus signal
518
 
        self.PropertyChanged(
519
 
            dbus.String(u"last_checked_ok"),
520
 
            (_datetime_to_dbus(self.last_checked_ok,
521
 
                               variant_level=1)))
522
 
        return r
523
 
    
524
 
    def start_checker(self, *args, **kwargs):
525
 
        old_checker = self.checker
526
 
        if self.checker is not None:
527
 
            old_checker_pid = self.checker.pid
528
 
        else:
529
 
            old_checker_pid = None
530
 
        r = Client.start_checker(self, *args, **kwargs)
531
 
        # Only if new checker process was started
532
 
        if (self.checker is not None
533
 
            and old_checker_pid != self.checker.pid):
534
 
            # Emit D-Bus signal
535
 
            self.CheckerStarted(self.current_checker_command)
536
 
            self.PropertyChanged(
537
 
                dbus.String(u"checker_running"),
538
 
                dbus.Boolean(True, variant_level=1))
539
 
        return r
540
 
    
541
 
    def stop_checker(self, *args, **kwargs):
542
 
        old_checker = getattr(self, u"checker", None)
543
 
        r = Client.stop_checker(self, *args, **kwargs)
544
 
        if (old_checker is not None
545
 
            and getattr(self, u"checker", None) is None):
546
 
            self.PropertyChanged(dbus.String(u"checker_running"),
547
 
                                 dbus.Boolean(False, variant_level=1))
548
 
        return r
549
449
    
550
450
    ## D-Bus methods & signals
551
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
451
    _interface = u"org.mandos_system.Mandos.Client"
552
452
    
553
 
    # CheckedOK - method
554
 
    @dbus.service.method(_interface)
555
 
    def CheckedOK(self):
556
 
        return self.checked_ok()
 
453
    # BumpTimeout - method
 
454
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
 
455
    BumpTimeout.__name__ = "BumpTimeout"
557
456
    
558
457
    # CheckerCompleted - signal
559
 
    @dbus.service.signal(_interface, signature=u"nxs")
560
 
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
458
    @dbus.service.signal(_interface, signature="bqs")
 
459
    def CheckerCompleted(self, success, condition, command):
561
460
        "D-Bus signal"
562
461
        pass
563
462
    
564
463
    # CheckerStarted - signal
565
 
    @dbus.service.signal(_interface, signature=u"s")
 
464
    @dbus.service.signal(_interface, signature="s")
566
465
    def CheckerStarted(self, command):
567
466
        "D-Bus signal"
568
467
        pass
569
468
    
570
469
    # GetAllProperties - method
571
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
 
470
    @dbus.service.method(_interface, out_signature="a{sv}")
572
471
    def GetAllProperties(self):
573
472
        "D-Bus method"
574
473
        return dbus.Dictionary({
575
 
                dbus.String(u"name"):
 
474
                dbus.String("name"):
576
475
                    dbus.String(self.name, variant_level=1),
577
 
                dbus.String(u"fingerprint"):
 
476
                dbus.String("fingerprint"):
578
477
                    dbus.String(self.fingerprint, variant_level=1),
579
 
                dbus.String(u"host"):
 
478
                dbus.String("host"):
580
479
                    dbus.String(self.host, variant_level=1),
581
 
                dbus.String(u"created"):
 
480
                dbus.String("created"):
582
481
                    _datetime_to_dbus(self.created, variant_level=1),
583
 
                dbus.String(u"last_enabled"):
 
482
                dbus.String("last_enabled"):
584
483
                    (_datetime_to_dbus(self.last_enabled,
585
484
                                       variant_level=1)
586
485
                     if self.last_enabled is not None
587
486
                     else dbus.Boolean(False, variant_level=1)),
588
 
                dbus.String(u"enabled"):
 
487
                dbus.String("enabled"):
589
488
                    dbus.Boolean(self.enabled, variant_level=1),
590
 
                dbus.String(u"last_checked_ok"):
 
489
                dbus.String("last_checked_ok"):
591
490
                    (_datetime_to_dbus(self.last_checked_ok,
592
491
                                       variant_level=1)
593
492
                     if self.last_checked_ok is not None
594
493
                     else dbus.Boolean (False, variant_level=1)),
595
 
                dbus.String(u"timeout"):
 
494
                dbus.String("timeout"):
596
495
                    dbus.UInt64(self.timeout_milliseconds(),
597
496
                                variant_level=1),
598
 
                dbus.String(u"interval"):
 
497
                dbus.String("interval"):
599
498
                    dbus.UInt64(self.interval_milliseconds(),
600
499
                                variant_level=1),
601
 
                dbus.String(u"checker"):
 
500
                dbus.String("checker"):
602
501
                    dbus.String(self.checker_command,
603
502
                                variant_level=1),
604
 
                dbus.String(u"checker_running"):
 
503
                dbus.String("checker_running"):
605
504
                    dbus.Boolean(self.checker is not None,
606
505
                                 variant_level=1),
607
 
                dbus.String(u"object_path"):
608
 
                    dbus.ObjectPath(self.dbus_object_path,
609
 
                                    variant_level=1)
610
 
                }, signature=u"sv")
 
506
                }, signature="sv")
611
507
    
612
508
    # IsStillValid - method
613
 
    @dbus.service.method(_interface, out_signature=u"b")
614
 
    def IsStillValid(self):
615
 
        return self.still_valid()
 
509
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
510
                    (still_valid))
 
511
    IsStillValid.__name__ = "IsStillValid"
616
512
    
617
513
    # PropertyChanged - signal
618
 
    @dbus.service.signal(_interface, signature=u"sv")
 
514
    @dbus.service.signal(_interface, signature="sv")
619
515
    def PropertyChanged(self, property, value):
620
516
        "D-Bus signal"
621
517
        pass
622
518
    
623
 
    # ReceivedSecret - signal
624
 
    @dbus.service.signal(_interface)
625
 
    def ReceivedSecret(self):
626
 
        "D-Bus signal"
627
 
        pass
628
 
    
629
 
    # Rejected - signal
630
 
    @dbus.service.signal(_interface)
631
 
    def Rejected(self):
632
 
        "D-Bus signal"
633
 
        pass
634
 
    
635
519
    # SetChecker - method
636
 
    @dbus.service.method(_interface, in_signature=u"s")
 
520
    @dbus.service.method(_interface, in_signature="s")
637
521
    def SetChecker(self, checker):
638
522
        "D-Bus setter method"
639
523
        self.checker_command = checker
643
527
                                         variant_level=1))
644
528
    
645
529
    # SetHost - method
646
 
    @dbus.service.method(_interface, in_signature=u"s")
 
530
    @dbus.service.method(_interface, in_signature="s")
647
531
    def SetHost(self, host):
648
532
        "D-Bus setter method"
649
533
        self.host = host
652
536
                             dbus.String(self.host, variant_level=1))
653
537
    
654
538
    # SetInterval - method
655
 
    @dbus.service.method(_interface, in_signature=u"t")
 
539
    @dbus.service.method(_interface, in_signature="t")
656
540
    def SetInterval(self, milliseconds):
657
541
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
658
542
        # Emit D-Bus signal
661
545
                                          variant_level=1)))
662
546
    
663
547
    # SetSecret - method
664
 
    @dbus.service.method(_interface, in_signature=u"ay",
 
548
    @dbus.service.method(_interface, in_signature="ay",
665
549
                         byte_arrays=True)
666
550
    def SetSecret(self, secret):
667
551
        "D-Bus setter method"
668
552
        self.secret = str(secret)
669
553
    
670
554
    # SetTimeout - method
671
 
    @dbus.service.method(_interface, in_signature=u"t")
 
555
    @dbus.service.method(_interface, in_signature="t")
672
556
    def SetTimeout(self, milliseconds):
673
557
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
674
558
        # Emit D-Bus signal
677
561
                                          variant_level=1)))
678
562
    
679
563
    # Enable - method
680
 
    @dbus.service.method(_interface)
681
 
    def Enable(self):
682
 
        "D-Bus method"
683
 
        self.enable()
 
564
    Enable = dbus.service.method(_interface)(enable)
 
565
    Enable.__name__ = "Enable"
684
566
    
685
567
    # StartChecker - method
686
568
    @dbus.service.method(_interface)
695
577
        self.disable()
696
578
    
697
579
    # StopChecker - method
698
 
    @dbus.service.method(_interface)
699
 
    def StopChecker(self):
700
 
        self.stop_checker()
 
580
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
581
    StopChecker.__name__ = "StopChecker"
701
582
    
702
583
    del _interface
703
584
 
704
585
 
705
 
class ClientHandler(SocketServer.BaseRequestHandler, object):
706
 
    """A class to handle client connections.
707
 
    
708
 
    Instantiated once for each connection to handle it.
 
586
def peer_certificate(session):
 
587
    "Return the peer's OpenPGP certificate as a bytestring"
 
588
    # If not an OpenPGP certificate...
 
589
    if (gnutls.library.functions
 
590
        .gnutls_certificate_type_get(session._c_object)
 
591
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
592
        # ...do the normal thing
 
593
        return session.peer_certificate
 
594
    list_size = ctypes.c_uint()
 
595
    cert_list = (gnutls.library.functions
 
596
                 .gnutls_certificate_get_peers
 
597
                 (session._c_object, ctypes.byref(list_size)))
 
598
    if list_size.value == 0:
 
599
        return None
 
600
    cert = cert_list[0]
 
601
    return ctypes.string_at(cert.data, cert.size)
 
602
 
 
603
 
 
604
def fingerprint(openpgp):
 
605
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
606
    # New GnuTLS "datum" with the OpenPGP public key
 
607
    datum = (gnutls.library.types
 
608
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
609
                                         ctypes.POINTER
 
610
                                         (ctypes.c_ubyte)),
 
611
                             ctypes.c_uint(len(openpgp))))
 
612
    # New empty GnuTLS certificate
 
613
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
614
    (gnutls.library.functions
 
615
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
616
    # Import the OpenPGP public key into the certificate
 
617
    (gnutls.library.functions
 
618
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
619
                                gnutls.library.constants
 
620
                                .GNUTLS_OPENPGP_FMT_RAW))
 
621
    # Verify the self signature in the key
 
622
    crtverify = ctypes.c_uint()
 
623
    (gnutls.library.functions
 
624
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
625
    if crtverify.value != 0:
 
626
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
627
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
628
    # New buffer for the fingerprint
 
629
    buf = ctypes.create_string_buffer(20)
 
630
    buf_len = ctypes.c_size_t()
 
631
    # Get the fingerprint from the certificate into the buffer
 
632
    (gnutls.library.functions
 
633
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
634
                                         ctypes.byref(buf_len)))
 
635
    # Deinit the certificate
 
636
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
637
    # Convert the buffer to a Python bytestring
 
638
    fpr = ctypes.string_at(buf, buf_len.value)
 
639
    # Convert the bytestring to hexadecimal notation
 
640
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
641
    return hex_fpr
 
642
 
 
643
 
 
644
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
645
    """A TCP request handler class.
 
646
    Instantiated by IPv6_TCPServer for each request to handle it.
709
647
    Note: This will run in its own forked process."""
710
648
    
711
649
    def handle(self):
712
650
        logger.info(u"TCP connection from: %s",
713
651
                    unicode(self.client_address))
714
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
715
 
        # Open IPC pipe to parent process
716
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
717
 
            session = (gnutls.connection
718
 
                       .ClientSession(self.request,
719
 
                                      gnutls.connection
720
 
                                      .X509Credentials()))
721
 
            
722
 
            line = self.request.makefile().readline()
723
 
            logger.debug(u"Protocol version: %r", line)
724
 
            try:
725
 
                if int(line.strip().split()[0]) > 1:
726
 
                    raise RuntimeError
727
 
            except (ValueError, IndexError, RuntimeError), error:
728
 
                logger.error(u"Unknown protocol version: %s", error)
729
 
                return
730
 
            
731
 
            # Note: gnutls.connection.X509Credentials is really a
732
 
            # generic GnuTLS certificate credentials object so long as
733
 
            # no X.509 keys are added to it.  Therefore, we can use it
734
 
            # here despite using OpenPGP certificates.
735
 
            
736
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
737
 
            #                      u"+AES-256-CBC", u"+SHA1",
738
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
739
 
            #                      u"+DHE-DSS"))
740
 
            # Use a fallback default, since this MUST be set.
741
 
            priority = self.server.gnutls_priority
742
 
            if priority is None:
743
 
                priority = u"NORMAL"
744
 
            (gnutls.library.functions
745
 
             .gnutls_priority_set_direct(session._c_object,
746
 
                                         priority, None))
747
 
            
748
 
            try:
749
 
                session.handshake()
750
 
            except gnutls.errors.GNUTLSError, error:
751
 
                logger.warning(u"Handshake failed: %s", error)
752
 
                # Do not run session.bye() here: the session is not
753
 
                # established.  Just abandon the request.
754
 
                return
755
 
            logger.debug(u"Handshake succeeded")
756
 
            try:
757
 
                fpr = self.fingerprint(self.peer_certificate(session))
758
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
759
 
                logger.warning(u"Bad certificate: %s", error)
760
 
                session.bye()
761
 
                return
762
 
            logger.debug(u"Fingerprint: %s", fpr)
763
 
            
764
 
            for c in self.server.clients:
765
 
                if c.fingerprint == fpr:
766
 
                    client = c
767
 
                    break
768
 
            else:
769
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
770
 
                session.bye()
771
 
                return
772
 
            # Have to check if client.still_valid(), since it is
773
 
            # possible that the client timed out while establishing
774
 
            # the GnuTLS session.
775
 
            if not client.still_valid():
776
 
                ipc.write(u"INVALID %s\n" % client.name)
777
 
                session.bye()
778
 
                return
779
 
            ipc.write(u"SENDING %s\n" % client.name)
780
 
            sent_size = 0
781
 
            while sent_size < len(client.secret):
782
 
                sent = session.send(client.secret[sent_size:])
783
 
                logger.debug(u"Sent: %d, remaining: %d",
784
 
                             sent, len(client.secret)
785
 
                             - (sent_size + sent))
786
 
                sent_size += sent
787
 
            session.bye()
788
 
    
789
 
    @staticmethod
790
 
    def peer_certificate(session):
791
 
        "Return the peer's OpenPGP certificate as a bytestring"
792
 
        # If not an OpenPGP certificate...
793
 
        if (gnutls.library.functions
794
 
            .gnutls_certificate_type_get(session._c_object)
795
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
796
 
            # ...do the normal thing
797
 
            return session.peer_certificate
798
 
        list_size = ctypes.c_uint(1)
799
 
        cert_list = (gnutls.library.functions
800
 
                     .gnutls_certificate_get_peers
801
 
                     (session._c_object, ctypes.byref(list_size)))
802
 
        if not bool(cert_list) and list_size.value != 0:
803
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
804
 
                                            u" certificate")
805
 
        if list_size.value == 0:
806
 
            return None
807
 
        cert = cert_list[0]
808
 
        return ctypes.string_at(cert.data, cert.size)
809
 
    
810
 
    @staticmethod
811
 
    def fingerprint(openpgp):
812
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
813
 
        # New GnuTLS "datum" with the OpenPGP public key
814
 
        datum = (gnutls.library.types
815
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
816
 
                                             ctypes.POINTER
817
 
                                             (ctypes.c_ubyte)),
818
 
                                 ctypes.c_uint(len(openpgp))))
819
 
        # New empty GnuTLS certificate
820
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
821
 
        (gnutls.library.functions
822
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
823
 
        # Import the OpenPGP public key into the certificate
824
 
        (gnutls.library.functions
825
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
826
 
                                    gnutls.library.constants
827
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
828
 
        # Verify the self signature in the key
829
 
        crtverify = ctypes.c_uint()
830
 
        (gnutls.library.functions
831
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
832
 
                                         ctypes.byref(crtverify)))
833
 
        if crtverify.value != 0:
834
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
835
 
            raise (gnutls.errors.CertificateSecurityError
836
 
                   (u"Verify failed"))
837
 
        # New buffer for the fingerprint
838
 
        buf = ctypes.create_string_buffer(20)
839
 
        buf_len = ctypes.c_size_t()
840
 
        # Get the fingerprint from the certificate into the buffer
841
 
        (gnutls.library.functions
842
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
843
 
                                             ctypes.byref(buf_len)))
844
 
        # Deinit the certificate
845
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
846
 
        # Convert the buffer to a Python bytestring
847
 
        fpr = ctypes.string_at(buf, buf_len.value)
848
 
        # Convert the bytestring to hexadecimal notation
849
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
850
 
        return hex_fpr
851
 
 
852
 
 
853
 
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
854
 
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
855
 
    
856
 
    Assumes a gobject.MainLoop event loop.
857
 
    """
858
 
    def process_request(self, request, client_address):
859
 
        """Overrides and wraps the original process_request().
860
 
        
861
 
        This function creates a new pipe in self.pipe 
862
 
        """
863
 
        self.pipe = os.pipe()
864
 
        super(ForkingMixInWithPipe,
865
 
              self).process_request(request, client_address)
866
 
        os.close(self.pipe[1])  # close write end
867
 
        # Call "handle_ipc" for both data and EOF events
868
 
        gobject.io_add_watch(self.pipe[0],
869
 
                             gobject.IO_IN | gobject.IO_HUP,
870
 
                             self.handle_ipc)
871
 
    def handle_ipc(source, condition):
872
 
        """Dummy function; override as necessary"""
873
 
        os.close(source)
874
 
        return False
875
 
 
876
 
 
877
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
652
        session = (gnutls.connection
 
653
                   .ClientSession(self.request,
 
654
                                  gnutls.connection
 
655
                                  .X509Credentials()))
 
656
        
 
657
        line = self.request.makefile().readline()
 
658
        logger.debug(u"Protocol version: %r", line)
 
659
        try:
 
660
            if int(line.strip().split()[0]) > 1:
 
661
                raise RuntimeError
 
662
        except (ValueError, IndexError, RuntimeError), error:
 
663
            logger.error(u"Unknown protocol version: %s", error)
 
664
            return
 
665
        
 
666
        # Note: gnutls.connection.X509Credentials is really a generic
 
667
        # GnuTLS certificate credentials object so long as no X.509
 
668
        # keys are added to it.  Therefore, we can use it here despite
 
669
        # using OpenPGP certificates.
 
670
        
 
671
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
672
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
673
        #                "+DHE-DSS"))
 
674
        # Use a fallback default, since this MUST be set.
 
675
        priority = self.server.settings.get("priority", "NORMAL")
 
676
        (gnutls.library.functions
 
677
         .gnutls_priority_set_direct(session._c_object,
 
678
                                     priority, None))
 
679
        
 
680
        try:
 
681
            session.handshake()
 
682
        except gnutls.errors.GNUTLSError, error:
 
683
            logger.warning(u"Handshake failed: %s", error)
 
684
            # Do not run session.bye() here: the session is not
 
685
            # established.  Just abandon the request.
 
686
            return
 
687
        try:
 
688
            fpr = fingerprint(peer_certificate(session))
 
689
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
690
            logger.warning(u"Bad certificate: %s", error)
 
691
            session.bye()
 
692
            return
 
693
        logger.debug(u"Fingerprint: %s", fpr)
 
694
        for c in self.server.clients:
 
695
            if c.fingerprint == fpr:
 
696
                client = c
 
697
                break
 
698
        else:
 
699
            logger.warning(u"Client not found for fingerprint: %s",
 
700
                           fpr)
 
701
            session.bye()
 
702
            return
 
703
        # Have to check if client.still_valid(), since it is possible
 
704
        # that the client timed out while establishing the GnuTLS
 
705
        # session.
 
706
        if not client.still_valid():
 
707
            logger.warning(u"Client %(name)s is invalid",
 
708
                           vars(client))
 
709
            session.bye()
 
710
            return
 
711
        ## This won't work here, since we're in a fork.
 
712
        # client.bump_timeout()
 
713
        sent_size = 0
 
714
        while sent_size < len(client.secret):
 
715
            sent = session.send(client.secret[sent_size:])
 
716
            logger.debug(u"Sent: %d, remaining: %d",
 
717
                         sent, len(client.secret)
 
718
                         - (sent_size + sent))
 
719
            sent_size += sent
 
720
        session.bye()
 
721
 
 
722
 
 
723
class IPv6_TCPServer(SocketServer.ForkingMixIn,
878
724
                     SocketServer.TCPServer, object):
879
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
880
 
    
 
725
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
881
726
    Attributes:
 
727
        settings:       Server settings
 
728
        clients:        Set() of Client objects
882
729
        enabled:        Boolean; whether this server is activated yet
883
 
        interface:      None or a network interface name (string)
884
 
        use_ipv6:       Boolean; to use IPv6 or not
885
 
        ----
886
 
        clients:        Set() of Client objects
887
 
        gnutls_priority GnuTLS priority string
888
 
        use_dbus:       Boolean; to emit D-Bus signals or not
889
730
    """
890
 
    def __init__(self, server_address, RequestHandlerClass,
891
 
                 interface=None, use_ipv6=True, clients=None,
892
 
                 gnutls_priority=None, use_dbus=True):
 
731
    address_family = socket.AF_INET6
 
732
    def __init__(self, *args, **kwargs):
 
733
        if "settings" in kwargs:
 
734
            self.settings = kwargs["settings"]
 
735
            del kwargs["settings"]
 
736
        if "clients" in kwargs:
 
737
            self.clients = kwargs["clients"]
 
738
            del kwargs["clients"]
893
739
        self.enabled = False
894
 
        self.interface = interface
895
 
        if use_ipv6:
896
 
            self.address_family = socket.AF_INET6
897
 
        self.clients = clients
898
 
        self.use_dbus = use_dbus
899
 
        self.gnutls_priority = gnutls_priority
900
 
        SocketServer.TCPServer.__init__(self, server_address,
901
 
                                        RequestHandlerClass)
 
740
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
902
741
    def server_bind(self):
903
742
        """This overrides the normal server_bind() function
904
743
        to bind to an interface if one was specified, and also NOT to
905
744
        bind to an address or port if they were not specified."""
906
 
        if self.interface is not None:
 
745
        if self.settings["interface"]:
 
746
            # 25 is from /usr/include/asm-i486/socket.h
 
747
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
907
748
            try:
908
749
                self.socket.setsockopt(socket.SOL_SOCKET,
909
750
                                       SO_BINDTODEVICE,
910
 
                                       str(self.interface + u'\0'))
 
751
                                       self.settings["interface"])
911
752
            except socket.error, error:
912
753
                if error[0] == errno.EPERM:
913
754
                    logger.error(u"No permission to"
914
755
                                 u" bind to interface %s",
915
 
                                 self.interface)
 
756
                                 self.settings["interface"])
916
757
                else:
917
 
                    raise
 
758
                    raise error
918
759
        # Only bind(2) the socket if we really need to.
919
760
        if self.server_address[0] or self.server_address[1]:
920
761
            if not self.server_address[0]:
921
 
                if self.address_family == socket.AF_INET6:
922
 
                    any_address = u"::" # in6addr_any
923
 
                else:
924
 
                    any_address = socket.INADDR_ANY
925
 
                self.server_address = (any_address,
 
762
                in6addr_any = "::"
 
763
                self.server_address = (in6addr_any,
926
764
                                       self.server_address[1])
927
765
            elif not self.server_address[1]:
928
766
                self.server_address = (self.server_address[0],
929
767
                                       0)
930
 
#                 if self.interface:
 
768
#                 if self.settings["interface"]:
931
769
#                     self.server_address = (self.server_address[0],
932
770
#                                            0, # port
933
771
#                                            0, # flowinfo
934
772
#                                            if_nametoindex
935
 
#                                            (self.interface))
936
 
            return SocketServer.TCPServer.server_bind(self)
 
773
#                                            (self.settings
 
774
#                                             ["interface"]))
 
775
            return super(IPv6_TCPServer, self).server_bind()
937
776
    def server_activate(self):
938
777
        if self.enabled:
939
 
            return SocketServer.TCPServer.server_activate(self)
 
778
            return super(IPv6_TCPServer, self).server_activate()
940
779
    def enable(self):
941
780
        self.enabled = True
942
 
    def handle_ipc(self, source, condition, file_objects={}):
943
 
        condition_names = {
944
 
            gobject.IO_IN: u"IN",   # There is data to read.
945
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
946
 
                                    # blocking).
947
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
948
 
            gobject.IO_ERR: u"ERR", # Error condition.
949
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
950
 
                                    # broken, usually for pipes and
951
 
                                    # sockets).
952
 
            }
953
 
        conditions_string = ' | '.join(name
954
 
                                       for cond, name in
955
 
                                       condition_names.iteritems()
956
 
                                       if cond & condition)
957
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
958
 
                     conditions_string)
959
 
        
960
 
        # Turn the pipe file descriptor into a Python file object
961
 
        if source not in file_objects:
962
 
            file_objects[source] = os.fdopen(source, u"r", 1)
963
 
        
964
 
        # Read a line from the file object
965
 
        cmdline = file_objects[source].readline()
966
 
        if not cmdline:             # Empty line means end of file
967
 
            # close the IPC pipe
968
 
            file_objects[source].close()
969
 
            del file_objects[source]
970
 
            
971
 
            # Stop calling this function
972
 
            return False
973
 
        
974
 
        logger.debug(u"IPC command: %r", cmdline)
975
 
        
976
 
        # Parse and act on command
977
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
978
 
        
979
 
        if cmd == u"NOTFOUND":
980
 
            logger.warning(u"Client not found for fingerprint: %s",
981
 
                           args)
982
 
            if self.use_dbus:
983
 
                # Emit D-Bus signal
984
 
                mandos_dbus_service.ClientNotFound(args)
985
 
        elif cmd == u"INVALID":
986
 
            for client in self.clients:
987
 
                if client.name == args:
988
 
                    logger.warning(u"Client %s is invalid", args)
989
 
                    if self.use_dbus:
990
 
                        # Emit D-Bus signal
991
 
                        client.Rejected()
992
 
                    break
993
 
            else:
994
 
                logger.error(u"Unknown client %s is invalid", args)
995
 
        elif cmd == u"SENDING":
996
 
            for client in self.clients:
997
 
                if client.name == args:
998
 
                    logger.info(u"Sending secret to %s", client.name)
999
 
                    client.checked_ok()
1000
 
                    if self.use_dbus:
1001
 
                        # Emit D-Bus signal
1002
 
                        client.ReceivedSecret()
1003
 
                    break
1004
 
            else:
1005
 
                logger.error(u"Sending secret to unknown client %s",
1006
 
                             args)
1007
 
        else:
1008
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1009
 
        
1010
 
        # Keep calling this function
1011
 
        return True
1012
781
 
1013
782
 
1014
783
def string_to_delta(interval):
1015
784
    """Parse a string and return a datetime.timedelta
1016
 
    
1017
 
    >>> string_to_delta(u'7d')
 
785
 
 
786
    >>> string_to_delta('7d')
1018
787
    datetime.timedelta(7)
1019
 
    >>> string_to_delta(u'60s')
 
788
    >>> string_to_delta('60s')
1020
789
    datetime.timedelta(0, 60)
1021
 
    >>> string_to_delta(u'60m')
 
790
    >>> string_to_delta('60m')
1022
791
    datetime.timedelta(0, 3600)
1023
 
    >>> string_to_delta(u'24h')
 
792
    >>> string_to_delta('24h')
1024
793
    datetime.timedelta(1)
1025
794
    >>> string_to_delta(u'1w')
1026
795
    datetime.timedelta(7)
1027
 
    >>> string_to_delta(u'5m 30s')
 
796
    >>> string_to_delta('5m 30s')
1028
797
    datetime.timedelta(0, 330)
1029
798
    """
1030
799
    timevalue = datetime.timedelta(0)
1074
843
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
1075
844
 
1076
845
def if_nametoindex(interface):
1077
 
    """Call the C function if_nametoindex(), or equivalent
1078
 
    
1079
 
    Note: This function cannot accept a unicode string."""
 
846
    """Call the C function if_nametoindex(), or equivalent"""
1080
847
    global if_nametoindex
1081
848
    try:
1082
849
        if_nametoindex = (ctypes.cdll.LoadLibrary
1083
 
                          (ctypes.util.find_library(u"c"))
 
850
                          (ctypes.util.find_library("c"))
1084
851
                          .if_nametoindex)
1085
852
    except (OSError, AttributeError):
1086
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
853
        if "struct" not in sys.modules:
 
854
            import struct
 
855
        if "fcntl" not in sys.modules:
 
856
            import fcntl
1087
857
        def if_nametoindex(interface):
1088
858
            "Get an interface index the hard way, i.e. using fcntl()"
1089
859
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1090
860
            with closing(socket.socket()) as s:
1091
861
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1092
 
                                    struct.pack(str(u"16s16x"),
1093
 
                                                interface))
1094
 
            interface_index = struct.unpack(str(u"I"),
1095
 
                                            ifreq[16:20])[0]
 
862
                                    struct.pack("16s16x", interface))
 
863
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1096
864
            return interface_index
1097
865
    return if_nametoindex(interface)
1098
866
 
1099
867
 
1100
868
def daemon(nochdir = False, noclose = False):
1101
869
    """See daemon(3).  Standard BSD Unix function.
1102
 
    
1103
870
    This should really exist as os.daemon, but it doesn't (yet)."""
1104
871
    if os.fork():
1105
872
        sys.exit()
1106
873
    os.setsid()
1107
874
    if not nochdir:
1108
 
        os.chdir(u"/")
 
875
        os.chdir("/")
1109
876
    if os.fork():
1110
877
        sys.exit()
1111
878
    if not noclose:
1113
880
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1114
881
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1115
882
            raise OSError(errno.ENODEV,
1116
 
                          u"/dev/null not a character device")
 
883
                          "/dev/null not a character device")
1117
884
        os.dup2(null, sys.stdin.fileno())
1118
885
        os.dup2(null, sys.stdout.fileno())
1119
886
        os.dup2(null, sys.stderr.fileno())
1122
889
 
1123
890
 
1124
891
def main():
1125
 
    
1126
 
    ######################################################################
1127
 
    # Parsing of options, both command line and config file
1128
 
    
1129
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1130
 
    parser.add_option("-i", u"--interface", type=u"string",
1131
 
                      metavar="IF", help=u"Bind to interface IF")
1132
 
    parser.add_option("-a", u"--address", type=u"string",
1133
 
                      help=u"Address to listen for requests on")
1134
 
    parser.add_option("-p", u"--port", type=u"int",
1135
 
                      help=u"Port number to receive requests on")
1136
 
    parser.add_option("--check", action=u"store_true",
1137
 
                      help=u"Run self-test")
1138
 
    parser.add_option("--debug", action=u"store_true",
1139
 
                      help=u"Debug mode; run in foreground and log to"
1140
 
                      u" terminal")
1141
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1142
 
                      u" priority string (see GnuTLS documentation)")
1143
 
    parser.add_option("--servicename", type=u"string",
1144
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1145
 
    parser.add_option("--configdir", type=u"string",
1146
 
                      default=u"/etc/mandos", metavar=u"DIR",
1147
 
                      help=u"Directory to search for configuration"
1148
 
                      u" files")
1149
 
    parser.add_option("--no-dbus", action=u"store_false",
1150
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1151
 
                      u" system bus interface")
1152
 
    parser.add_option("--no-ipv6", action=u"store_false",
1153
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
892
    parser = OptionParser(version = "%%prog %s" % version)
 
893
    parser.add_option("-i", "--interface", type="string",
 
894
                      metavar="IF", help="Bind to interface IF")
 
895
    parser.add_option("-a", "--address", type="string",
 
896
                      help="Address to listen for requests on")
 
897
    parser.add_option("-p", "--port", type="int",
 
898
                      help="Port number to receive requests on")
 
899
    parser.add_option("--check", action="store_true",
 
900
                      help="Run self-test")
 
901
    parser.add_option("--debug", action="store_true",
 
902
                      help="Debug mode; run in foreground and log to"
 
903
                      " terminal")
 
904
    parser.add_option("--priority", type="string", help="GnuTLS"
 
905
                      " priority string (see GnuTLS documentation)")
 
906
    parser.add_option("--servicename", type="string", metavar="NAME",
 
907
                      help="Zeroconf service name")
 
908
    parser.add_option("--configdir", type="string",
 
909
                      default="/etc/mandos", metavar="DIR",
 
910
                      help="Directory to search for configuration"
 
911
                      " files")
 
912
    parser.add_option("--no-dbus", action="store_false",
 
913
                      dest="use_dbus",
 
914
                      help="Do not provide D-Bus system bus"
 
915
                      " interface")
1154
916
    options = parser.parse_args()[0]
1155
917
    
1156
918
    if options.check:
1159
921
        sys.exit()
1160
922
    
1161
923
    # Default values for config file for server-global settings
1162
 
    server_defaults = { u"interface": u"",
1163
 
                        u"address": u"",
1164
 
                        u"port": u"",
1165
 
                        u"debug": u"False",
1166
 
                        u"priority":
1167
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1168
 
                        u"servicename": u"Mandos",
1169
 
                        u"use_dbus": u"True",
1170
 
                        u"use_ipv6": u"True",
 
924
    server_defaults = { "interface": "",
 
925
                        "address": "",
 
926
                        "port": "",
 
927
                        "debug": "False",
 
928
                        "priority":
 
929
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
930
                        "servicename": "Mandos",
 
931
                        "use_dbus": "True",
1171
932
                        }
1172
933
    
1173
934
    # Parse config file for server-global settings
1174
935
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1175
936
    del server_defaults
1176
 
    server_config.read(os.path.join(options.configdir,
1177
 
                                    u"mandos.conf"))
 
937
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1178
938
    # Convert the SafeConfigParser object to a dict
1179
939
    server_settings = server_config.defaults()
1180
 
    # Use the appropriate methods on the non-string config options
1181
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1182
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1183
 
                                                           option)
1184
 
    if server_settings["port"]:
1185
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1186
 
                                                       u"port")
 
940
    # Use getboolean on the boolean config options
 
941
    server_settings["debug"] = (server_config.getboolean
 
942
                                ("DEFAULT", "debug"))
 
943
    server_settings["use_dbus"] = (server_config.getboolean
 
944
                                   ("DEFAULT", "use_dbus"))
1187
945
    del server_config
1188
946
    
1189
947
    # Override the settings from the config file with command line
1190
948
    # options, if set.
1191
 
    for option in (u"interface", u"address", u"port", u"debug",
1192
 
                   u"priority", u"servicename", u"configdir",
1193
 
                   u"use_dbus", u"use_ipv6"):
 
949
    for option in ("interface", "address", "port", "debug",
 
950
                   "priority", "servicename", "configdir",
 
951
                   "use_dbus"):
1194
952
        value = getattr(options, option)
1195
953
        if value is not None:
1196
954
            server_settings[option] = value
1197
955
    del options
1198
 
    # Force all strings to be unicode
1199
 
    for option in server_settings.keys():
1200
 
        if type(server_settings[option]) is str:
1201
 
            server_settings[option] = unicode(server_settings[option])
1202
956
    # Now we have our good server settings in "server_settings"
1203
957
    
1204
 
    ##################################################################
1205
 
    
1206
958
    # For convenience
1207
 
    debug = server_settings[u"debug"]
1208
 
    use_dbus = server_settings[u"use_dbus"]
1209
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
959
    debug = server_settings["debug"]
 
960
    use_dbus = server_settings["use_dbus"]
1210
961
    
1211
962
    if not debug:
1212
963
        syslogger.setLevel(logging.WARNING)
1213
964
        console.setLevel(logging.WARNING)
1214
965
    
1215
 
    if server_settings[u"servicename"] != u"Mandos":
 
966
    if server_settings["servicename"] != "Mandos":
1216
967
        syslogger.setFormatter(logging.Formatter
1217
 
                               (u'Mandos (%s) [%%(process)d]:'
1218
 
                                u' %%(levelname)s: %%(message)s'
1219
 
                                % server_settings[u"servicename"]))
 
968
                               ('Mandos (%s): %%(levelname)s:'
 
969
                                ' %%(message)s'
 
970
                                % server_settings["servicename"]))
1220
971
    
1221
972
    # Parse config file with clients
1222
 
    client_defaults = { u"timeout": u"1h",
1223
 
                        u"interval": u"5m",
1224
 
                        u"checker": u"fping -q -- %%(host)s",
1225
 
                        u"host": u"",
 
973
    client_defaults = { "timeout": "1h",
 
974
                        "interval": "5m",
 
975
                        "checker": "fping -q -- %(host)s",
 
976
                        "host": "",
1226
977
                        }
1227
978
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1228
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1229
 
                                    u"clients.conf"))
1230
 
    
1231
 
    global mandos_dbus_service
1232
 
    mandos_dbus_service = None
 
979
    client_config.read(os.path.join(server_settings["configdir"],
 
980
                                    "clients.conf"))
1233
981
    
1234
982
    clients = Set()
1235
 
    tcp_server = IPv6_TCPServer((server_settings[u"address"],
1236
 
                                 server_settings[u"port"]),
1237
 
                                ClientHandler,
1238
 
                                interface=
1239
 
                                server_settings[u"interface"],
1240
 
                                use_ipv6=use_ipv6,
1241
 
                                clients=clients,
1242
 
                                gnutls_priority=
1243
 
                                server_settings[u"priority"],
1244
 
                                use_dbus=use_dbus)
1245
 
    pidfilename = u"/var/run/mandos.pid"
 
983
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
984
                                 server_settings["port"]),
 
985
                                TCP_handler,
 
986
                                settings=server_settings,
 
987
                                clients=clients)
 
988
    pidfilename = "/var/run/mandos.pid"
1246
989
    try:
1247
 
        pidfile = open(pidfilename, u"w")
1248
 
    except IOError:
1249
 
        logger.error(u"Could not open file %r", pidfilename)
 
990
        pidfile = open(pidfilename, "w")
 
991
    except IOError, error:
 
992
        logger.error("Could not open file %r", pidfilename)
1250
993
    
1251
994
    try:
1252
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1253
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
995
        uid = pwd.getpwnam("_mandos").pw_uid
1254
996
    except KeyError:
1255
997
        try:
1256
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1257
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
998
            uid = pwd.getpwnam("mandos").pw_uid
1258
999
        except KeyError:
1259
1000
            try:
1260
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1261
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1001
                uid = pwd.getpwnam("nobody").pw_uid
1262
1002
            except KeyError:
1263
1003
                uid = 65534
 
1004
    try:
 
1005
        gid = pwd.getpwnam("_mandos").pw_gid
 
1006
    except KeyError:
 
1007
        try:
 
1008
            gid = pwd.getpwnam("mandos").pw_gid
 
1009
        except KeyError:
 
1010
            try:
 
1011
                gid = pwd.getpwnam("nogroup").pw_gid
 
1012
            except KeyError:
1264
1013
                gid = 65534
1265
1014
    try:
 
1015
        os.setuid(uid)
1266
1016
        os.setgid(gid)
1267
 
        os.setuid(uid)
1268
1017
    except OSError, error:
1269
1018
        if error[0] != errno.EPERM:
1270
1019
            raise error
1271
1020
    
1272
 
    # Enable all possible GnuTLS debugging
1273
 
    if debug:
1274
 
        # "Use a log level over 10 to enable all debugging options."
1275
 
        # - GnuTLS manual
1276
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
1277
 
        
1278
 
        @gnutls.library.types.gnutls_log_func
1279
 
        def debug_gnutls(level, string):
1280
 
            logger.debug(u"GnuTLS: %s", string[:-1])
1281
 
        
1282
 
        (gnutls.library.functions
1283
 
         .gnutls_global_set_log_function(debug_gnutls))
1284
 
    
1285
1021
    global service
1286
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1287
 
    service = AvahiService(name = server_settings[u"servicename"],
1288
 
                           servicetype = u"_mandos._tcp",
1289
 
                           protocol = protocol)
 
1022
    service = AvahiService(name = server_settings["servicename"],
 
1023
                           servicetype = "_mandos._tcp", )
1290
1024
    if server_settings["interface"]:
1291
1025
        service.interface = (if_nametoindex
1292
 
                             (str(server_settings[u"interface"])))
 
1026
                             (server_settings["interface"]))
1293
1027
    
1294
1028
    global main_loop
1295
1029
    global bus
1303
1037
                            avahi.DBUS_INTERFACE_SERVER)
1304
1038
    # End of Avahi example code
1305
1039
    if use_dbus:
1306
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1040
        bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
 
1041
                                        bus)
1307
1042
    
1308
 
    client_class = Client
1309
 
    if use_dbus:
1310
 
        client_class = ClientDBus
1311
 
    clients.update(Set(
1312
 
            client_class(name = section,
1313
 
                         config= dict(client_config.items(section)))
1314
 
            for section in client_config.sections()))
 
1043
    clients.update(Set(Client(name = section,
 
1044
                              config
 
1045
                              = dict(client_config.items(section)),
 
1046
                              use_dbus = use_dbus)
 
1047
                       for section in client_config.sections()))
1315
1048
    if not clients:
1316
 
        logger.warning(u"No clients defined")
 
1049
        logger.critical(u"No clients defined")
 
1050
        sys.exit(1)
1317
1051
    
1318
1052
    if debug:
1319
1053
        # Redirect stdin so all checkers get /dev/null
1328
1062
        daemon()
1329
1063
    
1330
1064
    try:
1331
 
        with closing(pidfile):
1332
 
            pid = os.getpid()
1333
 
            pidfile.write(str(pid) + "\n")
 
1065
        pid = os.getpid()
 
1066
        pidfile.write(str(pid) + "\n")
 
1067
        pidfile.close()
1334
1068
        del pidfile
1335
1069
    except IOError:
1336
1070
        logger.error(u"Could not write to file %r with PID %d",
1362
1096
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1363
1097
    
1364
1098
    if use_dbus:
1365
 
        class MandosDBusService(dbus.service.Object):
 
1099
        class MandosServer(dbus.service.Object):
1366
1100
            """A D-Bus proxy object"""
1367
1101
            def __init__(self):
1368
 
                dbus.service.Object.__init__(self, bus, u"/")
1369
 
            _interface = u"se.bsnet.fukt.Mandos"
1370
 
            
1371
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
 
1102
                dbus.service.Object.__init__(self, bus,
 
1103
                                             "/Mandos")
 
1104
            _interface = u"org.mandos_system.Mandos"
 
1105
 
 
1106
            @dbus.service.signal(_interface, signature="oa{sv}")
1372
1107
            def ClientAdded(self, objpath, properties):
1373
1108
                "D-Bus signal"
1374
1109
                pass
1375
 
            
1376
 
            @dbus.service.signal(_interface, signature=u"s")
1377
 
            def ClientNotFound(self, fingerprint):
1378
 
                "D-Bus signal"
1379
 
                pass
1380
 
            
1381
 
            @dbus.service.signal(_interface, signature=u"os")
1382
 
            def ClientRemoved(self, objpath, name):
1383
 
                "D-Bus signal"
1384
 
                pass
1385
 
            
1386
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1110
 
 
1111
            @dbus.service.signal(_interface, signature="o")
 
1112
            def ClientRemoved(self, objpath):
 
1113
                "D-Bus signal"
 
1114
                pass
 
1115
 
 
1116
            @dbus.service.method(_interface, out_signature="ao")
1387
1117
            def GetAllClients(self):
1388
 
                "D-Bus method"
1389
1118
                return dbus.Array(c.dbus_object_path for c in clients)
1390
 
            
1391
 
            @dbus.service.method(_interface,
1392
 
                                 out_signature=u"a{oa{sv}}")
 
1119
 
 
1120
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1393
1121
            def GetAllClientsWithProperties(self):
1394
 
                "D-Bus method"
1395
1122
                return dbus.Dictionary(
1396
1123
                    ((c.dbus_object_path, c.GetAllProperties())
1397
1124
                     for c in clients),
1398
 
                    signature=u"oa{sv}")
1399
 
            
1400
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1125
                    signature="oa{sv}")
 
1126
 
 
1127
            @dbus.service.method(_interface, in_signature="o")
1401
1128
            def RemoveClient(self, object_path):
1402
 
                "D-Bus method"
1403
1129
                for c in clients:
1404
1130
                    if c.dbus_object_path == object_path:
1405
1131
                        clients.remove(c)
1406
 
                        c.remove_from_connection()
1407
1132
                        # Don't signal anything except ClientRemoved
1408
 
                        c.disable(signal=False)
 
1133
                        c.use_dbus = False
 
1134
                        c.disable()
1409
1135
                        # Emit D-Bus signal
1410
 
                        self.ClientRemoved(object_path, c.name)
 
1136
                        self.ClientRemoved(object_path)
1411
1137
                        return
1412
1138
                raise KeyError
1413
 
            
 
1139
 
1414
1140
            del _interface
1415
 
        
1416
 
        mandos_dbus_service = MandosDBusService()
 
1141
    
 
1142
        mandos_server = MandosServer()
1417
1143
    
1418
1144
    for client in clients:
1419
1145
        if use_dbus:
1420
1146
            # Emit D-Bus signal
1421
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1422
 
                                            client.GetAllProperties())
 
1147
            mandos_server.ClientAdded(client.dbus_object_path,
 
1148
                                      client.GetAllProperties())
1423
1149
        client.enable()
1424
1150
    
1425
1151
    tcp_server.enable()
1427
1153
    
1428
1154
    # Find out what port we got
1429
1155
    service.port = tcp_server.socket.getsockname()[1]
1430
 
    if use_ipv6:
1431
 
        logger.info(u"Now listening on address %r, port %d,"
1432
 
                    " flowinfo %d, scope_id %d"
1433
 
                    % tcp_server.socket.getsockname())
1434
 
    else:                       # IPv4
1435
 
        logger.info(u"Now listening on address %r, port %d"
1436
 
                    % tcp_server.socket.getsockname())
 
1156
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
1157
                u" scope_id %d" % tcp_server.socket.getsockname())
1437
1158
    
1438
1159
    #service.interface = tcp_server.socket.getsockname()[3]
1439
1160
    
1440
1161
    try:
1441
1162
        # From the Avahi example code
1442
 
        server.connect_to_signal(u"StateChanged", server_state_changed)
 
1163
        server.connect_to_signal("StateChanged", server_state_changed)
1443
1164
        try:
1444
1165
            server_state_changed(server.GetState())
1445
1166
        except dbus.exceptions.DBusException, error:
1459
1180
        sys.exit(1)
1460
1181
    except KeyboardInterrupt:
1461
1182
        if debug:
1462
 
            print >> sys.stderr
1463
 
        logger.debug(u"Server received KeyboardInterrupt")
1464
 
    logger.debug(u"Server exiting")
 
1183
            print
1465
1184
 
1466
1185
if __name__ == '__main__':
1467
1186
    main()