/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: 2011-09-26 19:36:18 UTC
  • mfrom: (24.1.184 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn

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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 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@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.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
68
65
 
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
 
import GnuPGInterface
79
75
 
80
76
try:
81
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
81
    except ImportError:
86
82
        SO_BINDTODEVICE = None
87
83
 
88
 
version = "1.5.2"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.1"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
92
89
syslogger = (logging.handlers.SysLogHandler
93
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
91
              address = str("/dev/log")))
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
 
 
 
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)
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
268
159
                            " after %i retries, exiting.",
269
160
                            self.rename_count)
270
161
            raise AvahiServiceError("Too many renames")
271
 
        self.name = unicode(self.server
272
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
273
163
        logger.info("Changing Zeroconf service name to %r ...",
274
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
275
169
        self.remove()
276
170
        try:
277
171
            self.add()
297
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
192
        self.entry_group_state_changed_match = (
299
193
            self.group.connect_to_signal(
300
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
301
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
196
                     self.name, self.type)
303
197
        self.group.AddService(
329
223
            try:
330
224
                self.group.Free()
331
225
            except (dbus.exceptions.UnknownMethodException,
332
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
333
227
                pass
334
228
            self.group = None
335
229
        self.remove()
369
263
                                 self.server_state_changed)
370
264
        self.server_state_changed(self.server.GetState())
371
265
 
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
381
266
 
382
 
def timedelta_to_milliseconds(td):
 
267
def _timedelta_to_milliseconds(td):
383
268
    "Convert a datetime.timedelta() to milliseconds"
384
269
    return ((td.days * 24 * 60 * 60 * 1000)
385
270
            + (td.seconds * 1000)
389
274
    """A representation of a client host served by this server.
390
275
    
391
276
    Attributes:
392
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
277
    _approved:   bool(); 'None' if not yet approved/disapproved
393
278
    approval_delay: datetime.timedelta(); Time to wait for approval
394
279
    approval_duration: datetime.timedelta(); Duration of one approval
395
280
    checker:    subprocess.Popen(); a running checker process used
402
287
                     instance %(name)s can be used in the command.
403
288
    checker_initiator_tag: a gobject event source tag, or None
404
289
    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
407
290
    current_checker_command: string; current running checker_command
 
291
    disable_hook:  If set, called by disable() as disable_hook(self)
408
292
    disable_initiator_tag: a gobject event source tag, or None
409
293
    enabled:    bool()
410
294
    fingerprint: string (40 or 32 hexadecimal digits); used to
413
297
    interval:   datetime.timedelta(); How often to start a new checker
414
298
    last_approval_request: datetime.datetime(); (UTC) or None
415
299
    last_checked_ok: datetime.datetime(); (UTC) or None
416
 
    last_checker_status: integer between 0 and 255 reflecting exit
417
 
                         status of last checker. -1 reflects crashed
418
 
                         checker, -2 means no checker completed yet.
419
 
    last_enabled: datetime.datetime(); (UTC) or None
 
300
    last_enabled: datetime.datetime(); (UTC)
420
301
    name:       string; from the config file, used in log messages and
421
302
                        D-Bus identifiers
422
303
    secret:     bytestring; sent verbatim (over TLS) to client
423
304
    timeout:    datetime.timedelta(); How long from last_checked_ok
424
305
                                      until this client is disabled
425
 
    extended_timeout:   extra long timeout when secret has been sent
 
306
    extended_timeout:   extra long timeout when password has been sent
426
307
    runtime_expansions: Allowed attributes for runtime expansion.
427
308
    expires:    datetime.datetime(); time (UTC) when a client will be
428
309
                disabled, or None
432
313
                          "created", "enabled", "fingerprint",
433
314
                          "host", "interval", "last_checked_ok",
434
315
                          "last_enabled", "name", "timeout")
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
 
    
 
316
        
446
317
    def timeout_milliseconds(self):
447
318
        "Return the 'timeout' attribute in milliseconds"
448
 
        return timedelta_to_milliseconds(self.timeout)
449
 
    
 
319
        return _timedelta_to_milliseconds(self.timeout)
 
320
 
450
321
    def extended_timeout_milliseconds(self):
451
322
        "Return the 'extended_timeout' attribute in milliseconds"
452
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
323
        return _timedelta_to_milliseconds(self.extended_timeout)    
453
324
    
454
325
    def interval_milliseconds(self):
455
326
        "Return the 'interval' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.interval)
457
 
    
 
327
        return _timedelta_to_milliseconds(self.interval)
 
328
 
458
329
    def approval_delay_milliseconds(self):
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"] = -2
505
 
        
506
 
        return settings
507
 
        
508
 
        
509
 
    def __init__(self, settings, name = None):
 
330
        return _timedelta_to_milliseconds(self.approval_delay)
 
331
    
 
332
    def __init__(self, name = None, disable_hook=None, config=None):
510
333
        """Note: the 'checker' key in 'config' sets the
511
334
        'checker_command' attribute and *not* the 'checker'
512
335
        attribute."""
513
336
        self.name = name
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
 
       
 
337
        if config is None:
 
338
            config = {}
528
339
        logger.debug("Creating client %r", self.name)
529
340
        # Uppercase and remove spaces from fingerprint for later
530
341
        # comparison purposes with return value from the fingerprint()
531
342
        # function
 
343
        self.fingerprint = (config["fingerprint"].upper()
 
344
                            .replace(" ", ""))
532
345
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
 
        self.created = settings.get("created",
534
 
                                    datetime.datetime.utcnow())
535
 
 
536
 
        # attributes specific for this server instance
 
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
537
366
        self.checker = None
538
367
        self.checker_initiator_tag = None
539
368
        self.disable_initiator_tag = None
 
369
        self.expires = None
540
370
        self.checker_callback_tag = None
 
371
        self.checker_command = config["checker"]
541
372
        self.current_checker_command = None
542
 
        self.approved = None
 
373
        self.last_connect = None
 
374
        self._approved = None
 
375
        self.approved_by_default = config.get("approved_by_default",
 
376
                                              True)
543
377
        self.approvals_pending = 0
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)
 
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())
558
383
    
559
 
    # Send notice to process children that client state has changed
560
384
    def send_changedstate(self):
561
 
        with self.changedstate:
562
 
            self.changedstate.notify_all()
563
 
    
 
385
        self.changedstate.acquire()
 
386
        self.changedstate.notify_all()
 
387
        self.changedstate.release()
 
388
        
564
389
    def enable(self):
565
390
        """Start this client's checker and timeout hooks"""
566
391
        if getattr(self, "enabled", False):
567
392
            # Already enabled
568
393
            return
569
394
        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
570
401
        self.expires = datetime.datetime.utcnow() + self.timeout
 
402
        self.disable_initiator_tag = (gobject.timeout_add
 
403
                                   (self.timeout_milliseconds(),
 
404
                                    self.disable))
571
405
        self.enabled = True
572
406
        self.last_enabled = datetime.datetime.utcnow()
573
 
        self.init_checker()
 
407
        # Also start a new checker *right now*.
 
408
        self.start_checker()
574
409
    
575
410
    def disable(self, quiet=True):
576
411
        """Disable this client."""
588
423
            gobject.source_remove(self.checker_initiator_tag)
589
424
            self.checker_initiator_tag = None
590
425
        self.stop_checker()
 
426
        if self.disable_hook:
 
427
            self.disable_hook(self)
591
428
        self.enabled = False
592
429
        # Do not run this again if called by a gobject.timeout_add
593
430
        return False
594
431
    
595
432
    def __del__(self):
 
433
        self.disable_hook = None
596
434
        self.disable()
597
435
    
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
 
    
611
436
    def checker_callback(self, pid, condition, command):
612
437
        """The checker has completed, so take appropriate actions."""
613
438
        self.checker_callback_tag = None
614
439
        self.checker = None
615
440
        if os.WIFEXITED(condition):
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
617
 
            if self.last_checker_status == 0:
 
441
            exitstatus = os.WEXITSTATUS(condition)
 
442
            if exitstatus == 0:
618
443
                logger.info("Checker for %(name)s succeeded",
619
444
                            vars(self))
620
445
                self.checked_ok()
622
447
                logger.info("Checker for %(name)s failed",
623
448
                            vars(self))
624
449
        else:
625
 
            self.last_checker_status = -1
626
450
            logger.warning("Checker for %(name)s crashed?",
627
451
                           vars(self))
628
452
    
629
 
    def checked_ok(self):
630
 
        """Assert that the client has been seen, alive and well."""
631
 
        self.last_checked_ok = datetime.datetime.utcnow()
632
 
        self.last_checker_status = 0
633
 
        self.bump_timeout()
634
 
    
635
 
    def bump_timeout(self, timeout=None):
636
 
        """Bump up the timeout for this client."""
 
453
    def checked_ok(self, timeout=None):
 
454
        """Bump up the timeout for this client.
 
455
        
 
456
        This should only be called when the client has been seen,
 
457
        alive and well.
 
458
        """
637
459
        if timeout is None:
638
460
            timeout = self.timeout
639
 
        if self.disable_initiator_tag is not None:
640
 
            gobject.source_remove(self.disable_initiator_tag)
641
 
        if getattr(self, "enabled", False):
642
 
            self.disable_initiator_tag = (gobject.timeout_add
643
 
                                          (timedelta_to_milliseconds
644
 
                                           (timeout), self.disable))
645
 
            self.expires = datetime.datetime.utcnow() + timeout
 
461
        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))
646
467
    
647
468
    def need_approval(self):
648
469
        self.last_approval_request = datetime.datetime.utcnow()
688
509
                                       'replace')))
