/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 at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
65
68
 
66
69
import dbus
67
70
import dbus.service
72
75
import ctypes.util
73
76
import xml.dom.minidom
74
77
import inspect
 
78
import GnuPGInterface
75
79
 
76
80
try:
77
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
85
    except ImportError:
82
86
        SO_BINDTODEVICE = None
83
87
 
84
 
 
85
 
version = "1.3.1"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
88
version = "1.5.0"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
89
92
syslogger = (logging.handlers.SysLogHandler
90
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
94
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(debug, level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class PGPError(Exception):
 
132
    """Exception if encryption/decryption fails"""
 
133
    pass
 
134
 
 
135
 
 
136
class PGPEngine(object):
 
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
 
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
 
147
    
 
148
    def __enter__(self):
 
149
        return self
 
150
    
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
        self._cleanup()
 
153
        return False
 
154
    
 
155
    def __del__(self):
 
156
        self._cleanup()
 
157
    
 
158
    def _cleanup(self):
 
159
        if self.tempdir is not None:
 
160
            # Delete contents of tempdir
 
161
            for root, dirs, files in os.walk(self.tempdir,
 
162
                                             topdown = False):
 
163
                for filename in files:
 
164
                    os.remove(os.path.join(root, filename))
 
165
                for dirname in dirs:
 
166
                    os.rmdir(os.path.join(root, dirname))
 
167
            # Remove tempdir
 
168
            os.rmdir(self.tempdir)
 
169
            self.tempdir = None
 
170
    
 
171
    def password_encode(self, password):
 
172
        # Passphrase can not be empty and can not contain newlines or
 
173
        # NUL bytes.  So we prefix it and hex encode it.
 
174
        return b"mandos" + binascii.hexlify(password)
 
175
    
 
176
    def encrypt(self, data, password):
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
 
191
        return ciphertext
 
192
    
 
193
    def decrypt(self, data, password):
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
 
208
        return decrypted_plaintext
 
209
 
 
210
 
102
211
 
103
212
class AvahiError(Exception):
104
213
    def __init__(self, value, *args, **kwargs):
159
268
                            " after %i retries, exiting.",
160
269
                            self.rename_count)
161
270
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
163
273
        logger.info("Changing Zeroconf service name to %r ...",
164
274
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
275
        self.remove()
170
276
        try:
171
277
            self.add()
191
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
298
        self.entry_group_state_changed_match = (
193
299
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
195
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
302
                     self.name, self.type)
197
303
        self.group.AddService(
223
329
            try:
224
330
                self.group.Free()
225
331
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
332
                    dbus.exceptions.DBusException):
227
333
                pass
228
334
            self.group = None
229
335
        self.remove()
263
369
                                 self.server_state_changed)
264
370
        self.server_state_changed(self.server.GetState())
265
371
 
 
372
class AvahiServiceToSyslog(AvahiService):
 
373
    def rename(self):
 
374
        """Add the new name to the syslog messages"""
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
 
380
        return ret
266
381
 
267
 
def _timedelta_to_milliseconds(td):
 
382
def timedelta_to_milliseconds(td):
268
383
    "Convert a datetime.timedelta() to milliseconds"
269
384
    return ((td.days * 24 * 60 * 60 * 1000)
270
385
            + (td.seconds * 1000)
274
389
    """A representation of a client host served by this server.
275
390
    
276
391
    Attributes:
277
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
278
393
    approval_delay: datetime.timedelta(); Time to wait for approval
279
394
    approval_duration: datetime.timedelta(); Duration of one approval
280
395
    checker:    subprocess.Popen(); a running checker process used
287
402
                     instance %(name)s can be used in the command.
288
403
    checker_initiator_tag: a gobject event source tag, or None
289
404
    created:    datetime.datetime(); (UTC) object creation
 
405
    client_structure: Object describing what attributes a client has
 
406
                      and is used for storing the client at exit
290
407
    current_checker_command: string; current running checker_command
291
 
    disable_hook:  If set, called by disable() as disable_hook(self)
292
408
    disable_initiator_tag: a gobject event source tag, or None
293
409
    enabled:    bool()
294
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
297
413
    interval:   datetime.timedelta(); How often to start a new checker
298
414
    last_approval_request: datetime.datetime(); (UTC) or None
299
415
    last_checked_ok: datetime.datetime(); (UTC) or None
300
 
    last_enabled: datetime.datetime(); (UTC)
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, or None.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
301
420
    name:       string; from the config file, used in log messages and
302
421
                        D-Bus identifiers
303
422
    secret:     bytestring; sent verbatim (over TLS) to client
313
432
                          "created", "enabled", "fingerprint",
314
433
                          "host", "interval", "last_checked_ok",
315
434
                          "last_enabled", "name", "timeout")
316
 
        
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
 
445
    
317
446
    def timeout_milliseconds(self):
318
447
        "Return the 'timeout' attribute in milliseconds"
319
 
        return _timedelta_to_milliseconds(self.timeout)
320
 
 
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
321
450
    def extended_timeout_milliseconds(self):
322
451
        "Return the 'extended_timeout' attribute in milliseconds"
323
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
324
453
    
325
454
    def interval_milliseconds(self):
326
455
        "Return the 'interval' attribute in milliseconds"
327
 
        return _timedelta_to_milliseconds(self.interval)
328
 
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
329
458
    def approval_delay_milliseconds(self):
330
 
        return _timedelta_to_milliseconds(self.approval_delay)
331
 
    
332
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
 
461
    @staticmethod
 
462
    def config_parser(config):
 
463
        """Construct a new dict of client settings of this form:
 
464
        { client_name: {setting_name: value, ...}, ...}
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
 
469
        settings = {}
 
470
        for client_name in config.sections():
 
471
            section = dict(config.items(client_name))
 
472
            client = settings[client_name] = {}
 
473
            
 
474
            client["host"] = section["host"]
 
475
            # Reformat values from string types to Python types
 
476
            client["approved_by_default"] = config.getboolean(
 
477
                client_name, "approved_by_default")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
 
480
            
 
481
            client["fingerprint"] = (section["fingerprint"].upper()
 
482
                                     .replace(" ", ""))
 
483
            if "secret" in section:
 
484
                client["secret"] = section["secret"].decode("base64")
 
485
            elif "secfile" in section:
 
486
                with open(os.path.expanduser(os.path.expandvars
 
487
                                             (section["secfile"])),
 
488
                          "rb") as secfile:
 
489
                    client["secret"] = secfile.read()
 
490
            else:
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
 
493
            client["timeout"] = string_to_delta(section["timeout"])
 
494
            client["extended_timeout"] = string_to_delta(
 
495
                section["extended_timeout"])
 
496
            client["interval"] = string_to_delta(section["interval"])
 
497
            client["approval_delay"] = string_to_delta(
 
498
                section["approval_delay"])
 
499
            client["approval_duration"] = string_to_delta(
 
500
                section["approval_duration"])
 
501
            client["checker_command"] = section["checker"]
 
502
            client["last_approval_request"] = None
 
503
            client["last_checked_ok"] = None
 
504
            client["last_checker_status"] = None
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
333
510
        """Note: the 'checker' key in 'config' sets the
334
511
        'checker_command' attribute and *not* the 'checker'
335
512
        attribute."""
336
513
        self.name = name
337
 
        if config is None:
338
 
            config = {}
 
514
        # adding all client settings
 
515
        for setting, value in settings.iteritems():
 
516
            setattr(self, setting, value)
 
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
339
528
        logger.debug("Creating client %r", self.name)
340
529
        # Uppercase and remove spaces from fingerprint for later
341
530
        # comparison purposes with return value from the fingerprint()
342
531
        # function
343
 
        self.fingerprint = (config["fingerprint"].upper()
344
 
                            .replace(" ", ""))
345
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
346
 
        if "secret" in config:
347
 
            self.secret = config["secret"].decode("base64")
348
 
        elif "secfile" in config:
349
 
            with open(os.path.expanduser(os.path.expandvars
350
 
                                         (config["secfile"])),
351
 
                      "rb") as secfile:
352
 
                self.secret = secfile.read()
353
 
        else:
354
 
            raise TypeError("No secret or secfile for client %s"
355
 
                            % self.name)
356
 
        self.host = config.get("host", "")
357
 
        self.created = datetime.datetime.utcnow()
358
 
        self.enabled = False
359
 
        self.last_approval_request = None
360
 
        self.last_enabled = None
361
 
        self.last_checked_ok = None
362
 
        self.timeout = string_to_delta(config["timeout"])
363
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
364
 
        self.interval = string_to_delta(config["interval"])
365
 
        self.disable_hook = disable_hook
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
366
537
        self.checker = None
367
538
        self.checker_initiator_tag = None
368
539
        self.disable_initiator_tag = None
369
 
        self.expires = None
370
540
        self.checker_callback_tag = None
371
 
        self.checker_command = config["checker"]
372
541
        self.current_checker_command = None
373
 
        self.last_connect = None
374
 
        self._approved = None
375
 
        self.approved_by_default = config.get("approved_by_default",
376
 
                                              True)
 
542
        self.approved = None
377
543
        self.approvals_pending = 0
378
 
        self.approval_delay = string_to_delta(
379
 
            config["approval_delay"])
380
 
        self.approval_duration = string_to_delta(
381
 
            config["approval_duration"])
382
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
 
549
                                 if not attr.startswith("_")]
 
550
        self.client_structure.append("client_structure")
 
551
        
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
 
556
            if not name.startswith("_"):
 
557
                self.client_structure.append(name)
383
558
    
 
559
    # Send notice to process children that client state has changed
384
560
    def send_changedstate(self):
385
 
        self.changedstate.acquire()
386
 
        self.changedstate.notify_all()
387
 
        self.changedstate.release()
388
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
389
564
    def enable(self):
390
565
        """Start this client's checker and timeout hooks"""
391
566
        if getattr(self, "enabled", False):
392
567
            # Already enabled
393
568
            return
394
569
        self.send_changedstate()
395
 
        # Schedule a new checker to be started an 'interval' from now,
396
 
        # and every interval from then on.
397
 
        self.checker_initiator_tag = (gobject.timeout_add
398
 
                                      (self.interval_milliseconds(),
399
 
                                       self.start_checker))
400
 
        # Schedule a disable() when 'timeout' has passed
401
570
        self.expires = datetime.datetime.utcnow() + self.timeout
402
 
        self.disable_initiator_tag = (gobject.timeout_add
403
 
                                   (self.timeout_milliseconds(),
404
 
                                    self.disable))
405
571
        self.enabled = True
406
572
        self.last_enabled = datetime.datetime.utcnow()
407
 
        # Also start a new checker *right now*.
408
 
        self.start_checker()
 
573
        self.init_checker()
409
574
    
410
575
    def disable(self, quiet=True):
411
576
        """Disable this client."""
423
588
            gobject.source_remove(self.checker_initiator_tag)
424
589
            self.checker_initiator_tag = None
425
590
        self.stop_checker()
426
 
        if self.disable_hook:
427
 
            self.disable_hook(self)
428
591
        self.enabled = False
429
592
        # Do not run this again if called by a gobject.timeout_add
430
593
        return False
431
594
    
432
595
    def __del__(self):
433
 
        self.disable_hook = None
434
596
        self.disable()
435
597
    
 
598
    def init_checker(self):
 
599
        # Schedule a new checker to be started an 'interval' from now,
 
600
        # and every interval from then on.
 
601
        self.checker_initiator_tag = (gobject.timeout_add
 
602
                                      (self.interval_milliseconds(),
 
603
                                       self.start_checker))
 
604
        # Schedule a disable() when 'timeout' has passed
 
605
        self.disable_initiator_tag = (gobject.timeout_add
 
606
                                   (self.timeout_milliseconds(),
 
607
                                    self.disable))
 
608
        # Also start a new checker *right now*.
 
609
        self.start_checker()
 
610
    
436
611
    def checker_callback(self, pid, condition, command):
437
612
        """The checker has completed, so take appropriate actions."""
438
613
        self.checker_callback_tag = None
439
614
        self.checker = None
440
615
        if os.WIFEXITED(condition):
441
 
            exitstatus = os.WEXITSTATUS(condition)
442
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
443
618
                logger.info("Checker for %(name)s succeeded",
444
619
                            vars(self))
445
620
                self.checked_ok()
447
622
                logger.info("Checker for %(name)s failed",
448
623
                            vars(self))
449
624
        else:
 
625
            self.last_checker_status = -1
450
626
            logger.warning("Checker for %(name)s crashed?",
451
627
                           vars(self))
452
628
    
459
635
        if timeout is None:
460
636
            timeout = self.timeout
461
637
        self.last_checked_ok = datetime.datetime.utcnow()
462
 
        gobject.source_remove(self.disable_initiator_tag)
463
 
        self.expires = datetime.datetime.utcnow() + timeout
464
 
        self.disable_initiator_tag = (gobject.timeout_add
465
 
                                      (_timedelta_to_milliseconds(timeout),
466
 
                                       self.disable))
 
638
        if self.disable_initiator_tag is not None:
 
639
            gobject.source_remove(self.disable_initiator_tag)
 
640
        if getattr(self, "enabled", False):
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
 
644
            self.expires = datetime.datetime.utcnow() + timeout
467
645
    
468
646
    def need_approval(self):
469
647
        self.last_approval_request = datetime.datetime.utcnow()
509
687
                                       'replace')))
