88
84
    except ImportError:
 
89
85
        SO_BINDTODEVICE = None
 
92
 
stored_state_file = "clients.pickle"
 
94
90
logger = logging.getLogger()
 
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
 
                      (ctypes.util.find_library("c"))
 
101
 
except (OSError, AttributeError):
 
102
 
    def if_nametoindex(interface):
 
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
 
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
 
        with contextlib.closing(socket.socket()) as s:
 
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
 
                                struct.pack(b"16s16x", interface))
 
108
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
 
        return interface_index
 
112
 
def initlogger(debug, level=logging.WARNING):
 
113
 
    """init logger and add loglevel"""
 
116
 
    syslogger = (logging.handlers.SysLogHandler
 
118
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
119
 
                  address = "/dev/log"))
 
120
 
    syslogger.setFormatter(logging.Formatter
 
121
 
                           ('Mandos [%(process)d]: %(levelname)s:'
 
123
 
    logger.addHandler(syslogger)
 
126
 
        console = logging.StreamHandler()
 
127
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
131
 
        logger.addHandler(console)
 
132
 
    logger.setLevel(level)
 
135
 
class PGPError(Exception):
 
136
 
    """Exception if encryption/decryption fails"""
 
140
 
class PGPEngine(object):
 
141
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
143
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
144
 
        self.gnupgargs = ['--batch',
 
145
 
                          '--home', self.tempdir,
 
153
 
    def __exit__(self, exc_type, exc_value, traceback):
 
161
 
        if self.tempdir is not None:
 
162
 
            # Delete contents of tempdir
 
163
 
            for root, dirs, files in os.walk(self.tempdir,
 
165
 
                for filename in files:
 
166
 
                    os.remove(os.path.join(root, filename))
 
168
 
                    os.rmdir(os.path.join(root, dirname))
 
170
 
            os.rmdir(self.tempdir)
 
173
 
    def password_encode(self, password):
 
174
 
        # Passphrase can not be empty and can not contain newlines or
 
175
 
        # NUL bytes.  So we prefix it and hex encode it.
 
176
 
        encoded = b"mandos" + binascii.hexlify(password)
 
177
 
        if len(encoded) > 2048:
 
178
 
            # GnuPG can't handle long passwords, so encode differently
 
179
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
180
 
                       .replace(b"\n", b"\\n")
 
181
 
                       .replace(b"\0", b"\\x00"))
 
184
 
    def encrypt(self, data, password):
 
185
 
        passphrase = self.password_encode(password)
 
186
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
188
 
            passfile.write(passphrase)
 
190
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
194
 
                                    stdin = subprocess.PIPE,
 
195
 
                                    stdout = subprocess.PIPE,
 
196
 
                                    stderr = subprocess.PIPE)
 
197
 
            ciphertext, err = proc.communicate(input = data)
 
198
 
        if proc.returncode != 0:
 
202
 
    def decrypt(self, data, password):
 
203
 
        passphrase = self.password_encode(password)
 
204
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
206
 
            passfile.write(passphrase)
 
208
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
212
 
                                    stdin = subprocess.PIPE,
 
213
 
                                    stdout = subprocess.PIPE,
 
214
 
                                    stderr = subprocess.PIPE)
 
215
 
            decrypted_plaintext, err = proc.communicate(input
 
217
 
        if proc.returncode != 0:
 
219
 
        return decrypted_plaintext
 
 
91
stored_state_path = "/var/lib/mandos/clients.pickle"
 
 
93
syslogger = (logging.handlers.SysLogHandler
 
 
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
95
              address = str("/dev/log")))
 
 
96
syslogger.setFormatter(logging.Formatter
 
 
97
                       ('Mandos [%(process)d]: %(levelname)s:'
 
 
99
logger.addHandler(syslogger)
 
 
101
console = logging.StreamHandler()
 
 
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
106
logger.addHandler(console)
 
222
109
class AvahiError(Exception):
 
223
110
    def __init__(self, value, *args, **kwargs):
 
224
111
        self.value = value
 
225
 
        return super(AvahiError, self).__init__(value, *args,
 
 
112
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
113
    def __unicode__(self):
 
 
114
        return unicode(repr(self.value))
 
228
116
class AvahiServiceError(AvahiError):
 
 
426
310
    interval:   datetime.timedelta(); How often to start a new checker
 
427
311
    last_approval_request: datetime.datetime(); (UTC) or None
 
428
312
    last_checked_ok: datetime.datetime(); (UTC) or None
 
429
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
430
 
                         status of last checker. -1 reflects crashed
 
431
 
                         checker, -2 means no checker completed yet.
 
432
 
    last_enabled: datetime.datetime(); (UTC) or None
 
 
313
    last_checker_status: integer between 0 and 255 reflecting exit status
 
 
314
                         of last checker. -1 reflect crashed checker,
 
 
316
    last_enabled: datetime.datetime(); (UTC)
 
433
317
    name:       string; from the config file, used in log messages and
 
434
318
                        D-Bus identifiers
 
435
319
    secret:     bytestring; sent verbatim (over TLS) to client
 
436
320
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
437
321
                                      until this client is disabled
 
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
 
322
    extended_timeout:   extra long timeout when password has been sent
 
439
323
    runtime_expansions: Allowed attributes for runtime expansion.
 
440
324
    expires:    datetime.datetime(); time (UTC) when a client will be
 
441
325
                disabled, or None
 
442
 
    server_settings: The server_settings dict from main()
 
445
328
    runtime_expansions = ("approval_delay", "approval_duration",
 
446
 
                          "created", "enabled", "expires",
 
447
 
                          "fingerprint", "host", "interval",
 
448
 
                          "last_approval_request", "last_checked_ok",
 
 
329
                          "created", "enabled", "fingerprint",
 
 
330
                          "host", "interval", "last_checked_ok",
 
449
331
                          "last_enabled", "name", "timeout")
 
450
 
    client_defaults = { "timeout": "PT5M",
 
451
 
                        "extended_timeout": "PT15M",
 
453
 
                        "checker": "fping -q -- %%(host)s",
 
455
 
                        "approval_delay": "PT0S",
 
456
 
                        "approval_duration": "PT1S",
 
457
 
                        "approved_by_default": "True",
 
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.
 
470
 
        for client_name in config.sections():
 
471
 
            section = dict(config.items(client_name))
 
472
 
            client = settings[client_name] = {}
 
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,
 
481
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
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"])),
 
489
 
                    client["secret"] = secfile.read()
 
491
 
                raise TypeError("No secret or secfile for 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
 
508
 
    def __init__(self, settings, name = None, server_settings=None):
 
 
333
    def timeout_milliseconds(self):
 
 
334
        "Return the 'timeout' attribute in milliseconds"
 
 
335
        return _timedelta_to_milliseconds(self.timeout)
 
 
337
    def extended_timeout_milliseconds(self):
 
 
338
        "Return the 'extended_timeout' attribute in milliseconds"
 
 
339
        return _timedelta_to_milliseconds(self.extended_timeout)
 
 
341
    def interval_milliseconds(self):
 
 
342
        "Return the 'interval' attribute in milliseconds"
 
 
343
        return _timedelta_to_milliseconds(self.interval)
 
 
345
    def approval_delay_milliseconds(self):
 
 
346
        return _timedelta_to_milliseconds(self.approval_delay)
 
 
348
    def __init__(self, name = None, config=None):
 
 
349
        """Note: the 'checker' key in 'config' sets the
 
 
350
        'checker_command' attribute and *not* the 'checker'
 
510
 
        if server_settings is None:
 
512
 
        self.server_settings = server_settings
 
513
 
        # adding all client settings
 
514
 
        for setting, value in settings.items():
 
515
 
            setattr(self, setting, value)
 
518
 
            if not hasattr(self, "last_enabled"):
 
519
 
                self.last_enabled = datetime.datetime.utcnow()
 
520
 
            if not hasattr(self, "expires"):
 
521
 
                self.expires = (datetime.datetime.utcnow()
 
524
 
            self.last_enabled = None
 
527
355
        logger.debug("Creating client %r", self.name)
 
528
356
        # Uppercase and remove spaces from fingerprint for later
 
529
357
        # comparison purposes with return value from the fingerprint()
 
 
359
        self.fingerprint = (config["fingerprint"].upper()
 
531
361
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
532
 
        self.created = settings.get("created",
 
533
 
                                    datetime.datetime.utcnow())
 
535
 
        # attributes specific for this server instance
 
 
362
        if "secret" in config:
 
 
363
            self.secret = config["secret"].decode("base64")
 
 
364
        elif "secfile" in config:
 
 
365
            with open(os.path.expanduser(os.path.expandvars
 
 
366
                                         (config["secfile"])),
 
 
368
                self.secret = secfile.read()
 
 
370
            raise TypeError("No secret or secfile for client %s"
 
 
372
        self.host = config.get("host", "")
 
 
373
        self.created = datetime.datetime.utcnow()
 
 
375
        self.last_approval_request = None
 
 
376
        self.last_enabled = datetime.datetime.utcnow()
 
 
377
        self.last_checked_ok = None
 
 
378
        self.last_checker_status = None
 
 
379
        self.timeout = string_to_delta(config["timeout"])
 
 
380
        self.extended_timeout = string_to_delta(config
 
 
381
                                                ["extended_timeout"])
 
 
382
        self.interval = string_to_delta(config["interval"])
 
536
383
        self.checker = None
 
537
384
        self.checker_initiator_tag = None
 
538
385
        self.disable_initiator_tag = None
 
 
386
        self.expires = datetime.datetime.utcnow() + self.timeout
 
539
387
        self.checker_callback_tag = None
 
 
388
        self.checker_command = config["checker"]
 
540
389
        self.current_checker_command = None
 
 
390
        self._approved = None
 
 
391
        self.approved_by_default = config.get("approved_by_default",
 
542
393
        self.approvals_pending = 0
 
 
394
        self.approval_delay = string_to_delta(
 
 
395
            config["approval_delay"])
 
 
396
        self.approval_duration = string_to_delta(
 
 
397
            config["approval_duration"])
 
543
398
        self.changedstate = (multiprocessing_manager
 
544
399
                             .Condition(multiprocessing_manager
 
546
 
        self.client_structure = [attr for attr in
 
547
 
                                 self.__dict__.iterkeys()
 
548
 
                                 if not attr.startswith("_")]
 
 
401
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
549
402
        self.client_structure.append("client_structure")
 
551
405
        for name, t in inspect.getmembers(type(self),
 
 
406
                                          lambda obj: isinstance(obj, property)):
 
555
407
            if not name.startswith("_"):
 
556
408
                self.client_structure.append(name)
 
 
565
417
        if getattr(self, "enabled", False):
 
566
418
            # Already enabled
 
 
420
        self.send_changedstate()
 
568
421
        self.expires = datetime.datetime.utcnow() + self.timeout
 
569
422
        self.enabled = True
 
570
423
        self.last_enabled = datetime.datetime.utcnow()
 
571
424
        self.init_checker()
 
572
 
        self.send_changedstate()
 
574
426
    def disable(self, quiet=True):
 
575
427
        """Disable this client."""
 
576
428
        if not getattr(self, "enabled", False):
 
 
431
            self.send_changedstate()
 
579
433
            logger.info("Disabling client %s", self.name)
 
580
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
434
        if getattr(self, "disable_initiator_tag", False):
 
581
435
            gobject.source_remove(self.disable_initiator_tag)
 
582
436
            self.disable_initiator_tag = None
 
583
437
        self.expires = None
 
584
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
438
        if getattr(self, "checker_initiator_tag", False):
 
585
439
            gobject.source_remove(self.checker_initiator_tag)
 
586
440
            self.checker_initiator_tag = None
 
587
441
        self.stop_checker()
 
588
442
        self.enabled = False
 
590
 
            self.send_changedstate()
 
591
443
        # Do not run this again if called by a gobject.timeout_add
 
594
446
    def __del__(self):
 
597
449
    def init_checker(self):
 
598
450
        # Schedule a new checker to be started an 'interval' from now,
 
599
451
        # and every interval from then on.
 
600
 
        if self.checker_initiator_tag is not None:
 
601
 
            gobject.source_remove(self.checker_initiator_tag)
 
602
452
        self.checker_initiator_tag = (gobject.timeout_add
 
604
 
                                           .total_seconds() * 1000),
 
 
453
                                      (self.interval_milliseconds(),
 
605
454
                                       self.start_checker))
 
606
455
        # Schedule a disable() when 'timeout' has passed
 
607
 
        if self.disable_initiator_tag is not None:
 
608
 
            gobject.source_remove(self.disable_initiator_tag)
 
609
456
        self.disable_initiator_tag = (gobject.timeout_add
 
611
 
                                           .total_seconds() * 1000),
 
 
457
                                   (self.timeout_milliseconds(),
 
613
459
        # Also start a new checker *right now*.
 
614
460
        self.start_checker()
 
616
463
    def checker_callback(self, pid, condition, command):
 
617
464
        """The checker has completed, so take appropriate actions."""
 
618
465
        self.checker_callback_tag = None
 
619
466
        self.checker = None
 
620
467
        if os.WIFEXITED(condition):
 
621
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
468
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
622
469
            if self.last_checker_status == 0:
 
623
470
                logger.info("Checker for %(name)s succeeded",
 
 
749
583
        logger.debug("Stopping checker for %(name)s", vars(self))
 
751
 
            self.checker.terminate()
 
 
585
            os.kill(self.checker.pid, signal.SIGTERM)
 
753
587
            #if self.checker.poll() is None:
 
754
 
            #    self.checker.kill()
 
 
588
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
755
589
        except OSError as error:
 
756
590
            if error.errno != errno.ESRCH: # No such process
 
758
592
        self.checker = None
 
 
594
    # Encrypts a client secret and stores it in a varible encrypted_secret
 
 
595
    def encrypt_secret(self, key):
 
 
596
        # Encryption-key need to be of a specific size, so we hash inputed key
 
 
597
        hasheng = hashlib.sha256()
 
 
599
        encryptionkey = hasheng.digest()
 
 
601
        # Create validation hash so we know at decryption if it was sucessful
 
 
602
        hasheng = hashlib.sha256()
 
 
603
        hasheng.update(self.secret)
 
 
604
        validationhash = hasheng.digest()
 
 
607
        iv = os.urandom(Crypto.Cipher.AES.block_size)
 
 
608
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
 
609
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
 
610
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
 
 
611
        self.encrypted_secret = (ciphertext, iv)
 
 
613
    # Decrypt a encrypted client secret
 
 
614
    def decrypt_secret(self, key):
 
 
615
        # Decryption-key need to be of a specific size, so we hash inputed key
 
 
616
        hasheng = hashlib.sha256()
 
 
618
        encryptionkey = hasheng.digest()
 
 
620
        # Decrypt encrypted secret
 
 
621
        ciphertext, iv = self.encrypted_secret
 
 
622
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
 
623
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
 
624
        plain = ciphereng.decrypt(ciphertext)
 
 
626
        # Validate decrypted secret to know if it was succesful
 
 
627
        hasheng = hashlib.sha256()
 
 
628
        validationhash = plain[:hasheng.digest_size]
 
 
629
        secret = plain[hasheng.digest_size:]
 
 
630
        hasheng.update(secret)
 
 
632
        # if validation fails, we use key as new secret. Otherwhise, we use
 
 
633
        # the decrypted secret
 
 
634
        if hasheng.digest() == validationhash:
 
 
638
        del self.encrypted_secret
 
761
641
def dbus_service_property(dbus_interface, signature="v",
 
762
642
                          access="readwrite", byte_arrays=False):
 
 
1022
821
        except (AttributeError, xml.dom.DOMException,
 
1023
822
                xml.parsers.expat.ExpatError) as error:
 
1024
823
            logger.error("Failed to override Introspection method",
 
1026
825
        return xmlstring
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
 
828
def datetime_to_dbus (dt, variant_level=0):
 
1030
829
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1032
831
        return dbus.String("", variant_level = variant_level)
 
1033
832
    return dbus.String(dt.isoformat(),
 
1034
833
                       variant_level=variant_level)
 
1037
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1038
 
    """A class decorator; applied to a subclass of
 
1039
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1040
 
    interface names according to the "alt_interface_names" mapping.
 
1043
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1044
 
                                    "net.example.AlternateInterface"})
 
1045
 
    class SampleDBusObject(dbus.service.Object):
 
1046
 
        @dbus.service.method("org.example.Interface")
 
1047
 
        def SampleDBusMethod():
 
1050
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1051
 
    reachable via two interfaces: "org.example.Interface" and
 
1052
 
    "net.example.AlternateInterface", the latter of which will have
 
1053
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1054
 
    "true", unless "deprecate" is passed with a False value.
 
1056
 
    This works for methods and signals, and also for D-Bus properties
 
1057
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1058
 
    dbus_interface_annotations decorator).
 
 
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
 
837
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
 
838
    will add additional D-Bus attributes matching a certain pattern.
 
1061
 
        for orig_interface_name, alt_interface_name in (
 
1062
 
            alt_interface_names.items()):
 
1064
 
            interface_names = set()
 
1065
 
            # Go though all attributes of the class
 
1066
 
            for attrname, attribute in inspect.getmembers(cls):
 
 
840
    def __new__(mcs, name, bases, attr):
 
 
841
        # Go through all the base classes which could have D-Bus
 
 
842
        # methods, signals, or properties in them
 
 
843
        for base in (b for b in bases
 
 
844
                     if issubclass(b, dbus.service.Object)):
 
 
845
            # Go though all attributes of the base class
 
 
846
            for attrname, attribute in inspect.getmembers(base):
 
1067
847
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1068
848
                # with the wrong interface name
 
1069
849
                if (not hasattr(attribute, "_dbus_interface")
 
1070
850
                    or not attribute._dbus_interface
 
1071
 
                    .startswith(orig_interface_name)):
 
 
851
                    .startswith("se.recompile.Mandos")):
 
1073
853
                # Create an alternate D-Bus interface name based on
 
1074
854
                # the current name
 
1075
855
                alt_interface = (attribute._dbus_interface
 
1076
 
                                 .replace(orig_interface_name,
 
1077
 
                                          alt_interface_name))
 
1078
 
                interface_names.add(alt_interface)
 
 
856
                                 .replace("se.recompile.Mandos",
 
 
857
                                          "se.bsnet.fukt.Mandos"))
 
1079
858
                # Is this a D-Bus signal?
 
1080
859
                if getattr(attribute, "_dbus_is_signal", False):
 
1081
 
                    # Extract the original non-method undecorated
 
1082
 
                    # function by black magic
 
 
860
                    # Extract the original non-method function by
 
1083
862
                    nonmethod_func = (dict(
 
1084
863
                            zip(attribute.func_code.co_freevars,
 
1085
864
                                attribute.__closure__))["func"]
 
 
1271
998
                                       checker is not None)
 
1272
999
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1273
1000
                                           "LastCheckedOK")
 
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1275
 
                                               "LastCheckerStatus")
 