689
510
                    for attr in
690
511
                    self.runtime_expansions)
691
 
                
 
512
 
692
513
                try:
693
514
                    command = self.checker_command % escaped_attrs
694
515
                except TypeError as error:
740
561
                raise
741
562
        self.checker = None
742
563
 
743
 
 
744
564
def dbus_service_property(dbus_interface, signature="v",
745
565
                          access="readwrite", byte_arrays=False):
746
566
    """Decorators for marking methods of a DBusObjectWithProperties to
792
612
 
793
613
class DBusObjectWithProperties(dbus.service.Object):
794
614
    """A D-Bus object with properties.
795
 
    
 
615
 
796
616
    Classes inheriting from this can use the dbus_service_property
797
617
    decorator to expose methods as D-Bus properties.  It exposes the
798
618
    standard Get(), Set(), and GetAll() methods on the D-Bus.
805
625
    def _get_all_dbus_properties(self):
806
626
        """Returns a generator of (name, attribute) pairs
807
627
        """
808
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
 
                for cls in self.__class__.__mro__
 
628
        return ((prop._dbus_name, prop)
810
629
                for name, prop in
811
 
                inspect.getmembers(cls, self._is_dbus_property))
 
630
                inspect.getmembers(self, self._is_dbus_property))
812
631
    
813
632
    def _get_dbus_property(self, interface_name, property_name):
814
633
        """Returns a bound method if one exists which is a D-Bus
815
634
        property with the specified name and interface.
816
635
        """
817
 
        for cls in  self.__class__.__mro__:
818
 
            for name, value in (inspect.getmembers
819
 
                                (cls, self._is_dbus_property)):
820
 
                if (value._dbus_name == property_name
821
 
                    and value._dbus_interface == interface_name):
822
 
                    return value.__get__(self)
823
 
        
 
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
824
646
        # No such property
825
647
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
648
                                   + interface_name + "."
851
673
            # signatures other than "ay".
852
674
            if prop._dbus_signature != "ay":
853
675
                raise ValueError
854
 
            value = dbus.ByteArray(b''.join(chr(byte)
855
 
                                            for byte in value))
 
676
            value = dbus.ByteArray(''.join(unichr(byte)
 
677
                                           for byte in value))
856
678
        prop(value)
857
679
    
858
680
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
860
682
    def GetAll(self, interface_name):
861
683
        """Standard D-Bus property GetAll() method, see D-Bus
862
684
        standard.
863
 
        
 
685
 
864
686
        Note: Will not include properties with access="write".
865
687
        """
866
 
        properties = {}
 
688
        all = {}
867
689
        for name, prop in self._get_all_dbus_properties():
868
690
            if (interface_name
869
691
                and interface_name != prop._dbus_interface):
874
696
                continue
875
697
            value = prop()
876
698
            if not hasattr(value, "variant_level"):
877
 
                properties[name] = value
 
699
                all[name] = value
878
700
                continue
879
 
            properties[name] = type(value)(value, variant_level=
880
 
                                           value.variant_level+1)
881
 
        return dbus.Dictionary(properties, signature="sv")
 
701
            all[name] = type(value)(value, variant_level=
 
702
                                    value.variant_level+1)
 
703
        return dbus.Dictionary(all, signature="sv")
882
704
    
883
705
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
706
                         out_signature="s",
935
757
    return dbus.String(dt.isoformat(),
936
758
                       variant_level=variant_level)
937
759
 
938
 
 
939
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
 
                                  .__metaclass__):
941
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
942
 
    will add additional D-Bus attributes matching a certain pattern.