510
688
                    for attr in
511
689
                    self.runtime_expansions)
512
 
 
 
690
                
513
691
                try:
514
692
                    command = self.checker_command % escaped_attrs
515
693
                except TypeError as error:
561
739
                raise
562
740
        self.checker = None
563
741
 
 
742
 
564
743
def dbus_service_property(dbus_interface, signature="v",
565
744
                          access="readwrite", byte_arrays=False):
566
745
    """Decorators for marking methods of a DBusObjectWithProperties to
612
791
 
613
792
class DBusObjectWithProperties(dbus.service.Object):
614
793
    """A D-Bus object with properties.
615
 
 
 
794
    
616
795
    Classes inheriting from this can use the dbus_service_property
617
796
    decorator to expose methods as D-Bus properties.  It exposes the
618
797
    standard Get(), Set(), and GetAll() methods on the D-Bus.
625
804
    def _get_all_dbus_properties(self):
626
805
        """Returns a generator of (name, attribute) pairs
627
806
        """
628
 
        return ((prop._dbus_name, prop)
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
                for cls in self.__class__.__mro__
629
809
                for name, prop in
630
 
                inspect.getmembers(self, self._is_dbus_property))
 
810
                inspect.getmembers(cls, self._is_dbus_property))
631
811
    
632
812
    def _get_dbus_property(self, interface_name, property_name):