1276
1001
    last_approval_request = notifychangeproperty(
 
1277
1002
        datetime_to_dbus, "LastApprovalRequest")
 
1278
1003
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1279
1004
                                               "ApprovedByDefault")
 
1280
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
 
1005
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1281
1006
                                          "ApprovalDelay",
 
1283
 
                                          lambda td: td.total_seconds()
 
 
1008
                                          _timedelta_to_milliseconds)
 
1285
1009
    approval_duration = notifychangeproperty(
 
1286
 
        dbus.UInt64, "ApprovalDuration",
 
1287
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1010
        dbus.UInt16, "ApprovalDuration",
 
 
1011
        type_func = _timedelta_to_milliseconds)
 
1288
1012
    host = notifychangeproperty(dbus.String, "Host")
 
1289
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1290
 
                                   type_func = lambda td:
 
1291
 
                                       td.total_seconds() * 1000)
 
 
1013
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
 
1015
                                   _timedelta_to_milliseconds)
 
1292
1016
    extended_timeout = notifychangeproperty(
 
1293
 
        dbus.UInt64, "ExtendedTimeout",
 
1294
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1295
 
    interval = notifychangeproperty(dbus.UInt64,
 
 
1017
        dbus.UInt16, "ExtendedTimeout",
 
 
1018
        type_func = _timedelta_to_milliseconds)
 
 
1019
    interval = notifychangeproperty(dbus.UInt16,
 
1298
 
                                    lambda td: td.total_seconds()
 
 
1022
                                    _timedelta_to_milliseconds)
 
1300
1023
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1302
1025
    del notifychangeproperty
 
 
1906
1625
        use_ipv6:       Boolean; to use IPv6 or not
 
1908
1627
    def __init__(self, server_address, RequestHandlerClass,
 
1909
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1910
 
        """If socketfd is set, use that file descriptor instead of
 
1911
 
        creating a new one with socket.socket().
 
 
1628
                 interface=None, use_ipv6=True):
 
1913
1629
        self.interface = interface
 
1915
1631
            self.address_family = socket.AF_INET6
 
1916
 
        if socketfd is not None:
 
1917
 
            # Save the file descriptor
 
1918
 
            self.socketfd = socketfd
 
1919
 
            # Save the original socket.socket() function
 
1920
 
            self.socket_socket = socket.socket
 
1921
 
            # To implement --socket, we monkey patch socket.socket.
 
1923
 
            # (When socketserver.TCPServer is a new-style class, we
 
1924
 
            # could make self.socket into a property instead of monkey
 
1925
 
            # patching socket.socket.)
 
1927
 
            # Create a one-time-only replacement for socket.socket()
 
1928
 
            @functools.wraps(socket.socket)
 
1929
 
            def socket_wrapper(*args, **kwargs):
 
1930
 
                # Restore original function so subsequent calls are
 
1932
 
                socket.socket = self.socket_socket
 
1933
 
                del self.socket_socket
 
1934
 
                # This time only, return a new socket object from the
 
1935
 
                # saved file descriptor.
 
1936
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1937
 
            # Replace socket.socket() function with wrapper
 
1938
 
            socket.socket = socket_wrapper
 
1939
 
        # The socketserver.TCPServer.__init__ will call
 
1940
 
        # socket.socket(), which might be our replacement,
 
1941
 
        # socket_wrapper(), if socketfd was set.
 
1942
1632
        socketserver.TCPServer.__init__(self, server_address,
 
1943
1633
                                        RequestHandlerClass)
 
1945
1634
    def server_bind(self):
 
1946
1635
        """This overrides the normal server_bind() function
 
1947
1636
        to bind to an interface if one was specified, and also NOT to
 
 
2101
 
def rfc3339_duration_to_delta(duration):
 
2102
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2104
 
    >>> rfc3339_duration_to_delta("P7D")
 
2105
 
    datetime.timedelta(7)
 
2106
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2107
 
    datetime.timedelta(0, 60)
 
2108
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2109
 
    datetime.timedelta(0, 3600)
 
2110
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2111
 
    datetime.timedelta(1)
 
2112
 
    >>> rfc3339_duration_to_delta("P1W")
 
2113
 
    datetime.timedelta(7)
 
2114
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2115
 
    datetime.timedelta(0, 330)
 
2116
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2117
 
    datetime.timedelta(1, 200)
 
2120
 
    # Parsing an RFC 3339 duration with regular expressions is not
 
2121
 
    # possible - there would have to be multiple places for the same
 
2122
 
    # values, like seconds.  The current code, while more esoteric, is
 
2123
 
    # cleaner without depending on a parsing library.  If Python had a
 
2124
 
    # built-in library for parsing we would use it, but we'd like to
 
2125
 
    # avoid excessive use of external libraries.
 
2127
 
    # New type for defining tokens, syntax, and semantics all-in-one
 
2128
 
    Token = collections.namedtuple("Token",
 
2129
 
                                   ("regexp", # To match token; if
 
2130
 
                                              # "value" is not None,
 
2131
 
                                              # must have a "group"
 
2133
 
                                    "value",  # datetime.timedelta or
 
2135
 
                                    "followers")) # Tokens valid after
 
2137
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2138
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2139
 
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2140
 
    token_second = Token(re.compile(r"(\d+)S"),
 
2141
 
                         datetime.timedelta(seconds=1),
 
2142
 
                         frozenset((token_end,)))
 
2143
 
    token_minute = Token(re.compile(r"(\d+)M"),
 
2144
 
                         datetime.timedelta(minutes=1),
 
2145
 
                         frozenset((token_second, token_end)))
 
2146
 
    token_hour = Token(re.compile(r"(\d+)H"),
 
2147
 
                       datetime.timedelta(hours=1),
 
2148
 
                       frozenset((token_minute, token_end)))
 
2149
 
    token_time = Token(re.compile(r"T"),
 
2151
 
                       frozenset((token_hour, token_minute,
 
2153
 
    token_day = Token(re.compile(r"(\d+)D"),
 
2154
 
                      datetime.timedelta(days=1),
 
2155
 
                      frozenset((token_time, token_end)))
 
2156
 
    token_month = Token(re.compile(r"(\d+)M"),
 
2157
 
                        datetime.timedelta(weeks=4),
 
2158
 
                        frozenset((token_day, token_end)))
 
2159
 
    token_year = Token(re.compile(r"(\d+)Y"),
 
2160
 
                       datetime.timedelta(weeks=52),
 
2161
 
                       frozenset((token_month, token_end)))
 
2162
 
    token_week = Token(re.compile(r"(\d+)W"),
 
2163
 
                       datetime.timedelta(weeks=1),
 
2164
 
                       frozenset((token_end,)))
 
2165
 
    token_duration = Token(re.compile(r"P"), None,
 
2166
 
                           frozenset((token_year, token_month,
 
2167
 
                                      token_day, token_time,
 
2169
 
    # Define starting values
 
2170
 
    value = datetime.timedelta() # Value so far
 
2172
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2173
 
    s = duration                # String left to parse
 
2174
 
    # Loop until end token is found
 
2175
 
    while found_token is not token_end:
 
2176
 
        # Search for any currently valid tokens
 
2177
 
        for token in followers:
 
2178
 
            match = token.regexp.match(s)
 
2179
 
            if match is not None:
 
2181
 
                if token.value is not None:
 
2182
 
                    # Value found, parse digits
 
2183
 
                    factor = int(match.group(1), 10)
 
2184
 
                    # Add to value so far
 
2185
 
                    value += factor * token.value
 
2186
 
                # Strip token from string
 
2187
 
                s = token.regexp.sub("", s, 1)
 
2190
 
                # Set valid next tokens
 
2191
 
                followers = found_token.followers
 
2194
 
            # No currently valid tokens were found
 
2195
 
            raise ValueError("Invalid RFC 3339 duration")
 
2200
1801
def string_to_delta(interval):
 
2201
1802
    """Parse a string and return a datetime.timedelta
 
 
2300
1919
    parser.add_argument("--no-dbus", action="store_false",
 
2301
1920
                        dest="use_dbus", help="Do not provide D-Bus"
 
2302
 
                        " system bus interface", default=None)
 
 
1921
                        " system bus interface")
 
2303
1922
    parser.add_argument("--no-ipv6", action="store_false",
 
2304
 
                        dest="use_ipv6", help="Do not use IPv6",
 
 
1923
                        dest="use_ipv6", help="Do not use IPv6")
 
2306
1924
    parser.add_argument("--no-restore", action="store_false",
 
2307
 
                        dest="restore", help="Do not restore stored"
 
2308
 
                        " state", default=None)
 
2309
 
    parser.add_argument("--socket", type=int,
 
2310
 
                        help="Specify a file descriptor to a network"
 
2311
 
                        " socket to use instead of creating one")
 
2312
 
    parser.add_argument("--statedir", metavar="DIR",
 
2313
 
                        help="Directory to save/restore state in")
 
2314
 
    parser.add_argument("--foreground", action="store_true",
 
2315
 
                        help="Run in foreground", default=None)
 
2316
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2317
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
1925
                        dest="restore", help="Do not restore stored state",
 
2320
1928
    options = parser.parse_args()
 
2322
1930
    if options.check:
 
2324
 
        fail_count, test_count = doctest.testmod()
 
2325
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2327
1935
    # Default values for config file for server-global settings
 
2328
1936
    server_defaults = { "interface": "",
 
 
2350
1953
    # Convert the SafeConfigParser object to a dict
 
2351
1954
    server_settings = server_config.defaults()
 
2352
1955
    # Use the appropriate methods on the non-string config options
 
2353
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
1956
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2354
1957
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2356
1959
    if server_settings["port"]:
 
2357
1960
        server_settings["port"] = server_config.getint("DEFAULT",
 
2359
 
    if server_settings["socket"]:
 
2360
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2362
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2363
 
        # over with an opened os.devnull.  But we don't want this to
 
2364
 
        # happen with a supplied network socket.
 
2365
 
        if 0 <= server_settings["socket"] <= 2:
 
2366
 
            server_settings["socket"] = os.dup(server_settings
 
2368
1962
    del server_config
 
2370
1964
    # Override the settings from the config file with command line
 
2371
1965
    # options, if set.
 
2372
1966
    for option in ("interface", "address", "port", "debug",
 
2373
1967
                   "priority", "servicename", "configdir",
 
2374
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2375
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
 
1968
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2376
1969
        value = getattr(options, option)
 
2377
1970
        if value is not None:
 
2378
1971
            server_settings[option] = value
 
2380
1973
    # Force all strings to be unicode
 
2381
1974
    for option in server_settings.keys():
 
2382
 
        if isinstance(server_settings[option], bytes):
 
2383
 
            server_settings[option] = (server_settings[option]
 
2385
 
    # Force all boolean options to be boolean
 
2386
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2387
 
                   "foreground", "zeroconf"):
 
2388
 
        server_settings[option] = bool(server_settings[option])
 
2389
 
    # Debug implies foreground
 
2390
 
    if server_settings["debug"]:
 
2391
 
        server_settings["foreground"] = True
 
 
1975
        if type(server_settings[option]) is str:
 
 
1976
            server_settings[option] = unicode(server_settings[option])
 
2392
1977
    # Now we have our good server settings in "server_settings"
 
2394
1979
    ##################################################################
 
2396
 
    if (not server_settings["zeroconf"] and
 
2397
 
        not (server_settings["port"]
 
2398
 
             or server_settings["socket"] != "")):
 
2399
 
            parser.error("Needs port or socket to work without"
 
2402
1981
    # For convenience
 
2403
1982
    debug = server_settings["debug"]
 
2404
1983
    debuglevel = server_settings["debuglevel"]
 
2405
1984
    use_dbus = server_settings["use_dbus"]
 
2406
1985
    use_ipv6 = server_settings["use_ipv6"]
 
2407
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
2409
 
    foreground = server_settings["foreground"]
 
2410
 
    zeroconf = server_settings["zeroconf"]
 
2413
 
        initlogger(debug, logging.DEBUG)
 
2418
 
            level = getattr(logging, debuglevel.upper())
 
2419
 
            initlogger(debug, level)
 
2421
1987
    if server_settings["servicename"] != "Mandos":
 
2422
1988
        syslogger.setFormatter(logging.Formatter
 
2423
 
                               ('Mandos ({}) [%(process)d]:'
 
2424
 
                                ' %(levelname)s: %(message)s'
 
2425
 
                                .format(server_settings
 
 
1989
                               ('Mandos (%s) [%%(process)d]:'
 
 
1990
                                ' %%(levelname)s: %%(message)s'
 
 
1991
                                % server_settings["servicename"]))
 
2428
1993
    # Parse config file with clients
 
2429
 
    client_config = configparser.SafeConfigParser(Client
 
 
1994
    client_defaults = { "timeout": "5m",
 
 
1995
                        "extended_timeout": "15m",
 
 
1997
                        "checker": "fping -q -- %%(host)s",
 
 
1999
                        "approval_delay": "0s",
 
 
2000
                        "approval_duration": "1s",
 
 
2002
    client_config = configparser.SafeConfigParser(client_defaults)
 
2431
2003
    client_config.read(os.path.join(server_settings["configdir"],
 
2432
2004
                                    "clients.conf"))
 
2434
2006
    global mandos_dbus_service
 
2435
2007
    mandos_dbus_service = None
 
2438
 
    if server_settings["socket"] != "":
 
2439
 
        socketfd = server_settings["socket"]
 
2440
2009
    tcp_server = MandosServer((server_settings["address"],
 
2441
2010
                               server_settings["port"]),
 
 
2518
2092
                            ("se.bsnet.fukt.Mandos", bus,
 
2519
2093
                             do_not_queue=True))
 
2520
2094
        except dbus.exceptions.NameExistsException as e:
 
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
2095
            logger.error(unicode(e) + ", disabling D-Bus")
 
2522
2096
            use_dbus = False
 
2523
2097
            server_settings["use_dbus"] = False
 
2524
2098
            tcp_server.use_dbus = False
 
2526
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2527
 
        service = AvahiServiceToSyslog(name =
 
2528
 
                                       server_settings["servicename"],
 
2529
 
                                       servicetype = "_mandos._tcp",
 
2530
 
                                       protocol = protocol, bus = bus)
 
2531
 
        if server_settings["interface"]:
 
2532
 
            service.interface = (if_nametoindex
 
2533
 
                                 (server_settings["interface"]
 
 
2099
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2100
    service = AvahiServiceToSyslog(name =
 
 
2101
                                   server_settings["servicename"],
 
 
2102
                                   servicetype = "_mandos._tcp",
 
 
2103
                                   protocol = protocol, bus = bus)
 
 
2104
    if server_settings["interface"]:
 
 
2105
        service.interface = (if_nametoindex
 
 
2106
                             (str(server_settings["interface"])))
 
2536
2108
    global multiprocessing_manager
 
2537
2109
    multiprocessing_manager = multiprocessing.Manager()
 
2539
2111
    client_class = Client
 
2541
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2543
 
    client_settings = Client.config_parser(client_config)
 
 
2113
        client_class = functools.partial(ClientDBusTransitional,
 
 
2116
    special_settings = {
 
 
2117
        # Some settings need to be accessd by special methods;
 
 
2118
        # booleans need .getboolean(), etc.  Here is a list of them:
 
 
2119
        "approved_by_default":
 
 
2121
            client_config.getboolean(section, "approved_by_default"),
 
 
2123
    # Construct a new dict of client settings of this form:
 
 
2124
    # { client_name: {setting_name: value, ...}, ...}
 
 
2125
    # with exceptions for any special settings as defined above
 
 
2126
    client_settings = dict((clientname,
 
 
2128
                                 (value if setting not in special_settings
 
 
2129
                                  else special_settings[setting](clientname)))
 
 
2130
                                for setting, value in client_config.items(clientname)))
 
 
2131
                          for clientname in client_config.sections())
 
2544
2133
    old_client_settings = {}
 
2547
 
    # This is used to redirect stdout and stderr for checker processes
 
2549
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2550
 
    # Only used if server is running in foreground but not in debug
 
2552
 
    if debug or not foreground:
 
2555
 
    # Get client data and settings from last running state.
 
 
2136
    # Get client data and settings from last running state. 
 
2556
2137
    if server_settings["restore"]:
 
2558
2139
            with open(stored_state_path, "rb") as stored_state:
 
2559
 
                clients_data, old_client_settings = (pickle.load
 
 
2140
                clients_data, old_client_settings = pickle.load(stored_state)
 
2561
2141
            os.remove(stored_state_path)
 
2562
2142
        except IOError as e:
 
2563
 
            if e.errno == errno.ENOENT:
 
2564
 
                logger.warning("Could not load persistent state: {}"
 
2565
 
                                .format(os.strerror(e.errno)))
 
2567
 
                logger.critical("Could not load persistent state:",
 
 
2143
            logger.warning("Could not load persistant state: {0}".format(e))
 
 
2144
            if e.errno != errno.ENOENT:
 
2570
 
        except EOFError as e:
 
2571
 
            logger.warning("Could not load persistent state: "
 
2572
 
                           "EOFError:", exc_info=e)
 
2574
 
    with PGPEngine() as pgp:
 
2575
 
        for client_name, client in clients_data.items():
 
2576
 
            # Skip removed clients
 
2577
 
            if client_name not in client_settings:
 
2580
 
            # Decide which value to use after restoring saved state.
 
2581
 
            # We have three different values: Old config file,
 
2582
 
            # new config file, and saved state.
 
2583
 
            # New config value takes precedence if it differs from old
 
2584
 
            # config value, otherwise use saved state.
 
2585
 
            for name, value in client_settings[client_name].items():
 
2587
 
                    # For each value in new config, check if it
 
2588
 
                    # differs from the old config value (Except for
 
2589
 
                    # the "secret" attribute)
 
2590
 
                    if (name != "secret" and
 
2591
 
                        value != old_client_settings[client_name]
 
2593
 
                        client[name] = value
 
2597
 
            # Clients who has passed its expire date can still be
 
2598
 
            # enabled if its last checker was successful.  Clients
 
2599
 
            # whose checker succeeded before we stored its state is
 
2600
 
            # assumed to have successfully run all checkers during
 
2602
 
            if client["enabled"]:
 
2603
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
2604
 
                    if not client["last_checked_ok"]:
 
2606
 
                            "disabling client {} - Client never "
 
2607
 
                            "performed a successful checker"
 
2608
 
                            .format(client_name))
 
2609
 
                        client["enabled"] = False
 
2610
 
                    elif client["last_checker_status"] != 0:
 
2612
 
                            "disabling client {} - Client last"
 
2613
 
                            " checker failed with error code {}"
 
2614
 
                            .format(client_name,
 
2615
 
                                    client["last_checker_status"]))
 
2616
 
                        client["enabled"] = False
 
2618
 
                        client["expires"] = (datetime.datetime
 
2620
 
                                             + client["timeout"])
 
2621
 
                        logger.debug("Last checker succeeded,"
 
2622
 
                                     " keeping {} enabled"
 
2623
 
                                     .format(client_name))
 
 
2147
    for client in clients_data:
 
 
2148
        client_name = client["name"]
 
 
2150
        # Decide which value to use after restoring saved state.
 
 
2151
        # We have three different values: Old config file,
 
 
2152
        # new config file, and saved state.
 
 
2153
        # New config value takes precedence if it differs from old
 
 
2154
        # config value, otherwise use saved state.
 
 
2155
        for name, value in client_settings[client_name].items():
 
2625
 
                client["secret"] = (
 
2626
 
                    pgp.decrypt(client["encrypted_secret"],
 
2627
 
                                client_settings[client_name]
 
2630
 
                # If decryption fails, we use secret from new settings
 
2631
 
                logger.debug("Failed to decrypt {} old secret"
 
2632
 
                             .format(client_name))
 
2633
 
                client["secret"] = (
 
2634
 
                    client_settings[client_name]["secret"])
 
2636
 
    # Add/remove clients based on new changes made to config
 
2637
 
    for client_name in (set(old_client_settings)
 
2638
 
                        - set(client_settings)):
 
2639
 
        del clients_data[client_name]
 
2640
 
    for client_name in (set(client_settings)
 
2641
 
                        - set(old_client_settings)):
 
2642
 
        clients_data[client_name] = client_settings[client_name]
 
2644
 
    # Create all client objects
 
2645
 
    for client_name, client in clients_data.items():
 
2646
 
        tcp_server.clients[client_name] = client_class(
 
2647
 
            name = client_name, settings = client,
 
2648
 
            server_settings = server_settings)
 
 
2157
                # For each value in new config, check if it differs
 
 
2158
                # from the old config value (Except for the "secret"
 
 
2160
                if name != "secret" and value != old_client_settings[client_name][name]:
 
 
2161
                    setattr(client, name, value)
 
 
2165
        # Clients who has passed its expire date, can still be enabled if its
 
 
2166
        # last checker was sucessful. Clients who checkers failed before we
 
 
2167
        # stored it state is asumed to had failed checker during downtime.
 
 
2168
        if client["enabled"] and client["last_checked_ok"]:
 
 
2169
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
 
 
2170
                > client["interval"]):
 
 
2171
                if client["last_checker_status"] != 0:
 
 
2172
                    client["enabled"] = False
 
 
2174
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
 
 
2176
        client["changedstate"] = (multiprocessing_manager
 
 
2177
                                  .Condition(multiprocessing_manager
 
 
2180
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
 
 
2181
            tcp_server.clients[client_name] = new_client
 
 
2182
            new_client.bus = bus
 
 
2183
            for name, value in client.iteritems():
 
 
2184
                setattr(new_client, name, value)
 
 
2185
            client_object_name = unicode(client_name).translate(
 
 
2186
                {ord("."): ord("_"),
 
 
2187
                 ord("-"): ord("_")})
 
 
2188
            new_client.dbus_object_path = (dbus.ObjectPath
 
 
2189
                                     ("/clients/" + client_object_name))
 
 
2190
            DBusObjectWithProperties.__init__(new_client,
 
 
2192
                                              new_client.dbus_object_path)
 
 
2194
            tcp_server.clients[client_name] = Client.__new__(Client)
 
 
2195
            for name, value in client.iteritems():
 
 
2196
                setattr(tcp_server.clients[client_name], name, value)
 
 
2198
        tcp_server.clients[client_name].decrypt_secret(
 
 
2199
            client_settings[client_name]["secret"])            
 
 
2201
    # Create/remove clients based on new changes made to config
 
 
2202
    for clientname in set(old_client_settings) - set(client_settings):
 
 
2203
        del tcp_server.clients[clientname]
 
 
2204
    for clientname in set(client_settings) - set(old_client_settings):
 
 
2205
        tcp_server.clients[clientname] = (client_class(name = clientname,
 
2650
2211
    if not tcp_server.clients:
 
2651
2212
        logger.warning("No clients defined")
 
2654
 
        if pidfile is not None:
 
2658
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2660
 
                logger.error("Could not write to file %r with PID %d",
 
 
2218
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
2221
            logger.error("Could not write to file %r with PID %d",
 
 
2224
            # "pidfile" was never created
 
2663
2226
        del pidfilename
 
 
2228
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2665
2230
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2666
2231
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
2669
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2670
 
                                        "se.bsnet.fukt.Mandos"})
 
2671
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
2234
        class MandosDBusService(dbus.service.Object):
 
2672
2235
            """A D-Bus proxy object"""
 
2673
2236
            def __init__(self):
 
2674
2237
                dbus.service.Object.__init__(self, bus, "/")
 
2675
2238
            _interface = "se.recompile.Mandos"
 
2677
 
            @dbus_interface_annotations(_interface)
 
2679
 
                return { "org.freedesktop.DBus.Property"
 
2680
 
                         ".EmitsChangedSignal":
 
2683
2240
            @dbus.service.signal(_interface, signature="o")
 
2684
2241
            def ClientAdded(self, objpath):
 
 
2730
 
        mandos_dbus_service = MandosDBusService()
 
 
2287
        class MandosDBusServiceTransitional(MandosDBusService):
 
 
2288
            __metaclass__ = AlternateDBusNamesMetaclass
 
 
2289
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2733
2292
        "Cleanup function; run on exit"
 
2737
2295
        multiprocessing.active_children()
 
2739
2296
        if not (tcp_server.clients or client_settings):
 
2742
 
        # Store client before exiting. Secrets are encrypted with key
 
2743
 
        # based on what config file has. If config file is
 
2744
 
        # removed/edited, old secret will thus be unrecovable.
 
2746
 
        with PGPEngine() as pgp:
 
2747
 
            for client in tcp_server.clients.itervalues():
 
2748
 
                key = client_settings[client.name]["secret"]
 
2749
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2753
 
                # A list of attributes that can not be pickled
 
2755
 
                exclude = { "bus", "changedstate", "secret",
 
2756
 
                            "checker", "server_settings" }
 
2757
 
                for name, typ in (inspect.getmembers
 
2758
 
                                  (dbus.service.Object)):
 
2761
 
                client_dict["encrypted_secret"] = (client
 
2763
 
                for attr in client.client_structure:
 
2764
 
                    if attr not in exclude:
 
2765
 
                        client_dict[attr] = getattr(client, attr)
 
2767
 
                clients[client.name] = client_dict
 
2768
 
                del client_settings[client.name]["secret"]
 
 
2299
        # Store client before exiting. Secrets are encrypted with key based
 
 
2300
        # on what config file has. If config file is removed/edited, old
 
 
2301
        # secret will thus be unrecovable.
 
 
2303
        for client in tcp_server.clients.itervalues():
 
 
2304
            client.encrypt_secret(client_settings[client.name]["secret"])
 
 
2308
            # A list of attributes that will not be stored when shuting down.
 
 
2309
            exclude = set(("bus", "changedstate", "secret"))            
 
 
2310
            for name, typ in inspect.getmembers(dbus.service.Object):
 
 
2313
            client_dict["encrypted_secret"] = client.encrypted_secret
 
 
2314
            for attr in client.client_structure:
 
 
2315
                if attr not in exclude:
 
 
2316
                    client_dict[attr] = getattr(client, attr)
 
 
2318
            clients.append(client_dict) 
 
 
2319
            del client_settings[client.name]["secret"]
 
2771
 
            with (tempfile.NamedTemporaryFile
 
2772
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2773
 
                   dir=os.path.dirname(stored_state_path),
 
2774
 
                   delete=False)) as stored_state:
 
 
2322
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
2775
2323
                pickle.dump((clients, client_settings), stored_state)
 
2776
 
                tempname=stored_state.name
 
2777
 
            os.rename(tempname, stored_state_path)
 
2778
 
        except (IOError, OSError) as e:
 
2784
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2785
 
                logger.warning("Could not save persistent state: {}"
 
2786
 
                               .format(os.strerror(e.errno)))
 
2788
 
                logger.warning("Could not save persistent state:",
 
 
2324
        except IOError as e:
 
 
2325
            logger.warning("Could not save persistant state: {0}".format(e))
 
 
2326
            if e.errno != errno.ENOENT:
 
2792
2329
        # Delete all clients, and settings from config
 
2793
2330
        while tcp_server.clients:
 
2794
2331
            name, client = tcp_server.clients.popitem()