943
 
    """
944
 
    def __new__(mcs, name, bases, attr):
945
 
        # Go through all the base classes which could have D-Bus
946
 
        # methods, signals, or properties in them
947
 
        for base in (b for b in bases
948
 
                     if issubclass(b, dbus.service.Object)):
949
 
            # Go though all attributes of the base class
950
 
            for attrname, attribute in inspect.getmembers(base):
951
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
952
 
                # with the wrong interface name
953
 
                if (not hasattr(attribute, "_dbus_interface")
954
 
                    or not attribute._dbus_interface
955
 
                    .startswith("se.recompile.Mandos")):
956
 
                    continue
957
 
                # Create an alternate D-Bus interface name based on
958
 
                # the current name
959
 
                alt_interface = (attribute._dbus_interface
960
 
                                 .replace("se.recompile.Mandos",
961
 
                                          "se.bsnet.fukt.Mandos"))
962
 
                # Is this a D-Bus signal?
963
 
                if getattr(attribute, "_dbus_is_signal", False):
964
 
                    # Extract the original non-method function by
965
 
                    # black magic
966
 
                    nonmethod_func = (dict(
967
 
                            zip(attribute.func_code.co_freevars,
968
 
                                attribute.__closure__))["func"]
969
 
                                      .cell_contents)
970
 
                    # Create a new, but exactly alike, function
971
 
                    # object, and decorate it to be a new D-Bus signal
972
 
                    # with the alternate D-Bus interface name
973
 
                    new_function = (dbus.service.signal
974
 
                                    (alt_interface,
975
 
                                     attribute._dbus_signature)
976
 
                                    (types.FunctionType(
977
 
                                nonmethod_func.func_code,
978
 
                                nonmethod_func.func_globals,
979
 
                                nonmethod_func.func_name,
980
 
                                nonmethod_func.func_defaults,
981
 
                                nonmethod_func.func_closure)))
982
 
                    # Define a creator of a function to call both the
983
 
                    # old and new functions, so both the old and new
984
 
                    # signals gets sent when the function is called
985
 
                    def fixscope(func1, func2):
986
 
                        """This function is a scope container to pass
987
 
                        func1 and func2 to the "call_both" function
988
 
                        outside of its arguments"""
989
 
                        def call_both(*args, **kwargs):
990
 
                            """This function will emit two D-Bus
991
 
                            signals by calling func1 and func2"""
992
 
                            func1(*args, **kwargs)
993
 
                            func2(*args, **kwargs)
994
 
                        return call_both
995
 
                    # Create the "call_both" function and add it to
996
 
                    # the class
997
 
                    attr[attrname] = fixscope(attribute,
998
 
                                              new_function)
999
 
                # Is this a D-Bus method?
1000
 
                elif getattr(attribute, "_dbus_is_method", False):
1001
 
                    # Create a new, but exactly alike, function
1002
 
                    # object.  Decorate it to be a new D-Bus method
1003
 
                    # with the alternate D-Bus interface name.  Add it
1004
 
                    # to the class.
1005
 
                    attr[attrname] = (dbus.service.method
1006
 
                                      (alt_interface,
1007
 
                                       attribute._dbus_in_signature,
1008
 
                                       attribute._dbus_out_signature)
1009
 
                                      (types.FunctionType
1010
 
                                       (attribute.func_code,
1011
 
                                        attribute.func_globals,
1012
 
                                        attribute.func_name,
1013
 
                                        attribute.func_defaults,
1014
 
                                        attribute.func_closure)))
1015
 
                # Is this a D-Bus property?
1016
 
                elif getattr(attribute, "_dbus_is_property", False):
1017
 
                    # Create a new, but exactly alike, function
1018
 
                    # object, and decorate it to be a new D-Bus
1019
 
                    # property with the alternate D-Bus interface
1020
 
                    # name.  Add it to the class.
1021
 
                    attr[attrname] = (dbus_service_property
1022
 
                                      (alt_interface,
1023
 
                                       attribute._dbus_signature,
1024
 
                                       attribute._dbus_access,
1025
 
                                       attribute
1026
 
                                       ._dbus_get_args_options
1027
 
                                       ["byte_arrays"])
1028
 
                                      (types.FunctionType
1029
 
                                       (attribute.func_code,
1030
 
                                        attribute.func_globals,
1031
 
                                        attribute.func_name,
1032
 
                                        attribute.func_defaults,
1033
 
                                        attribute.func_closure)))
1034
 
        return type.__new__(mcs, name, bases, attr)
1035
 
 
1036
 
 
1037
760
class ClientDBus(Client, DBusObjectWithProperties):
1038
761
    """A Client class using D-Bus
1039
762
    
1048
771
    # dbus.service.Object doesn't use super(), so we can't either.
1049
772
    
1050
773
    def __init__(self, bus = None, *args, **kwargs):
 
774
        self._approvals_pending = 0
1051
775
        self.bus = bus
1052
776
        Client.__init__(self, *args, **kwargs)
1053
777
        # Only now, when this client is initialized, can it show up on
1063
787
    def notifychangeproperty(transform_func,
1064
788
                             dbus_name, type_func=lambda x: x,
1065
789
                             variant_level=1):
1066
 
        """ Modify a variable so that it's a property which announces
1067
 
        its changes to DBus.
1068
 
        
1069
 
        transform_fun: Function that takes a value and a variant_level
1070
 
                       and transforms it to a D-Bus type.
1071
 
        dbus_name: D-Bus name of the variable
 
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
1072
795
        type_func: Function that transform the value before sending it
1073
 
                   to the D-Bus.  Default: no transform
1074
 
        variant_level: D-Bus variant level.  Default: 1
 
796
                   to DBus
 
797
        variant_level: DBus variant level. default: 1
1075
798
        """
1076
 
        attrname = "_{0}".format(dbus_name)
 
799
        real_value = [None,]
1077
800
        def setter(self, value):
 
801
            old_value = real_value[0]
 
802
            real_value[0] = value
1078
803
            if hasattr(self, "dbus_object_path"):
1079
 
                if (not hasattr(self, attrname) or
1080
 
                    type_func(getattr(self, attrname, None))
1081
 
                    != type_func(value)):
1082
 
                    dbus_value = transform_func(type_func(value),
1083
 
                                                variant_level
1084
 
                                                =variant_level)
 
804
                if type_func(old_value) != type_func(real_value[0]):
 
805
                    dbus_value = transform_func(type_func(real_value[0]),
 
806
                                                variant_level)
1085
807
                    self.PropertyChanged(dbus.String(dbus_name),
1086
808
                                         dbus_value)
1087
 
            setattr(self, attrname, value)