633
813
        """Returns a bound method if one exists which is a D-Bus
634
814
        property with the specified name and interface.
635
815
        """
636
 
        for name in (property_name,
637
 
                     property_name + "_dbus_property"):
638
 
            prop = getattr(self, name, None)
639
 
            if (prop is None
640
 
                or not self._is_dbus_property(prop)
641
 
                or prop._dbus_name != property_name
642
 
                or (interface_name and prop._dbus_interface
643
 
                    and interface_name != prop._dbus_interface)):
644
 
                continue
645
 
            return prop
 
816
        for cls in  self.__class__.__mro__:
 
817
            for name, value in (inspect.getmembers
 
818
                                (cls, self._is_dbus_property)):
 
819
                if (value._dbus_name == property_name
 
820
                    and value._dbus_interface == interface_name):
 
821
                    return value.__get__(self)
 
822
        
646
823
        # No such property
647
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
825
                                   + interface_name + "."
673
850
            # signatures other than "ay".
674
851
            if prop._dbus_signature != "ay":
675
852
                raise ValueError
676
 
            value = dbus.ByteArray(''.join(unichr(byte)
677
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
678
855
        prop(value)
679
856
    
680
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
859
    def GetAll(self, interface_name):
683
860
        """Standard D-Bus property GetAll() method, see D-Bus
684
861
        standard.
685
 
 
 
862
        
686
863
        Note: Will not include properties with access="write".
687
864
        """
688
 
        all = {}
 
865
        properties = {}
689
866
        for name, prop in self._get_all_dbus_properties():
690
867
            if (interface_name
691
868
                and interface_name != prop._dbus_interface):
696
873
                continue
697
874
            value = prop()
698
875
            if not hasattr(value, "variant_level"):
699
 
                all[name] = value
 
876
                properties[name] = value
700
877
                continue
701
 
            all[name] = type(value)(value, variant_level=
702
 
                                    value.variant_level+1)
703
 
        return dbus.Dictionary(all, signature="sv")
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
 
880
        return dbus.Dictionary(properties, signature="sv")
704
881
    
705
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
706
883
                         out_signature="s",
757
934
    return dbus.String(dt.isoformat(),
758
935
                       variant_level=variant_level)
759
936
 
 
937
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
 
942
    """
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
 
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
                # with the wrong interface name
 
952
                if (not hasattr(attribute, "_dbus_interface")
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
 
955
                    continue
 
956
                # Create an alternate D-Bus interface name based on
 
957
                # the current name
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
 
961
                # Is this a D-Bus signal?
 
962
                if getattr(attribute, "_dbus_is_signal", False):
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
 
966
                            zip(attribute.func_code.co_freevars,
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
 
969
                    # Create a new, but exactly alike, function
 
970
                    # object, and decorate it to be a new D-Bus signal
 
971
                    # with the alternate D-Bus interface name
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
 
981
                    # Define a creator of a function to call both the
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
 
984
                    def fixscope(func1, func2):
 
985
                        """This function is a scope container to pass
 
986
                        func1 and func2 to the "call_both" function
 
987
                        outside of its arguments"""
 
988
                        def call_both(*args, **kwargs):
 
989
                            """This function will emit two D-Bus
 
990
                            signals by calling func1 and func2"""
 
991
                            func1(*args, **kwargs)
 
992
                            func2(*args, **kwargs)
 
993
                        return call_both
 
994
                    # Create the "call_both" function and add it to
 
995
                    # the class
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
 
998
                # Is this a D-Bus method?
 
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
                    # Create a new, but exactly alike, function
 
1001
                    # object.  Decorate it to be a new D-Bus method
 
1002
                    # with the alternate D-Bus interface name.  Add it
 
1003
                    # to the class.
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
 
1014
                # Is this a D-Bus property?
 
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
                    # Create a new, but exactly alike, function
 
1017
                    # object, and decorate it to be a new D-Bus
 
1018
                    # property with the alternate D-Bus interface
 
1019
                    # name.  Add it to the class.
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
760
1036
class ClientDBus(Client, DBusObjectWithProperties):
761
1037
    """A Client class using D-Bus
762
1038
    
771
1047
    # dbus.service.Object doesn't use super(), so we can't either.
772
1048
    
773
1049
    def __init__(self, bus = None, *args, **kwargs):
774
 
        self._approvals_pending = 0
775
1050
        self.bus = bus
776
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
777
1055
        # Only now, when this client is initialized, can it show up on
778
1056
        # the D-Bus
779
1057
        client_object_name = unicode(self.name).translate(
787
1065
    def notifychangeproperty(transform_func,
788
1066
                             dbus_name, type_func=lambda x: x,
789
1067
                             variant_level=1):
790
 
        """ Modify a variable so that its a property that announce its
791
 
        changes to DBus.
792
 
        transform_fun: Function that takes a value and transform it to
793
 
                       DBus type.
794
 
        dbus_name: DBus name of the variable
 
1068
        """ Modify a variable so that it's a property which announces
 
1069
        its changes to DBus.
 
1070
        
 
1071
        transform_fun: Function that takes a value and a variant_level
 
1072
                       and transforms it to a D-Bus type.
 
1073
        dbus_name: D-Bus name of the variable
795
1074
        type_func: Function that transform the value before sending it
796
 
                   to DBus
797
 
        variant_level: DBus variant level. default: 1
 
1075
                   to the D-Bus.  Default: no transform
 
1076
        variant_level: D-Bus variant level.  Default: 1
798
1077
        """
799
 
        real_value = [None,]
 
1078
        attrname = "_{0}".format(dbus_name)
800
1079
        def setter(self, value):
801
 
            old_value = real_value[0]
802
 
            real_value[0] = value
803
1080
            if hasattr(self, "dbus_object_path"):
804
 
                if type_func(old_value) != type_func(real_value[0]):
805
 
                    dbus_value = transform_func(type_func(real_value[0]),
806
 
                                                variant_level)
 
1081
                if (not hasattr(self, attrname) or
 
1082
                    type_func(getattr(self, attrname, None))
 
1083
                    != type_func(value)):
 
1084
                    dbus_value = transform_func(type_func(value),
 
1085
                                                variant_level
 
1086
                                                =variant_level)
807
1087
                    self.PropertyChanged(dbus.String(dbus_name),
808
1088
                                         dbus_value)
809
 
 
810
 
        return property(lambda self: real_value[0], setter)
811
 
 
812
 
 
 
1089
            setattr(self, attrname, value)
 
1090
        
 
1091
        return property(lambda self: getattr(self, attrname), setter)
 
1092
    
 
1093
    
813
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
815
1096
                                             "ApprovalPending",
818
1099
    last_enabled = notifychangeproperty(datetime_to_dbus,
819
1100
                                        "LastEnabled")
820
1101
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
 
                                   type_func = lambda checker: checker is not None)
 
1102
                                   type_func = lambda checker:
 
1103
                                       checker is not None)
822
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
823
1105
                                           "LastCheckedOK")
824
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
825
 
                                                 "LastApprovalRequest")
 
1106
    last_approval_request = notifychangeproperty(
 
1107
        datetime_to_dbus, "LastApprovalRequest")
826
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
827
1109
                                               "ApprovedByDefault")
828
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
 
                                          type_func = _timedelta_to_milliseconds)
830
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
 
                                             type_func = _timedelta_to_milliseconds)
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1111
                                          "ApprovalDelay",
 
1112
                                          type_func =
 
1113
                                          timedelta_to_milliseconds)
 
1114
    approval_duration = notifychangeproperty(
 
1115
        dbus.UInt64, "ApprovalDuration",
 
1116
        type_func = timedelta_to_milliseconds)
832
1117
    host = notifychangeproperty(dbus.String, "Host")
833
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
 
                                   type_func = _timedelta_to_milliseconds)
835
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
 
                                            type_func = _timedelta_to_milliseconds)
837
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
838
 
                                    type_func = _timedelta_to_milliseconds)
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
 
1121
    extended_timeout = notifychangeproperty(
 
1122
        dbus.UInt64, "ExtendedTimeout",
 
1123
        type_func = timedelta_to_milliseconds)
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
1125
                                    "Interval",
 
1126
                                    type_func =
 
1127
                                    timedelta_to_milliseconds)
839
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
840
1129
    
841
1130
    del notifychangeproperty
867
1156
        
868
1157
        return Client.checker_callback(self, pid, condition, command,
869
1158
                                       *args, **kwargs)
870
 
 
 
1159
    
871
1160
    def start_checker(self, *args, **kwargs):
872
1161
        old_checker = self.checker
873
1162
        if self.checker is not None:
883
1172
        return r
884
1173
    
885
1174
    def _reset_approved(self):
886
 
        self._approved = None
 
1175
        self.approved = None
887
1176
        return False
888
1177
    
889
1178
    def approve(self, value=True):
890
1179
        self.send_changedstate()
891
 
        self._approved = value
892
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1180
        self.approved = value
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
893
1182
                            (self.approval_duration),
894
1183
                            self._reset_approved)
895
1184
    
896
1185
    
897
1186
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1187
    _interface = "se.recompile.Mandos.Client"
899
1188
    
900
1189
    ## Signals
901
1190
    
938
1227
        "D-Bus signal"
939
1228
        return self.need_approval()
940
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
941
1238
    ## Methods
942
1239
    
943
1240
    # Approve - method
1001
1298
                           access="readwrite")
1002
1299
    def ApprovalDuration_dbus_property(self, value=None):
1003
1300
        if value is None:       # get
1004
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1301
            return dbus.UInt64(timedelta_to_milliseconds(
1005
1302
                    self.approval_duration))
1006
1303
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1007
1304
    
1021
1318
    def Host_dbus_property(self, value=None):
1022
1319
        if value is None:       # get
1023
1320
            return dbus.String(self.host)
1024
 
        self.host = value
 
1321
        self.host = unicode(value)
1025
1322
    
1026
1323
    # Created - property
1027
1324
    @dbus_service_property(_interface, signature="s", access="read")
1028
1325
    def Created_dbus_property(self):
1029
 
        return dbus.String(datetime_to_dbus(self.created))
 
1326
        return datetime_to_dbus(self.created)
1030
1327
    
1031
1328
    # LastEnabled - property
1032
1329
    @dbus_service_property(_interface, signature="s", access="read")
1070
1367
        if value is None:       # get
1071
1368
            return dbus.UInt64(self.timeout_milliseconds())
1072
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1073
 
        if getattr(self, "disable_initiator_tag", None) is None:
1074
 
            return
1075
1370
        # Reschedule timeout
1076
 
        gobject.source_remove(self.disable_initiator_tag)
1077
 
        self.disable_initiator_tag = None
1078
 
        self.expires = None
1079
 
        time_to_die = (self.
1080
 
                       _timedelta_to_milliseconds((self
1081
 
                                                   .last_checked_ok
1082
 
                                                   + self.timeout)
1083
 
                                                  - datetime.datetime
1084
 
                                                  .utcnow()))
1085
 
        if time_to_die <= 0:
1086
 
            # The timeout has passed
1087
 
            self.disable()
1088
 
        else:
1089
 
            self.expires = (datetime.datetime.utcnow()
1090
 
                            + datetime.timedelta(milliseconds = time_to_die))
1091
 
            self.disable_initiator_tag = (gobject.timeout_add
1092
 
                                          (time_to_die, self.disable))
1093
 
 
 
1371
        if self.enabled:
 
1372
            now = datetime.datetime.utcnow()
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
 
1376
                # The timeout has passed
 
1377
                self.disable()
 
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
 
1382
                if (getattr(self, "disable_initiator_tag", None)
 
1383
                    is None):
 
1384
                    return
 
1385
                gobject.source_remove(self.disable_initiator_tag)
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
 
1389
    
1094
1390
    # ExtendedTimeout - property
1095
1391
    @dbus_service_property(_interface, signature="t",
1096
1392
                           access="readwrite")
1098
1394
        if value is None:       # get
1099
1395
            return dbus.UInt64(self.extended_timeout_milliseconds())
1100
1396
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1101
 
 
 
1397
    
1102
1398
    # Interval - property
1103
1399
    @dbus_service_property(_interface, signature="t",
1104
1400
                           access="readwrite")
1108
1404
        self.interval = datetime.timedelta(0, 0, 0, value)
1109
1405
        if getattr(self, "checker_initiator_tag", None) is None:
1110
1406
            return
1111
 
        # Reschedule checker run
1112
 
        gobject.source_remove(self.checker_initiator_tag)
1113
 
        self.checker_initiator_tag = (gobject.timeout_add
1114
 
                                      (value, self.start_checker))
1115
 
        self.start_checker()    # Start one now, too
1116
 
 
 
1407
        if self.enabled:
 
1408
            # Reschedule checker run
 
1409
            gobject.source_remove(self.checker_initiator_tag)
 
1410
            self.checker_initiator_tag = (gobject.timeout_add
 
1411
                                          (value, self.start_checker))
 
1412
            self.start_checker()    # Start one now, too
 
1413
    
1117
1414
    # Checker - property
1118
1415
    @dbus_service_property(_interface, signature="s",
1119
1416
                           access="readwrite")
1120
1417
    def Checker_dbus_property(self, value=None):
1121
1418
        if value is None:       # get
1122
1419
            return dbus.String(self.checker_command)
1123
 
        self.checker_command = value
 
1420
        self.checker_command = unicode(value)
1124
1421
    
1125
1422
    # CheckerRunning - property
1126
1423
    @dbus_service_property(_interface, signature="b",
1153
1450
        self._pipe.send(('init', fpr, address))
1154
1451
        if not self._pipe.recv():
1155
1452
            raise KeyError()
1156
 
 
 
1453
    
1157
1454
    def __getattribute__(self, name):
1158
 
        if(name == '_pipe'):
 
1455
        if name == '_pipe':
1159
1456
            return super(ProxyClient, self).__getattribute__(name)
1160
1457
        self._pipe.send(('getattr', name))
1161
1458
        data = self._pipe.recv()
1166
1463
                self._pipe.send(('funcall', name, args, kwargs))
1167
1464
                return self._pipe.recv()[1]
1168
1465
            return func
1169
 
 
 
1466
    
1170
1467
    def __setattr__(self, name, value):
1171
 
        if(name == '_pipe'):
 
1468
        if name == '_pipe':
1172
1469
            return super(ProxyClient, self).__setattr__(name, value)
1173
1470
        self._pipe.send(('setattr', name, value))
1174
1471
 
1175
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1176
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1177
1478
    """A class to handle client connections.
1178
1479
    
1185
1486
                        unicode(self.client_address))
1186
1487
            logger.debug("Pipe FD: %d",
1187
1488
                         self.server.child_pipe.fileno())
1188
 
 
 
1489
            
1189
1490
            session = (gnutls.connection
1190
1491
                       .ClientSession(self.request,
1191
1492
                                      gnutls.connection
1192
1493
                                      .X509Credentials()))
1193
 
 
 
1494
            
1194
1495
            # Note: gnutls.connection.X509Credentials is really a
1195
1496
            # generic GnuTLS certificate credentials object so long as
1196
1497
            # no X.509 keys are added to it.  Therefore, we can use it
1197
1498
            # here despite using OpenPGP certificates.
1198
 
 
 
1499
            
1199
1500
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
1501
            #                      "+AES-256-CBC", "+SHA1",
1201
1502
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1207
1508
            (gnutls.library.functions
1208
1509
             .gnutls_priority_set_direct(session._c_object,
1209
1510
                                         priority, None))
1210
 
 
 
1511
            
1211
1512
            # Start communication using the Mandos protocol
1212
1513
            # Get protocol number
1213
1514
            line = self.request.makefile().readline()
1218
1519
            except (ValueError, IndexError, RuntimeError) as error:
1219
1520
                logger.error("Unknown protocol version: %s", error)
1220
1521
                return
1221
 
 
 
1522
            
1222
1523
            # Start GnuTLS connection
1223
1524
            try:
1224
1525
                session.handshake()
1228
1529
                # established.  Just abandon the request.
1229
1530
                return
1230
1531
            logger.debug("Handshake succeeded")
1231
 
 
 
1532
            
1232
1533
            approval_required = False
1233
1534
            try:
1234
1535
                try:
1239
1540
                    logger.warning("Bad certificate: %s", error)
1240
1541
                    return
1241
1542
                logger.debug("Fingerprint: %s", fpr)
1242
 
 
 
1543
                
1243
1544
                try:
1244
1545
                    client = ProxyClient(child_pipe, fpr,
1245
1546
                                         self.client_address)
1246
1547
                except KeyError:
1247
1548
                    return
1248
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1249
1554
                if client.approval_delay:
1250
1555
                    delay = client.approval_delay
1251
1556
                    client.approvals_pending += 1
1257
1562
                                       client.name)
1258
1563
                        if self.server.use_dbus:
1259
1564
                            # Emit D-Bus signal
1260
 
                            client.Rejected("Disabled")                    
 
1565
                            client.Rejected("Disabled")
1261
1566
                        return
1262
1567
                    
1263
 
                    if client._approved or not client.approval_delay:
 
1568
                    if client.approved or not client.approval_delay:
1264
1569
                        #We are approved or approval is disabled
1265
1570
                        break
1266
 
                    elif client._approved is None:
 
1571
                    elif client.approved is None:
1267
1572
                        logger.info("Client %s needs approval",
1268
1573
                                    client.name)
1269
1574
                        if self.server.use_dbus:
1280
1585
                        return
1281
1586
                    
1282
1587
                    #wait until timeout or approved
1283
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1284
1588
                    time = datetime.datetime.now()
1285
1589
                    client.changedstate.acquire()
1286
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1287
1593
                    client.changedstate.release()
1288
1594
                    time2 = datetime.datetime.now()
1289
1595
                    if (time2 - time) >= delay:
1311
1617
                                 sent, len(client.secret)
1312
1618
                                 - (sent_size + sent))