1088
 
        
1089
 
        return property(lambda self: getattr(self, attrname), setter)
1090
 
    
1091
 
    
 
809
 
 
810
        return property(lambda self: real_value[0], setter)
 
811
 
 
812
 
1092
813
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
814
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
815
                                             "ApprovalPending",
1097
818
    last_enabled = notifychangeproperty(datetime_to_dbus,
1098
819
                                        "LastEnabled")
1099
820
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1100
 
                                   type_func = lambda checker:
1101
 
                                       checker is not None)
 
821
                                   type_func = lambda checker: checker is not None)
1102
822
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
823
                                           "LastCheckedOK")
1104
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1105
 
                                               "LastCheckerStatus")
1106
 
    last_approval_request = notifychangeproperty(
1107
 
        datetime_to_dbus, "LastApprovalRequest")
 
824
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
825
                                                 "LastApprovalRequest")
1108
826
    approved_by_default = notifychangeproperty(dbus.Boolean,
1109
827
                                               "ApprovedByDefault")
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)
 
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)
1117
832
    host = notifychangeproperty(dbus.String, "Host")
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)
 
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)
1128
839
    checker_command = notifychangeproperty(dbus.String, "Checker")
1129
840
    
1130
841
    del notifychangeproperty
1156
867
        
1157
868
        return Client.checker_callback(self, pid, condition, command,
1158
869
                                       *args, **kwargs)
1159
 
    
 
870
 
1160
871
    def start_checker(self, *args, **kwargs):
1161
872
        old_checker = self.checker
1162
873
        if self.checker is not None:
1172
883
        return r
1173
884
    
1174
885
    def _reset_approved(self):
1175
 
        self.approved = None
 
886
        self._approved = None
1176
887
        return False
1177
888
    
1178
889
    def approve(self, value=True):
1179
890
        self.send_changedstate()
1180
 
        self.approved = value
1181
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(_timedelta_to_milliseconds
1182
893
                            (self.approval_duration),
1183
894
                            self._reset_approved)
1184
895
    
1185
896
    
1186
897
    ## D-Bus methods, signals & properties
1187
 
    _interface = "se.recompile.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1188
899
    
1189
900
    ## Signals
1190
901
    
1290
1001
                           access="readwrite")
1291
1002
    def ApprovalDuration_dbus_property(self, value=None):
1292
1003
        if value is None:       # get
1293
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1004
            return dbus.UInt64(_timedelta_to_milliseconds(
1294
1005
                    self.approval_duration))
1295
1006
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1296
1007
    
1310
1021
    def Host_dbus_property(self, value=None):
1311
1022
        if value is None:       # get
1312
1023
            return dbus.String(self.host)
1313
 
        self.host = unicode(value)
 
1024
        self.host = value
1314
1025
    
1315
1026
    # Created - property
1316
1027
    @dbus_service_property(_interface, signature="s", access="read")
1317
1028
    def Created_dbus_property(self):
1318
 
        return datetime_to_dbus(self.created)
 
1029
        return dbus.String(datetime_to_dbus(self.created))
1319
1030
    
1320
1031
    # LastEnabled - property
1321
1032
    @dbus_service_property(_interface, signature="s", access="read")
1342
1053
            return
1343
1054
        return datetime_to_dbus(self.last_checked_ok)
1344
1055
    
1345
 
    # LastCheckerStatus - property
1346
 
    @dbus_service_property(_interface, signature="n",
1347
 
                           access="read")
1348
 
    def LastCheckerStatus_dbus_property(self):
1349
 
        return dbus.Int16(self.last_checker_status)
1350
 
    
1351
1056
    # Expires - property
1352
1057
    @dbus_service_property(_interface, signature="s", access="read")
1353
1058
    def Expires_dbus_property(self):
1365
1070
        if value is None:       # get
1366
1071
            return dbus.UInt64(self.timeout_milliseconds())
1367
1072
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1073
        if getattr(self, "disable_initiator_tag", None) is None:
 
1074
            return
1368
1075
        # Reschedule timeout
1369
 
        if self.enabled:
1370
 
            now = datetime.datetime.utcnow()
1371
 
            time_to_die = timedelta_to_milliseconds(
1372
 
                (self.last_checked_ok + self.timeout) - now)
1373
 
            if time_to_die <= 0:
1374
 
                # The timeout has passed
1375
 
                self.disable()
1376
 
            else:
1377
 
                self.expires = (now +
1378
 
                                datetime.timedelta(milliseconds =
1379
 
                                                   time_to_die))
1380
 
                if (getattr(self, "disable_initiator_tag", None)
1381
 
                    is None):
1382
 
                    return
1383
 
                gobject.source_remove(self.disable_initiator_tag)
1384
 
                self.disable_initiator_tag = (gobject.timeout_add
1385
 
                                              (time_to_die,
1386
 
                                               self.disable))
1387
 
    
 
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
 
1388
1094
    # ExtendedTimeout - property
1389
1095
    @dbus_service_property(_interface, signature="t",
1390
1096
                           access="readwrite")
1392
1098
        if value is None:       # get
1393
1099
            return dbus.UInt64(self.extended_timeout_milliseconds())
1394
1100
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1395
 
    
 
1101
 
1396
1102
    # Interval - property
1397
1103
    @dbus_service_property(_interface, signature="t",
1398
1104
                           access="readwrite")
1402
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
1403
1109
        if getattr(self, "checker_initiator_tag", None) is None:
1404
1110
            return
1405
 
        if self.enabled:
1406
 
            # Reschedule checker run
1407
 
            gobject.source_remove(self.checker_initiator_tag)
1408
 
            self.checker_initiator_tag = (gobject.timeout_add
1409
 
                                          (value, self.start_checker))
1410
 
            self.start_checker()    # Start one now, too
1411
 
    
 
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
 
1412
1117
    # Checker - property
1413
1118
    @dbus_service_property(_interface, signature="s",
1414
1119
                           access="readwrite")
1415
1120
    def Checker_dbus_property(self, value=None):
1416
1121
        if value is None:       # get
1417
1122
            return dbus.String(self.checker_command)
1418
 
        self.checker_command = unicode(value)
 
1123
        self.checker_command = value
1419
1124
    
1420
1125
    # CheckerRunning - property