1313
1619
                    sent_size += sent
1314
 
 
 
1620
                
1315
1621
                logger.info("Sending secret to %s", client.name)
1316
 
                # bump the timeout as if seen
 
1622
                # bump the timeout using extended_timeout
1317
1623
                client.checked_ok(client.extended_timeout)
1318
1624
                if self.server.use_dbus:
1319
1625
                    # Emit D-Bus signal
1387
1693
        # Convert the buffer to a Python bytestring
1388
1694
        fpr = ctypes.string_at(buf, buf_len.value)
1389
1695
        # Convert the bytestring to hexadecimal notation
1390
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1696
        hex_fpr = binascii.hexlify(fpr).upper()
1391
1697
        return hex_fpr
1392
1698
 
1393
1699
 
1396
1702
    def sub_process_main(self, request, address):
1397
1703
        try:
1398
1704
            self.finish_request(request, address)
1399
 
        except:
 
1705
        except Exception:
1400
1706
            self.handle_error(request, address)
1401
1707
        self.close_request(request)
1402
 
            
 
1708
    
1403
1709
    def process_request(self, request, address):
1404
1710
        """Start a new process to process the request."""
1405
 
        multiprocessing.Process(target = self.sub_process_main,
1406
 
                                args = (request, address)).start()
 
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1712
                                       args = (request,
 
1713
                                               address))
 
1714
        proc.start()
 
1715
        return proc
 
1716
 
1407
1717
 
1408
1718
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1409
1719
    """ adds a pipe to the MixIn """
1413
1723
        This function creates a new pipe in self.pipe
1414
1724
        """
1415
1725
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1416
 
 
1417
 
        super(MultiprocessingMixInWithPipe,
1418
 
              self).process_request(request, client_address)
 
1726
        
 
1727
        proc = MultiprocessingMixIn.process_request(self, request,
 
1728
                                                    client_address)
1419
1729
        self.child_pipe.close()
1420
 
        self.add_pipe(parent_pipe)
1421
 
 
1422
 
    def add_pipe(self, parent_pipe):
 
1730
        self.add_pipe(parent_pipe, proc)
 
1731
    
 
1732
    def add_pipe(self, parent_pipe, proc):
1423
1733
        """Dummy function; override as necessary"""
1424
1734
        raise NotImplementedError
1425
1735
 
 
1736
 
1426
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1427
1738
                     socketserver.TCPServer, object):
1428
1739
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1502
1813
        self.enabled = False
1503
1814
        self.clients = clients
1504
1815
        if self.clients is None:
1505
 
            self.clients = set()
 
1816
            self.clients = {}
1506
1817
        self.use_dbus = use_dbus
1507
1818
        self.gnutls_priority = gnutls_priority
1508
1819
        IPv6_TCPServer.__init__(self, server_address,
1512
1823
    def server_activate(self):
1513
1824
        if self.enabled:
1514
1825
            return socketserver.TCPServer.server_activate(self)
 
1826
    
1515
1827
    def enable(self):
1516
1828
        self.enabled = True
1517
 
    def add_pipe(self, parent_pipe):
 
1829
    
 
1830
    def add_pipe(self, parent_pipe, proc):
1518
1831
        # Call "handle_ipc" for both data and EOF events
1519
1832
        gobject.io_add_watch(parent_pipe.fileno(),
1520
1833
                             gobject.IO_IN | gobject.IO_HUP,
1521
1834
                             functools.partial(self.handle_ipc,
1522
 
                                               parent_pipe = parent_pipe))
1523
 
        
 
1835
                                               parent_pipe =
 
1836
                                               parent_pipe,
 
1837
                                               proc = proc))
 
1838
    
1524
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
1525
 
                   client_object=None):
 
1840
                   proc = None, client_object=None):
1526
1841
        condition_names = {
1527
1842
            gobject.IO_IN: "IN",   # There is data to read.
1528
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
1537
1852
                                       for cond, name in
1538
1853
                                       condition_names.iteritems()
1539
1854
                                       if cond & condition)
1540
 
        # error or the other end of multiprocessing.Pipe has closed
 
1855
        # error, or the other end of multiprocessing.Pipe has closed
1541
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1857
            # Wait for other process to exit
 
1858
            proc.join()
1542
1859
            return False
1543
1860
        
1544
1861
        # Read a request from the child
1549
1866
            fpr = request[1]
1550
1867
            address = request[2]
1551
1868
            
1552
 
            for c in self.clients:
 
1869
            for c in self.clients.itervalues():
1553
1870
                if c.fingerprint == fpr:
1554
1871
                    client = c
1555
1872
                    break
1558
1875
                            "dress: %s", fpr, address)
1559
1876
                if self.use_dbus:
1560
1877
                    # Emit D-Bus signal
1561
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1878
                    mandos_dbus_service.ClientNotFound(fpr,
 
1879
                                                       address[0])
1562
1880
                parent_pipe.send(False)
1563
1881
                return False
1564
1882
            
1565
1883
            gobject.io_add_watch(parent_pipe.fileno(),
1566
1884
                                 gobject.IO_IN | gobject.IO_HUP,
1567
1885
                                 functools.partial(self.handle_ipc,
1568
 
                                                   parent_pipe = parent_pipe,
1569
 
                                                   client_object = client))
 
1886
                                                   parent_pipe =
 
1887
                                                   parent_pipe,
 
1888
                                                   proc = proc,
 
1889
                                                   client_object =
 
1890
                                                   client))
1570
1891
            parent_pipe.send(True)
1571
 
            # remove the old hook in favor of the new above hook on same fileno
 
1892
            # remove the old hook in favor of the new above hook on
 
1893
            # same fileno
1572
1894
            return False
1573
1895
        if command == 'funcall':
1574
1896
            funcname = request[1]
1575
1897
            args = request[2]
1576
1898
            kwargs = request[3]
1577
1899
            
1578
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1579
 
 
 
1900
            parent_pipe.send(('data', getattr(client_object,
 
1901
                                              funcname)(*args,
 
1902
                                                         **kwargs)))
 
1903
        
1580
1904
        if command == 'getattr':
1581
1905
            attrname = request[1]
1582
1906
            if callable(client_object.__getattribute__(attrname)):
1583
1907
                parent_pipe.send(('function',))
1584
1908
            else:
1585
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1909
                parent_pipe.send(('data', client_object
 
1910
                                  .__getattribute__(attrname)))
1586
1911
        
1587
1912
        if command == 'setattr':
1588
1913
            attrname = request[1]
1589
1914
            value = request[2]
1590
1915
            setattr(client_object, attrname, value)
1591
 
 
 
1916
        
1592
1917
        return True
1593
1918
 
1594
1919
 
1631
1956
    return timevalue
1632
1957
 
1633
1958
 
1634
 
def if_nametoindex(interface):
1635
 
    """Call the C function if_nametoindex(), or equivalent