1421
1126
    @dbus_service_property(_interface, signature="b",
1448
1153
        self._pipe.send(('init', fpr, address))
1449
1154
        if not self._pipe.recv():
1450
1155
            raise KeyError()
1451
 
    
 
1156
 
1452
1157
    def __getattribute__(self, name):
1453
 
        if name == '_pipe':
 
1158
        if(name == '_pipe'):
1454
1159
            return super(ProxyClient, self).__getattribute__(name)
1455
1160
        self._pipe.send(('getattr', name))
1456
1161
        data = self._pipe.recv()
1461
1166
                self._pipe.send(('funcall', name, args, kwargs))
1462
1167
                return self._pipe.recv()[1]
1463
1168
            return func
1464
 
    
 
1169
 
1465
1170
    def __setattr__(self, name, value):
1466
 
        if name == '_pipe':
 
1171
        if(name == '_pipe'):
1467
1172
            return super(ProxyClient, self).__setattr__(name, value)
1468
1173
        self._pipe.send(('setattr', name, value))
1469
1174
 
1470
1175
 
1471
 
class ClientDBusTransitional(ClientDBus):
1472
 
    __metaclass__ = AlternateDBusNamesMetaclass
1473
 
 
1474
 
 
1475
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
1177
    """A class to handle client connections.
1477
1178
    
1484
1185
                        unicode(self.client_address))
1485
1186
            logger.debug("Pipe FD: %d",
1486
1187
                         self.server.child_pipe.fileno())
1487
 
            
 
1188
 
1488
1189
            session = (gnutls.connection
1489
1190
                       .ClientSession(self.request,
1490
1191
                                      gnutls.connection
1491
1192
                                      .X509Credentials()))
1492
 
            
 
1193
 
1493
1194
            # Note: gnutls.connection.X509Credentials is really a
1494
1195
            # generic GnuTLS certificate credentials object so long as
1495
1196
            # no X.509 keys are added to it.  Therefore, we can use it
1496
1197
            # here despite using OpenPGP certificates.
1497
 
            
 
1198
 
1498
1199
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
1200
            #                      "+AES-256-CBC", "+SHA1",
1500
1201
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1506
1207
            (gnutls.library.functions
1507
1208
             .gnutls_priority_set_direct(session._c_object,
1508
1209
                                         priority, None))
1509
 
            
 
1210
 
1510
1211
            # Start communication using the Mandos protocol
1511
1212
            # Get protocol number
1512
1213
            line = self.request.makefile().readline()
1517
1218
            except (ValueError, IndexError, RuntimeError) as error:
1518
1219
                logger.error("Unknown protocol version: %s", error)
1519
1220
                return
1520
 
            
 
1221
 
1521
1222
            # Start GnuTLS connection
1522
1223
            try:
1523
1224
                session.handshake()
1527
1228
                # established.  Just abandon the request.
1528
1229
                return
1529
1230
            logger.debug("Handshake succeeded")
1530
 
            
 
1231
 
1531
1232
            approval_required = False
1532
1233
            try:
1533
1234
                try:
1538
1239
                    logger.warning("Bad certificate: %s", error)
1539
1240
                    return
1540
1241
                logger.debug("Fingerprint: %s", fpr)
1541
 
                
 
1242
 
1542
1243
                try:
1543
1244
                    client = ProxyClient(child_pipe, fpr,
1544
1245
                                         self.client_address)
1556
1257
                                       client.name)
1557
1258
                        if self.server.use_dbus:
1558
1259
                            # Emit D-Bus signal
1559
 
                            client.Rejected("Disabled")
 
1260
                            client.Rejected("Disabled")                    
1560
1261
                        return
1561
1262
                    
1562
 
                    if client.approved or not client.approval_delay:
 
1263
                    if client._approved or not client.approval_delay:
1563
1264
                        #We are approved or approval is disabled
1564
1265
                        break
1565
 
                    elif client.approved is None:
 
1266
                    elif client._approved is None:
1566
1267
                        logger.info("Client %s needs approval",
1567
1268
                                    client.name)
1568
1269
                        if self.server.use_dbus:
1579
1280
                        return
1580
1281
                    
1581
1282
                    #wait until timeout or approved
 
1283
                    #x = float(client._timedelta_to_milliseconds(delay))
1582
1284
                    time = datetime.datetime.now()
1583
1285
                    client.changedstate.acquire()
1584
 
                    (client.changedstate.wait
1585
 
                     (float(client.timedelta_to_milliseconds(delay)
1586
 
                            / 1000)))
 
1286
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1587
1287
                    client.changedstate.release()
1588
1288
                    time2 = datetime.datetime.now()
1589
1289
                    if (time2 - time) >= delay:
1611
1311
                                 sent, len(client.secret)
1612
1312
                                 - (sent_size + sent))
1613
1313
                    sent_size += sent
1614
 
                
 
1314
 
1615
1315
                logger.info("Sending secret to %s", client.name)
1616
 
                # bump the timeout using extended_timeout
1617
 
                client.bump_timeout(client.extended_timeout)
 
1316
                # bump the timeout as if seen
 
1317
                client.checked_ok(client.extended_timeout)
1618
1318
                if self.server.use_dbus:
1619
1319
                    # Emit D-Bus signal
1620
1320
                    client.GotSecret()
1687
1387
        # Convert the buffer to a Python bytestring
1688
1388
        fpr = ctypes.string_at(buf, buf_len.value)
1689
1389
        # Convert the bytestring to hexadecimal notation
1690
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1390
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1691
1391
        return hex_fpr
1692
1392
 
1693
1393
 
1696
1396
    def sub_process_main(self, request, address):
1697
1397
        try:
1698
1398
            self.finish_request(request, address)
1699
 
        except Exception:
 
1399
        except:
1700
1400
            self.handle_error(request, address)
1701
1401
        self.close_request(request)
1702
 
    
 
1402
            
1703
1403
    def process_request(self, request, address):
1704
1404
        """Start a new process to process the request."""
1705
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1706
 
                                       args = (request,
1707
 
                                               address))
1708
 
        proc.start()
1709
 
        return proc
1710
 
 
 
1405
        multiprocessing.Process(target = self.sub_process_main,
 
1406
                                args = (request, address)).start()
1711
1407
 
1712
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
1409
    """ adds a pipe to the MixIn """
1717
1413
        This function creates a new pipe in self.pipe
1718
1414
        """
1719
1415
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
 
        
1721
 
        proc = MultiprocessingMixIn.process_request(self, request,
1722
 
                                                    client_address)
 
1416
 
 
1417
        super(MultiprocessingMixInWithPipe,
 
1418
              self).process_request(request, client_address)
1723
1419
        self.child_pipe.close()
1724
 
        self.add_pipe(parent_pipe, proc)
1725
 
    
1726
 
    def add_pipe(self, parent_pipe, proc):
 
1420
        self.add_pipe(parent_pipe)
 
1421
 
 
1422
    def add_pipe(self, parent_pipe):
1727
1423
        """Dummy function; override as necessary"""
1728
1424
        raise NotImplementedError
1729
1425
 
1730
 
 
1731
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1732
1427
                     socketserver.TCPServer, object):