1636
 
    
1637
 
    Note: This function cannot accept a unicode string."""
1638
 
    global if_nametoindex
1639
 
    try:
1640
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1641
 
                          (ctypes.util.find_library("c"))
1642
 
                          .if_nametoindex)
1643
 
    except (OSError, AttributeError):
1644
 
        logger.warning("Doing if_nametoindex the hard way")
1645
 
        def if_nametoindex(interface):
1646
 
            "Get an interface index the hard way, i.e. using fcntl()"
1647
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1648
 
            with contextlib.closing(socket.socket()) as s:
1649
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
 
                                    struct.pack(str("16s16x"),
1651
 
                                                interface))
1652
 
            interface_index = struct.unpack(str("I"),
1653
 
                                            ifreq[16:20])[0]
1654
 
            return interface_index
1655
 
    return if_nametoindex(interface)
1656
 
 
1657
 
 
1658
1959
def daemon(nochdir = False, noclose = False):
1659
1960
    """See daemon(3).  Standard BSD Unix function.
1660
1961
    
1715
2016
                        " system bus interface")
1716
2017
    parser.add_argument("--no-ipv6", action="store_false",
1717
2018
                        dest="use_ipv6", help="Do not use IPv6")
 
2019
    parser.add_argument("--no-restore", action="store_false",
 
2020
                        dest="restore", help="Do not restore stored"
 
2021
                        " state")
 
2022
    parser.add_argument("--statedir", metavar="DIR",
 
2023
                        help="Directory to save/restore state in")
 
2024
    
1718
2025
    options = parser.parse_args()
1719
2026
    
1720
2027
    if options.check:
1733
2040
                        "use_dbus": "True",
1734
2041
                        "use_ipv6": "True",
1735
2042
                        "debuglevel": "",
 
2043
                        "restore": "True",
 
2044
                        "statedir": "/var/lib/mandos"
1736
2045
                        }
1737
2046
    
1738
2047
    # Parse config file for server-global settings
1755
2064
    # options, if set.
1756
2065
    for option in ("interface", "address", "port", "debug",
1757
2066
                   "priority", "servicename", "configdir",
1758
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2068
                   "statedir"):
1759
2069
        value = getattr(options, option)
1760
2070
        if value is not None:
1761
2071
            server_settings[option] = value
1773
2083
    debuglevel = server_settings["debuglevel"]
1774
2084
    use_dbus = server_settings["use_dbus"]
1775
2085
    use_ipv6 = server_settings["use_ipv6"]
1776
 
 
 
2086
    stored_state_path = os.path.join(server_settings["statedir"],
 
2087
                                     stored_state_file)
 
2088
    
 
2089
    if debug:
 
2090
        initlogger(debug, logging.DEBUG)
 
2091
    else:
 
2092
        if not debuglevel:
 
2093
            initlogger(debug)
 
2094
        else:
 
2095
            level = getattr(logging, debuglevel.upper())
 
2096
            initlogger(debug, level)
 
2097
    
1777
2098
    if server_settings["servicename"] != "Mandos":
1778
2099
        syslogger.setFormatter(logging.Formatter
1779
2100
                               ('Mandos (%s) [%%(process)d]:'
1781
2102
                                % server_settings["servicename"]))
1782
2103
    
1783
2104
    # Parse config file with clients
1784
 
    client_defaults = { "timeout": "5m",
1785
 
                        "extended_timeout": "15m",
1786
 
                        "interval": "2m",
1787
 
                        "checker": "fping -q -- %%(host)s",
1788
 
                        "host": "",
1789
 
                        "approval_delay": "0s",
1790
 
                        "approval_duration": "1s",
1791
 
                        }
1792
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2105
    client_config = configparser.SafeConfigParser(Client
 
2106
                                                  .client_defaults)
1793
2107
    client_config.read(os.path.join(server_settings["configdir"],
1794
2108
                                    "clients.conf"))
1795
2109
    
1833
2147
        if error[0] != errno.EPERM:
1834
2148
            raise error
1835
2149
    
1836
 
    if not debug and not debuglevel:
1837
 
        syslogger.setLevel(logging.WARNING)
1838
 
        console.setLevel(logging.WARNING)
1839
 
    if debuglevel:
1840
 
        level = getattr(logging, debuglevel.upper())
1841
 
        syslogger.setLevel(level)
1842
 
        console.setLevel(level)
1843
 
 
1844
2150
    if debug:
1845
2151
        # Enable all possible GnuTLS debugging
1846
2152
        
1860
2166
        os.dup2(null, sys.stdin.fileno())
1861
2167
        if null > 2:
1862
2168
            os.close(null)
1863
 
    else:
1864
 
        # No console logging
1865
 
        logger.removeHandler(console)
1866
2169
    
1867
2170
    # Need to fork before connecting to D-Bus
1868
2171
    if not debug:
1869
2172
        # Close all input and output, do double fork, etc.
1870
2173
        daemon()
1871
2174
    
 
2175
    gobject.threads_init()
 
2176
    
1872
2177
    global main_loop
1873
2178
    # From the Avahi example code
1874
2179
    DBusGMainLoop(set_as_default=True )
1877
2182
    # End of Avahi example code
1878
2183
    if use_dbus:
1879
2184
        try:
1880
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2185
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1881
2186
                                            bus, do_not_queue=True)
 
2187
            old_bus_name = (dbus.service.BusName
 
2188
                            ("se.bsnet.fukt.Mandos", bus,
 
2189
                             do_not_queue=True))
1882
2190
        except dbus.exceptions.NameExistsException as e:
1883
2191
            logger.error(unicode(e) + ", disabling D-Bus")
1884
2192
            use_dbus = False
1885
2193
            server_settings["use_dbus"] = False
1886
2194
            tcp_server.use_dbus = False
1887
2195
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1888
 
    service = AvahiService(name = server_settings["servicename"],
1889
 
                           servicetype = "_mandos._tcp",
1890
 
                           protocol = protocol, bus = bus)
 
2196
    service = AvahiServiceToSyslog(name =
 
2197
                                   server_settings["servicename"],
 
2198
                                   servicetype = "_mandos._tcp",
 
2199
                                   protocol = protocol, bus = bus)
1891
2200
    if server_settings["interface"]:
1892
2201
        service.interface = (if_nametoindex
1893
2202
                             (str(server_settings["interface"])))
1897
2206
    
1898
2207
    client_class = Client
1899
2208
    if use_dbus:
1900
 
        client_class = functools.partial(ClientDBus, bus = bus)
1901
 
    def client_config_items(config, section):
1902
 
        special_settings = {
1903
 
            "approved_by_default":
1904
 
                lambda: config.getboolean(section,
1905
 
                                          "approved_by_default"),
1906
 
            }
1907
 
        for name, value in config.items(section):
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
 
2211
    
 
2212
    client_settings = Client.config_parser(client_config)
 
2213
    old_client_settings = {}
 
2214
    clients_data = {}
 
2215
    
 
2216
    # Get client data and settings from last running state.
 
2217
    if server_settings["restore"]:
 
2218
        try:
 
2219
            with open(stored_state_path, "rb") as stored_state:
 
2220
                clients_data, old_client_settings = (pickle.load
 
2221
                                                     (stored_state))
 
2222
            os.remove(stored_state_path)
 
2223
        except IOError as e:
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
 
2227
                raise
 
2228
        except EOFError as e:
 
2229
            logger.warning("Could not load persistent state: "
 
2230
                           "EOFError: {0}".format(e))
 
2231
    
 
2232
    with PGPEngine() as pgp:
 
2233
        for client_name, client in clients_data.iteritems():
 
2234
            # Decide which value to use after restoring saved state.
 
2235
            # We have three different values: Old config file,
 
2236
            # new config file, and saved state.
 
2237
            # New config value takes precedence if it differs from old
 
2238
            # config value, otherwise use saved state.
 
2239
            for name, value in client_settings[client_name].items():
 
2240
                try:
 
2241
                    # For each value in new config, check if it
 
2242
                    # differs from the old config value (Except for
 
2243
                    # the "secret" attribute)
 
2244
                    if (name != "secret" and
 
2245
                        value != old_client_settings[client_name]
 
2246
                        [name]):
 
2247
                        client[name] = value
 
2248
                except KeyError:
 
2249
                    pass
 
2250
            
 
2251
            # Clients who has passed its expire date can still be
 
2252
            # enabled if its last checker was successful.  Clients
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
 
2255
            if client["enabled"]:
 
2256
                if datetime.datetime.utcnow() >= client["expires"]:
 
2257
                    if not client["last_checked_ok"]:
 