1733
1428
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1807
1502
        self.enabled = False
1808
1503
        self.clients = clients
1809
1504
        if self.clients is None:
1810
 
            self.clients = {}
 
1505
            self.clients = set()
1811
1506
        self.use_dbus = use_dbus
1812
1507
        self.gnutls_priority = gnutls_priority
1813
1508
        IPv6_TCPServer.__init__(self, server_address,
1817
1512
    def server_activate(self):
1818
1513
        if self.enabled:
1819
1514
            return socketserver.TCPServer.server_activate(self)
1820
 
    
1821
1515
    def enable(self):
1822
1516
        self.enabled = True
1823
 
    
1824
 
    def add_pipe(self, parent_pipe, proc):
 
1517
    def add_pipe(self, parent_pipe):
1825
1518
        # Call "handle_ipc" for both data and EOF events
1826
1519
        gobject.io_add_watch(parent_pipe.fileno(),
1827
1520
                             gobject.IO_IN | gobject.IO_HUP,
1828
1521
                             functools.partial(self.handle_ipc,
1829
 
                                               parent_pipe =
1830
 
                                               parent_pipe,
1831
 
                                               proc = proc))
1832
 
    
 
1522
                                               parent_pipe = parent_pipe))
 
1523
        
1833
1524
    def handle_ipc(self, source, condition, parent_pipe=None,
1834
 
                   proc = None, client_object=None):
 
1525
                   client_object=None):
1835
1526
        condition_names = {
1836
1527
            gobject.IO_IN: "IN",   # There is data to read.
1837
1528
            gobject.IO_OUT: "OUT", # Data can be written (without
1846
1537
                                       for cond, name in
1847
1538
                                       condition_names.iteritems()
1848
1539
                                       if cond & condition)
1849
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1540
        # error or the other end of multiprocessing.Pipe has closed
1850
1541
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1851
 
            # Wait for other process to exit
1852
 
            proc.join()
1853
1542
            return False
1854
1543
        
1855
1544
        # Read a request from the child
1860
1549
            fpr = request[1]
1861
1550
            address = request[2]
1862
1551
            
1863
 
            for c in self.clients.itervalues():
 
1552
            for c in self.clients:
1864
1553
                if c.fingerprint == fpr:
1865
1554
                    client = c
1866
1555
                    break
1869
1558
                            "dress: %s", fpr, address)
1870
1559
                if self.use_dbus:
1871
1560
                    # Emit D-Bus signal
1872
 
                    mandos_dbus_service.ClientNotFound(fpr,
1873
 
                                                       address[0])
 
1561
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1874
1562
                parent_pipe.send(False)
1875
1563
                return False
1876
1564
            
1877
1565
            gobject.io_add_watch(parent_pipe.fileno(),
1878
1566
                                 gobject.IO_IN | gobject.IO_HUP,
1879
1567
                                 functools.partial(self.handle_ipc,
1880
 
                                                   parent_pipe =
1881
 
                                                   parent_pipe,
1882
 
                                                   proc = proc,
1883
 
                                                   client_object =
1884
 
                                                   client))
 
1568
                                                   parent_pipe = parent_pipe,
 
1569
                                                   client_object = client))
1885
1570
            parent_pipe.send(True)
1886
 
            # remove the old hook in favor of the new above hook on
1887
 
            # same fileno
 
1571
            # remove the old hook in favor of the new above hook on same fileno
1888
1572
            return False
1889
1573
        if command == 'funcall':
1890
1574
            funcname = request[1]
1891
1575
            args = request[2]
1892
1576
            kwargs = request[3]
1893
1577
            
1894
 
            parent_pipe.send(('data', getattr(client_object,
1895
 
                                              funcname)(*args,
1896
 
                                                         **kwargs)))
1897
 
        
 
1578
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1579
 
1898
1580
        if command == 'getattr':
1899
1581
            attrname = request[1]
1900
1582
            if callable(client_object.__getattribute__(attrname)):
1901
1583
                parent_pipe.send(('function',))
1902
1584
            else:
1903
 
                parent_pipe.send(('data', client_object
1904
 
                                  .__getattribute__(attrname)))
 
1585
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1905
1586
        
1906
1587
        if command == 'setattr':
1907
1588
            attrname = request[1]
1908
1589
            value = request[2]
1909
1590
            setattr(client_object, attrname, value)
1910
 
        
 
1591
 
1911
1592
        return True
1912
1593
 
1913
1594
 
1950
1631
    return timevalue
1951
1632
 
1952
1633
 
 
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
 
1953
1658
def daemon(nochdir = False, noclose = False):
1954
1659
    """See daemon(3).  Standard BSD Unix function.
1955
1660
    
2010
1715
                        " system bus interface")
2011
1716
    parser.add_argument("--no-ipv6", action="store_false",
2012
1717
                        dest="use_ipv6", help="Do not use IPv6")
2013
 
    parser.add_argument("--no-restore", action="store_false",
2014
 
                        dest="restore", help="Do not restore stored"
2015
 
                        " state")
2016
 
    parser.add_argument("--statedir", metavar="DIR",
2017
 
                        help="Directory to save/restore state in")
2018
 
    
2019
1718
    options = parser.parse_args()
2020
1719
    
2021
1720
    if options.check:
2034
1733
                        "use_dbus": "True",
2035
1734
                        "use_ipv6": "True",
2036
1735
                        "debuglevel": "",
2037
 
                        "restore": "True",
2038
 
                        "statedir": "/var/lib/mandos"
2039
1736
                        }
2040
1737
    
2041
1738
    # Parse config file for server-global settings
2058
1755
    # options, if set.
2059
1756
    for option in ("interface", "address", "port", "debug",
2060
1757
                   "priority", "servicename", "configdir",
2061
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2062
 
                   "statedir"):
 
1758
                   "use_dbus", "use_ipv6", "debuglevel"):
2063
1759
        value = getattr(options, option)
2064
1760
        if value is not None:
2065
1761
            server_settings[option] = value
2077
1773
    debuglevel = server_settings["debuglevel"]
2078
1774
    use_dbus = server_settings["use_dbus"]
2079
1775
    use_ipv6 = server_settings["use_ipv6"]
2080
 
    stored_state_path = os.path.join(server_settings["statedir"],
2081
 
                                     stored_state_file)
2082
 
    
2083
 
    if debug:
2084
 
        initlogger(debug, logging.DEBUG)
2085
 
    else:
2086
 
        if not debuglevel:
2087
 
            initlogger(debug)
2088
 
        else:
2089
 
            level = getattr(logging, debuglevel.upper())
2090
 
            initlogger(debug, level)
2091
 
    
 
1776
 
2092
1777
    if server_settings["servicename"] != "Mandos":
2093
1778
        syslogger.setFormatter(logging.Formatter
2094
1779
                               ('Mandos (%s) [%%(process)d]:'
2096
1781
                                % server_settings["servicename"]))
2097
1782
    
2098
1783
    # Parse config file with clients
2099
 
    client_config = configparser.SafeConfigParser(Client
2100
 
                                                  .client_defaults)
 
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)
2101
1793
    client_config.read(os.path.join(server_settings["configdir"],
2102
1794
                                    "clients.conf"))
2103
1795
    
2141
1833
        if error[0] != errno.EPERM:
2142
1834
            raise error
2143
1835
    
 
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
 
2144
1844
    if debug:
2145
1845
        # Enable all possible GnuTLS debugging
2146
1846
        
2160
1860
        os.dup2(null, sys.stdin.fileno())
2161
1861
        if null > 2:
2162
1862
            os.close(null)
 
1863
    else:
 
1864
        # No console logging
 
1865
        logger.removeHandler(console)
2163
1866
    
2164
1867
    # Need to fork before connecting to D-Bus
2165
1868
    if not debug:
2166
1869
        # Close all input and output, do double fork, etc.
2167
1870
        daemon()
2168
1871
    
2169
 
    gobject.threads_init()
2170
 
    
2171
1872
    global main_loop
2172
1873
    # From the Avahi example code
2173
1874
    DBusGMainLoop(set_as_default=True )
2176
1877
    # End of Avahi example code
2177
1878
    if use_dbus:
2178
1879
        try:
2179
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1880
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2180
1881
                                            bus, do_not_queue=True)
2181
 
            old_bus_name = (dbus.service.BusName
2182
 
                            ("se.bsnet.fukt.Mandos", bus,
2183
 
                             do_not_queue=True))
2184
1882
        except dbus.exceptions.NameExistsException as e:
2185
1883
            logger.error(unicode(e) + ", disabling D-Bus")
2186
1884
            use_dbus = False
2187
1885
            server_settings["use_dbus"] = False
2188
1886
            tcp_server.use_dbus = False
2189
1887
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
 
    service = AvahiServiceToSyslog(name =
2191
 
                                   server_settings["servicename"],
2192
 
                                   servicetype = "_mandos._tcp",
2193
 
                                   protocol = protocol, bus = bus)
 
1888
    service = AvahiService(name = server_settings["servicename"],
 
1889
                           servicetype = "_mandos._tcp",
 
1890
                           protocol = protocol, bus = bus)
2194
1891
    if server_settings["interface"]:
2195
1892
        service.interface = (if_nametoindex
2196
1893
                             (str(server_settings["interface"])))
2200
1897
    
2201
1898
    client_class = Client
2202
1899
    if use_dbus:
2203
 
        client_class = functools.partial(ClientDBusTransitional,
2204
 
                                         bus = bus)
2205
 
    
2206
 
    client_settings = Client.config_parser(client_config)
2207
 
    old_client_settings = {}
2208
 
    clients_data = {}
2209
 
    
2210
 
    # Get client data and settings from last running state.
2211
 
    if server_settings["restore"]:
2212
 
        try:
2213
 
            with open(stored_state_path, "rb") as stored_state:
2214
 
                clients_data, old_client_settings = (pickle.load
2215
 
                                                     (stored_state))
2216
 
            os.remove(stored_state_path)
2217
 
        except IOError as e:
2218
 
            logger.warning("Could not load persistent state: {0}"
2219
 
                           .format(e))
2220
 
            if e.errno != errno.ENOENT:
2221
 
                raise
2222
 
        except EOFError as e:
2223
 
            logger.warning("Could not load persistent state: "
2224
 
                           "EOFError: {0}".format(e))
2225
 
    
2226
 
    with PGPEngine() as pgp:
2227
 
        for client_name, client in clients_data.iteritems():
2228
 
            # Decide which value to use after restoring saved state.
2229
 
            # We have three different values: Old config file,
2230
 
            # new config file, and saved state.
2231
 
            # New config value takes precedence if it differs from old
2232
 
            # config value, otherwise use saved state.
2233
 
            for name, value in client_settings[client_name].items():
2234
 
                try:
2235
 
                    # For each value in new config, check if it
2236
 
                    # differs from the old config value (Except for
2237
 
                    # the "secret" attribute)
2238
 
                    if (name != "secret" and
2239
 
                        value != old_client_settings[client_name]
2240
 
                        [name]):
2241
 
                        client[name] = value
2242
 
                except KeyError:
2243
 
                    pass
2244
 
            
2245
 
            # Clients who has passed its expire date can still be
2246
 
            # enabled if its last checker was successful.  Clients
2247
 
            # whose checker succeeded before we stored its state is
2248
 
            # assumed to have successfully run all checkers during
2249
 
            # downtime.
2250
 
            if client["enabled"]:
2251
 
                if datetime.datetime.utcnow() >= client["expires"]:
2252
 
                    if not client["last_checked_ok"]:
2253
 
                        logger.warning(
2254
 
                            "disabling client {0} - Client never "
2255
 
                            "performed a successful checker"
2256
 
                            .format(client_name))
2257
 
                        client["enabled"] = False
2258
 
                    elif client["last_checker_status"] != 0:
2259
 
                        logger.warning(
2260
 
                            "disabling client {0} - Client "
2261
 
                            "last checker failed with error code {1}"
2262
 
                            .format(client_name,
2263
 
                                    client["last_checker_status"]))
2264
 
                        client["enabled"] = False
2265
 
                    else:
2266
 
                        client["expires"] = (datetime.datetime
2267
 
                                             .utcnow()
2268
 
                                             + client["timeout"])
2269
 
                        logger.debug("Last checker succeeded,"
2270
 
                                     " keeping {0} enabled"
2271
 
                                     .format(client_name))
 
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):
2272
1908
            try:
2273
 
                client["secret"] = (
2274
 
                    pgp.decrypt(client["encrypted_secret"],
2275
 
                                client_settings[client_name]
2276
 
                                ["secret"]))
2277
 
            except PGPError:
2278
 
                # If decryption fails, we use secret from new settings
2279
 
                logger.debug("Failed to decrypt {0} old secret"
2280
 
                             .format(client_name))
2281
 
                client["secret"] = (
2282
 
                    client_settings[client_name]["secret"])
2283
 
 
2284
 
    
2285
 
    # Add/remove clients based on new changes made to config
2286
 
    for client_name in (set(old_client_settings)
2287
 
                        - set(client_settings)):
2288
 
        del clients_data[client_name]
2289
 
    for client_name in (set(client_settings)
2290
 
                        - set(old_client_settings)):
2291
 
        clients_data[client_name] = client_settings[client_name]
2292
 
 
2293
 
    # Create all client objects
2294
 
    for client_name, client in clients_data.iteritems():
2295
 
        tcp_server.clients[client_name] = client_class(
2296
 
            name = client_name, settings = client)
2297
 
    
 
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()))
2298
1918
    if not tcp_server.clients:
2299
1919
        logger.warning("No clients defined")
2300
1920
        
2311
1931
            # "pidfile" was never created
2312
1932
            pass
2313
1933
        del pidfilename
 
1934
        
2314
1935
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2315
 
    
 
1936
 
2316
1937
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
1938
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2318
1939
    
2321
1942
            """A D-Bus proxy object"""
2322
1943
            def __init__(self):
2323
1944
                dbus.service.Object.__init__(self, bus, "/")
2324
 
            _interface = "se.recompile.Mandos"
 
1945
            _interface = "se.bsnet.fukt.Mandos"
2325
1946
            
2326
1947
            @dbus.service.signal(_interface, signature="o")
2327
1948
            def ClientAdded(self, objpath):
2342
1963
            def GetAllClients(self):
2343
1964
                "D-Bus method"
2344
1965
                return dbus.Array(c.dbus_object_path
2345
 
                                  for c in
2346
 
                                  tcp_server.clients.itervalues())
 
1966
                                  for c in tcp_server.clients)
2347
1967
            
2348
1968
            @dbus.service.method(_interface,
2349
1969
                                 out_signature="a{oa{sv}}")
2351
1971
                "D-Bus method"
2352
1972
                return dbus.Dictionary(
2353
1973
                    ((c.dbus_object_path, c.GetAll(""))
2354
 
                     for c in tcp_server.clients.itervalues()),
 
1974
                     for c in tcp_server.clients),
2355
1975
                    signature="oa{sv}")
2356
1976
            
2357
1977
            @dbus.service.method(_interface, in_signature="o")
2358
1978
            def RemoveClient(self, object_path):
2359
1979
                "D-Bus method"
2360
 
                for c in tcp_server.clients.itervalues():
 
1980
                for c in tcp_server.clients:
2361
1981
                    if c.dbus_object_path == object_path:
2362
 
                        del tcp_server.clients[c.name]
 
1982
                        tcp_server.clients.remove(c)
2363
1983
                        c.remove_from_connection()
2364
1984
                        # Don't signal anything except ClientRemoved
2365
1985
                        c.disable(quiet=True)
2370
1990
            
2371
1991
            del _interface
2372
1992
        
2373
 
        class MandosDBusServiceTransitional(MandosDBusService):
2374
 
            __metaclass__ = AlternateDBusNamesMetaclass
2375
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1993
        mandos_dbus_service = MandosDBusService()
2376
1994
    
2377
1995
    def cleanup():
2378
1996
        "Cleanup function; run on exit"
2379
1997
        service.cleanup()
2380
1998
        
2381
 
        multiprocessing.active_children()
2382
 
        if not (tcp_server.clients or client_settings):
2383
 
            return
2384
 
        
2385
 
        # Store client before exiting. Secrets are encrypted with key
2386
 
        # based on what config file has. If config file is
2387
 
        # removed/edited, old secret will thus be unrecovable.
2388
 
        clients = {}
2389
 
        with PGPEngine() as pgp:
2390
 
            for client in tcp_server.clients.itervalues():
2391
 
                key = client_settings[client.name]["secret"]
2392
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2393
 
                                                      key)
2394
 
                client_dict = {}
2395
 
                
2396
 
                # A list of attributes that can not be pickled
2397
 
                # + secret.
2398
 
                exclude = set(("bus", "changedstate", "secret",
2399
 
                               "checker"))
2400
 
                for name, typ in (inspect.getmembers
2401
 
                                  (dbus.service.Object)):
2402
 
                    exclude.add(name)
2403
 
                
2404
 
                client_dict["encrypted_secret"] = (client
2405
 
                                                   .encrypted_secret)
2406
 
                for attr in client.client_structure:
2407
 
                    if attr not in exclude:
2408
 
                        client_dict[attr] = getattr(client, attr)
2409
 
                
2410
 
                clients[client.name] = client_dict
2411
 
                del client_settings[client.name]["secret"]
2412
 
        
2413
 
        try:
2414
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
 
                                                prefix="clients-",
2416
 
                                                dir=os.path.dirname
2417
 
                                                (stored_state_path))
2418
 
            with os.fdopen(tempfd, "wb") as stored_state:
2419
 
                pickle.dump((clients, client_settings), stored_state)
2420
 
            os.rename(tempname, stored_state_path)
2421
 
        except (IOError, OSError) as e:
2422
 
            logger.warning("Could not save persistent state: {0}"
2423
 
                           .format(e))
2424
 
            if not debug:
2425
 
                try:
2426
 
                    os.remove(tempname)
2427
 
                except NameError:
2428
 
                    pass
2429
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
 
                                   errno.EEXIST)):
2431
 
                raise e
2432
 
        
2433
 
        # Delete all clients, and settings from config
2434
1999
        while tcp_server.clients:
2435
 
            name, client = tcp_server.clients.popitem()
 
2000
            client = tcp_server.clients.pop()
2436
2001
            if use_dbus:
2437
2002
                client.remove_from_connection()
 
2003
            client.disable_hook = None
2438
2004
            # Don't signal anything except ClientRemoved
2439
2005
            client.disable(quiet=True)
2440
2006
            if use_dbus:
2441
2007
                # Emit D-Bus signal
2442
 
                mandos_dbus_service.ClientRemoved(client
2443
 
                                                  .dbus_object_path,
 
2008
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2444
2009
                                                  client.name)
2445
 
        client_settings.clear()
2446
2010
    
2447
2011
    atexit.register(cleanup)
2448
2012
    
2449
 
    for client in tcp_server.clients.itervalues():
 
2013
    for client in tcp_server.clients:
2450
2014
        if use_dbus:
2451
2015
            # Emit D-Bus signal
2452
2016
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2453
 
        # Need to initiate checking of clients
2454
 
        if client.enabled:
2455
 
            client.init_checker()
 
2017
        client.enable()
2456
2018
    
2457
2019
    tcp_server.enable()
2458
2020
    tcp_server.server_activate()