2258
                        logger.warning(
 
2259
                            "disabling client {0} - Client never "
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
 
2262
                        client["enabled"] = False
 
2263
                    elif client["last_checker_status"] != 0:
 
2264
                        logger.warning(
 
2265
                            "disabling client {0} - Client "
 
2266
                            "last checker failed with error code {1}"
 
2267
                            .format(client["name"],
 
2268
                                    client["last_checker_status"]))
 
2269
                        client["enabled"] = False
 
2270
                    else:
 
2271
                        client["expires"] = (datetime.datetime
 
2272
                                             .utcnow()
 
2273
                                             + client["timeout"])
 
2274
                        logger.debug("Last checker succeeded,"
 
2275
                                     " keeping {0} enabled"
 
2276
                                     .format(client["name"]))
1908
2277
            try:
1909
 
                yield (name, special_settings[name]())
1910
 
            except KeyError:
1911
 
                yield (name, value)
1912
 
    
1913
 
    tcp_server.clients.update(set(
1914
 
            client_class(name = section,
1915
 
                         config= dict(client_config_items(
1916
 
                        client_config, section)))
1917
 
            for section in client_config.sections()))
 
2278
                client["secret"] = (
 
2279
                    pgp.decrypt(client["encrypted_secret"],
 
2280
                                client_settings[client_name]
 
2281
                                ["secret"]))
 
2282
            except PGPError:
 
2283
                # If decryption fails, we use secret from new settings
 
2284
                logger.debug("Failed to decrypt {0} old secret"
 
2285
                             .format(client_name))
 
2286
                client["secret"] = (
 
2287
                    client_settings[client_name]["secret"])
 
2288
 
 
2289
    
 
2290
    # Add/remove clients based on new changes made to config
 
2291
    for client_name in (set(old_client_settings)
 
2292
                        - set(client_settings)):
 
2293
        del clients_data[client_name]
 
2294
    for client_name in (set(client_settings)
 
2295
                        - set(old_client_settings)):
 
2296
        clients_data[client_name] = client_settings[client_name]
 
2297
 
 
2298
    # Create clients all clients
 
2299
    for client_name, client in clients_data.iteritems():
 
2300
        tcp_server.clients[client_name] = client_class(
 
2301
            name = client_name, settings = client)
 
2302
    
1918
2303
    if not tcp_server.clients:
1919
2304
        logger.warning("No clients defined")
1920
2305
        
1931
2316
            # "pidfile" was never created
1932
2317
            pass
1933
2318
        del pidfilename
1934
 
        
1935
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1936
 
 
 
2320
    
1937
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1938
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1939
2323
    
1942
2326
            """A D-Bus proxy object"""
1943
2327
            def __init__(self):
1944
2328
                dbus.service.Object.__init__(self, bus, "/")
1945
 
            _interface = "se.bsnet.fukt.Mandos"
 
2329
            _interface = "se.recompile.Mandos"
1946
2330
            
1947
2331
            @dbus.service.signal(_interface, signature="o")
1948
2332
            def ClientAdded(self, objpath):
1963
2347
            def GetAllClients(self):
1964
2348
                "D-Bus method"
1965
2349
                return dbus.Array(c.dbus_object_path
1966
 
                                  for c in tcp_server.clients)
 
2350
                                  for c in
 
2351
                                  tcp_server.clients.itervalues())
1967
2352
            
1968
2353
            @dbus.service.method(_interface,
1969
2354
                                 out_signature="a{oa{sv}}")
1971
2356
                "D-Bus method"
1972
2357
                return dbus.Dictionary(
1973
2358
                    ((c.dbus_object_path, c.GetAll(""))
1974
 
                     for c in tcp_server.clients),
 
2359
                     for c in tcp_server.clients.itervalues()),
1975
2360
                    signature="oa{sv}")
1976
2361
            
1977
2362
            @dbus.service.method(_interface, in_signature="o")
1978
2363
            def RemoveClient(self, object_path):
1979
2364
                "D-Bus method"
1980
 
                for c in tcp_server.clients:
 
2365
                for c in tcp_server.clients.itervalues():
1981
2366
                    if c.dbus_object_path == object_path:
1982
 
                        tcp_server.clients.remove(c)
 
2367
                        del tcp_server.clients[c.name]
1983
2368
                        c.remove_from_connection()
1984
2369
                        # Don't signal anything except ClientRemoved
1985
2370
                        c.disable(quiet=True)
1990
2375
            
1991
2376
            del _interface
1992
2377
        
1993
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
1994
2381
    
1995
2382
    def cleanup():
1996
2383
        "Cleanup function; run on exit"
1997
2384
        service.cleanup()
1998
2385
        
 
2386
        multiprocessing.active_children()
 
2387
        if not (tcp_server.clients or client_settings):
 
2388
            return
 
2389
        
 
2390
        # Store client before exiting. Secrets are encrypted with key
 
2391
        # based on what config file has. If config file is
 
2392
        # removed/edited, old secret will thus be unrecovable.
 
2393
        clients = {}
 
2394
        with PGPEngine() as pgp:
 
2395
            for client in tcp_server.clients.itervalues():
 
2396
                key = client_settings[client.name]["secret"]
 
2397
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2398
                                                      key)
 
2399
                client_dict = {}
 
2400
                
 
2401
                # A list of attributes that can not be pickled
 
2402
                # + secret.
 
2403
                exclude = set(("bus", "changedstate", "secret",
 
2404
                               "checker"))
 
2405
                for name, typ in (inspect.getmembers
 
2406
                                  (dbus.service.Object)):
 
2407
                    exclude.add(name)
 
2408
                
 
2409
                client_dict["encrypted_secret"] = (client
 
2410
                                                   .encrypted_secret)
 
2411
                for attr in client.client_structure:
 
2412
                    if attr not in exclude:
 
2413
                        client_dict[attr] = getattr(client, attr)
 
2414
                
 
2415
                clients[client.name] = client_dict
 
2416
                del client_settings[client.name]["secret"]
 
2417
        
 
2418
        try:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
 
2424
                pickle.dump((clients, client_settings), stored_state)
 
2425
            os.rename(tempname, stored_state_path)
 
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
 
2429
            if not debug:
 
2430
                try:
 
2431
                    os.remove(tempname)
 
2432
                except NameError:
 
2433
                    pass
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
 
2436
                raise e
 
2437
        
 
2438
        # Delete all clients, and settings from config
1999
2439
        while tcp_server.clients:
2000
 
            client = tcp_server.clients.pop()
 
2440
            name, client = tcp_server.clients.popitem()
2001
2441
            if use_dbus:
2002
2442
                client.remove_from_connection()
2003
 
            client.disable_hook = None
2004
2443
            # Don't signal anything except ClientRemoved
2005
2444
            client.disable(quiet=True)
2006
2445
            if use_dbus:
2007
2446
                # Emit D-Bus signal
2008
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2447
                mandos_dbus_service.ClientRemoved(client
 
2448
                                                  .dbus_object_path,
2009
2449
                                                  client.name)
 
2450
        client_settings.clear()
2010
2451
    
2011
2452
    atexit.register(cleanup)
2012
2453
    
2013
 
    for client in tcp_server.clients:
 
2454
    for client in tcp_server.clients.itervalues():
2014
2455
        if use_dbus:
2015
2456
            # Emit D-Bus signal
2016
2457
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2017
 
        client.enable()
 
2458
        # Need to initiate checking of clients
 
2459
        if client.enabled:
 
2460
            client.init_checker()
2018
2461
    
2019
2462
    tcp_server.enable()
2020
2463
    tcp_server.server_activate()