111
111
        return interface_index
 
114
 
def initlogger(debug, level=logging.WARNING):
 
 
114
def initlogger(level=logging.WARNING):
 
115
115
    """init logger and add loglevel"""
 
117
 
    syslogger = (logging.handlers.SysLogHandler
 
119
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
120
 
                  address = str("/dev/log")))
 
121
117
    syslogger.setFormatter(logging.Formatter
 
122
118
                           ('Mandos [%(process)d]: %(levelname)s:'
 
124
120
    logger.addHandler(syslogger)
 
127
 
        console = logging.StreamHandler()
 
128
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
132
 
        logger.addHandler(console)
 
 
122
    console = logging.StreamHandler()
 
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
127
    logger.addHandler(console)
 
133
128
    logger.setLevel(level)
 
136
 
class PGPError(Exception):
 
137
 
    """Exception if encryption/decryption fails"""
 
 
131
class CryptoError(Exception):
 
141
 
class PGPEngine(object):
 
 
135
class Crypto(object):
 
142
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
143
137
    def __init__(self):
 
 
138
        self.gnupg = GnuPGInterface.GnuPG()
 
144
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
145
 
        self.gnupgargs = ['--batch',
 
146
 
                          '--home', self.tempdir,
 
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
 
141
        self.gnupg.options.meta_interactive = False
 
 
142
        self.gnupg.options.homedir = self.tempdir
 
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
151
146
    def __enter__(self):
 
154
 
    def __exit__(self, exc_type, exc_value, traceback):
 
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
 
 
174
169
    def password_encode(self, password):
 
175
170
        # Passphrase can not be empty and can not contain newlines or
 
176
171
        # NUL bytes.  So we prefix it and hex encode it.
 
177
 
        encoded = b"mandos" + binascii.hexlify(password)
 
178
 
        if len(encoded) > 2048:
 
179
 
            # GnuPG can't handle long passwords, so encode differently
 
180
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
181
 
                       .replace(b"\n", b"\\n")
 
182
 
                       .replace(b"\0", b"\\x00"))
 
 
172
        return b"mandos" + binascii.hexlify(password)
 
185
174
    def encrypt(self, data, password):
 
186
 
        passphrase = self.password_encode(password)
 
187
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
189
 
            passfile.write(passphrase)
 
191
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
195
 
                                    stdin = subprocess.PIPE,
 
196
 
                                    stdout = subprocess.PIPE,
 
197
 
                                    stderr = subprocess.PIPE)
 
198
 
            ciphertext, err = proc.communicate(input = data)
 
199
 
        if proc.returncode != 0:
 
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
 
176
        with open(os.devnull) as devnull:
 
 
178
                proc = self.gnupg.run(['--symmetric'],
 
 
179
                                      create_fhs=['stdin', 'stdout'],
 
 
180
                                      attach_fhs={'stderr': devnull})
 
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
 
184
                    ciphertext = f.read()
 
 
188
        self.gnupg.passphrase = None
 
201
189
        return ciphertext
 
203
191
    def decrypt(self, data, password):
 
204
 
        passphrase = self.password_encode(password)
 
205
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
207
 
            passfile.write(passphrase)
 
209
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
213
 
                                    stdin = subprocess.PIPE,
 
214
 
                                    stdout = subprocess.PIPE,
 
215
 
                                    stderr = subprocess.PIPE)
 
216
 
            decrypted_plaintext, err = proc.communicate(input
 
218
 
        if proc.returncode != 0:
 
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
 
193
        with open(os.devnull) as devnull:
 
 
195
                proc = self.gnupg.run(['--decrypt'],
 
 
196
                                      create_fhs=['stdin', 'stdout'],
 
 
197
                                      attach_fhs={'stderr': devnull})
 
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
 
201
                    decrypted_plaintext = f.read()
 
 
205
        self.gnupg.passphrase = None
 
220
206
        return decrypted_plaintext
 
223
210
class AvahiError(Exception):
 
224
211
    def __init__(self, value, *args, **kwargs):
 
225
212
        self.value = value
 
 
435
411
    interval:   datetime.timedelta(); How often to start a new checker
 
436
412
    last_approval_request: datetime.datetime(); (UTC) or None
 
437
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
438
415
    last_checker_status: integer between 0 and 255 reflecting exit
 
439
416
                         status of last checker. -1 reflects crashed
 
440
 
                         checker, -2 means no checker completed yet.
 
441
418
    last_enabled: datetime.datetime(); (UTC) or None
 
442
419
    name:       string; from the config file, used in log messages and
 
443
420
                        D-Bus identifiers
 
444
421
    secret:     bytestring; sent verbatim (over TLS) to client
 
445
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
446
423
                                      until this client is disabled
 
447
 
    extended_timeout:   extra long timeout when secret has been sent
 
 
424
    extended_timeout:   extra long timeout when password has been sent
 
448
425
    runtime_expansions: Allowed attributes for runtime expansion.
 
449
426
    expires:    datetime.datetime(); time (UTC) when a client will be
 
450
427
                disabled, or None
 
451
 
    server_settings: The server_settings dict from main()
 
454
430
    runtime_expansions = ("approval_delay", "approval_duration",
 
455
 
                          "created", "enabled", "expires",
 
456
 
                          "fingerprint", "host", "interval",
 
457
 
                          "last_approval_request", "last_checked_ok",
 
 
431
                          "created", "enabled", "fingerprint",
 
 
432
                          "host", "interval", "last_checked_ok",
 
458
433
                          "last_enabled", "name", "timeout")
 
459
 
    client_defaults = { "timeout": "PT5M",
 
460
 
                        "extended_timeout": "PT15M",
 
462
 
                        "checker": "fping -q -- %%(host)s",
 
464
 
                        "approval_delay": "PT0S",
 
465
 
                        "approval_duration": "PT1S",
 
466
 
                        "approved_by_default": "True",
 
470
435
    def timeout_milliseconds(self):
 
471
436
        "Return the 'timeout' attribute in milliseconds"
 
472
 
        return timedelta_to_milliseconds(self.timeout)
 
 
437
        return _timedelta_to_milliseconds(self.timeout)
 
474
439
    def extended_timeout_milliseconds(self):
 
475
440
        "Return the 'extended_timeout' attribute in milliseconds"
 
476
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
 
478
443
    def interval_milliseconds(self):
 
479
444
        "Return the 'interval' attribute in milliseconds"
 
480
 
        return timedelta_to_milliseconds(self.interval)
 
 
445
        return _timedelta_to_milliseconds(self.interval)
 
482
447
    def approval_delay_milliseconds(self):
 
483
 
        return timedelta_to_milliseconds(self.approval_delay)
 
486
 
    def config_parser(config):
 
487
 
        """Construct a new dict of client settings of this form:
 
488
 
        { client_name: {setting_name: value, ...}, ...}
 
489
 
        with exceptions for any special settings as defined above.
 
490
 
        NOTE: Must be a pure function. Must return the same result
 
491
 
        value given the same arguments.
 
494
 
        for client_name in config.sections():
 
495
 
            section = dict(config.items(client_name))
 
496
 
            client = settings[client_name] = {}
 
498
 
            client["host"] = section["host"]
 
499
 
            # Reformat values from string types to Python types
 
500
 
            client["approved_by_default"] = config.getboolean(
 
501
 
                client_name, "approved_by_default")
 
502
 
            client["enabled"] = config.getboolean(client_name,
 
505
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
507
 
            if "secret" in section:
 
508
 
                client["secret"] = section["secret"].decode("base64")
 
509
 
            elif "secfile" in section:
 
510
 
                with open(os.path.expanduser(os.path.expandvars
 
511
 
                                             (section["secfile"])),
 
513
 
                    client["secret"] = secfile.read()
 
515
 
                raise TypeError("No secret or secfile for section {0}"
 
517
 
            client["timeout"] = string_to_delta(section["timeout"])
 
518
 
            client["extended_timeout"] = string_to_delta(
 
519
 
                section["extended_timeout"])
 
520
 
            client["interval"] = string_to_delta(section["interval"])
 
521
 
            client["approval_delay"] = string_to_delta(
 
522
 
                section["approval_delay"])
 
523
 
            client["approval_duration"] = string_to_delta(
 
524
 
                section["approval_duration"])
 
525
 
            client["checker_command"] = section["checker"]
 
526
 
            client["last_approval_request"] = None
 
527
 
            client["last_checked_ok"] = None
 
528
 
            client["last_checker_status"] = -2
 
532
 
    def __init__(self, settings, name = None, server_settings=None):
 
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
 
 
450
    def __init__(self, name = None, config=None):
 
 
451
        """Note: the 'checker' key in 'config' sets the
 
 
452
        'checker_command' attribute and *not* the 'checker'
 
534
 
        if server_settings is None:
 
536
 
        self.server_settings = server_settings
 
537
 
        # adding all client settings
 
538
 
        for setting, value in settings.iteritems():
 
539
 
            setattr(self, setting, value)
 
542
 
            if not hasattr(self, "last_enabled"):
 
543
 
                self.last_enabled = datetime.datetime.utcnow()
 
544
 
            if not hasattr(self, "expires"):
 
545
 
                self.expires = (datetime.datetime.utcnow()
 
548
 
            self.last_enabled = None
 
551
457
        logger.debug("Creating client %r", self.name)
 
552
458
        # Uppercase and remove spaces from fingerprint for later
 
553
459
        # comparison purposes with return value from the fingerprint()
 
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
555
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
556
 
        self.created = settings.get("created",
 
557
 
                                    datetime.datetime.utcnow())
 
559
 
        # attributes specific for this server instance
 
 
464
        if "secret" in config:
 
 
465
            self.secret = config["secret"].decode("base64")
 
 
466
        elif "secfile" in config:
 
 
467
            with open(os.path.expanduser(os.path.expandvars
 
 
468
                                         (config["secfile"])),
 
 
470
                self.secret = secfile.read()
 
 
472
            raise TypeError("No secret or secfile for client %s"
 
 
474
        self.host = config.get("host", "")
 
 
475
        self.created = datetime.datetime.utcnow()
 
 
476
        self.enabled = config.get("enabled", True)
 
 
477
        self.last_approval_request = None
 
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
 
481
            self.last_enabled = None
 
 
482
        self.last_checked_ok = None
 
 
483
        self.last_checker_status = None
 
 
484
        self.timeout = string_to_delta(config["timeout"])
 
 
485
        self.extended_timeout = string_to_delta(config
 
 
486
                                                ["extended_timeout"])
 
 
487
        self.interval = string_to_delta(config["interval"])
 
560
488
        self.checker = None
 
561
489
        self.checker_initiator_tag = None
 
562
490
        self.disable_initiator_tag = None
 
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
563
495
        self.checker_callback_tag = None
 
 
496
        self.checker_command = config["checker"]
 
564
497
        self.current_checker_command = None
 
 
498
        self._approved = None
 
 
499
        self.approved_by_default = config.get("approved_by_default",
 
566
501
        self.approvals_pending = 0
 
 
502
        self.approval_delay = string_to_delta(
 
 
503
            config["approval_delay"])
 
 
504
        self.approval_duration = string_to_delta(
 
 
505
            config["approval_duration"])
 
567
506
        self.changedstate = (multiprocessing_manager
 
568
507
                             .Condition(multiprocessing_manager
 
 
724
664
                # in normal mode, that is already done by daemon(),
 
725
665
                # and in debug mode we don't want to.  (Stdin is
 
726
666
                # always replaced by /dev/null.)
 
727
 
                # The exception is when not debugging but nevertheless
 
728
 
                # running in the foreground; use the previously
 
731
 
                if (not self.server_settings["debug"]
 
732
 
                    and self.server_settings["foreground"]):
 
733
 
                    popen_args.update({"stdout": wnull,
 
735
667
                self.checker = subprocess.Popen(command,
 
739
 
            except OSError as error:
 
740
 
                logger.error("Failed to start subprocess",
 
743
 
            self.checker_callback_tag = (gobject.child_watch_add
 
745
 
                                          self.checker_callback,
 
747
 
            # The checker may have completed before the gobject
 
748
 
            # watch was added.  Check for this.
 
 
670
                self.checker_callback_tag = (gobject.child_watch_add
 
 
672
                                              self.checker_callback,
 
 
674
                # The checker may have completed before the gobject
 
 
675
                # watch was added.  Check for this.
 
750
676
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
678
                    gobject.source_remove(self.checker_callback_tag)
 
 
679
                    self.checker_callback(pid, status, command)
 
751
680
            except OSError as error:
 
752
 
                if error.errno == errno.ECHILD:
 
753
 
                    # This should never happen
 
754
 
                    logger.error("Child process vanished",
 
759
 
                gobject.source_remove(self.checker_callback_tag)
 
760
 
                self.checker_callback(pid, status, command)
 
 
681
                logger.error("Failed to start subprocess: %s",
 
761
683
        # Re-run this periodically if run by gobject.timeout_add
 
 
988
859
                e.setAttribute("access", prop._dbus_access)
 
990
861
            for if_tag in document.getElementsByTagName("interface"):
 
992
862
                for tag in (make_tag(document, name, prop)
 
994
 
                            in self._get_all_dbus_things("property")
 
 
864
                            in self._get_all_dbus_properties()
 
995
865
                            if prop._dbus_interface
 
996
866
                            == if_tag.getAttribute("name")):
 
997
867
                    if_tag.appendChild(tag)
 
998
 
                # Add annotation tags
 
999
 
                for typ in ("method", "signal", "property"):
 
1000
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1002
 
                        for name, prop in (self.
 
1003
 
                                           _get_all_dbus_things(typ)):
 
1004
 
                            if (name == tag.getAttribute("name")
 
1005
 
                                and prop._dbus_interface
 
1006
 
                                == if_tag.getAttribute("name")):
 
1007
 
                                annots.update(getattr
 
1009
 
                                               "_dbus_annotations",
 
1011
 
                        for name, value in annots.iteritems():
 
1012
 
                            ann_tag = document.createElement(
 
1014
 
                            ann_tag.setAttribute("name", name)
 
1015
 
                            ann_tag.setAttribute("value", value)
 
1016
 
                            tag.appendChild(ann_tag)
 
1017
 
                # Add interface annotation tags
 
1018
 
                for annotation, value in dict(
 
1019
 
                    itertools.chain.from_iterable(
 
1020
 
                        annotations().iteritems()
 
1021
 
                        for name, annotations in
 
1022
 
                        self._get_all_dbus_things("interface")
 
1023
 
                        if name == if_tag.getAttribute("name")
 
1025
 
                    ann_tag = document.createElement("annotation")
 
1026
 
                    ann_tag.setAttribute("name", annotation)
 
1027
 
                    ann_tag.setAttribute("value", value)
 
1028
 
                    if_tag.appendChild(ann_tag)
 
1029
868
                # Add the names to the return values for the
 
1030
869
                # "org.freedesktop.DBus.Properties" methods
 
1031
870
                if (if_tag.getAttribute("name")
 
 
1058
897
                       variant_level=variant_level)
 
1061
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1062
 
    """A class decorator; applied to a subclass of
 
1063
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1064
 
    interface names according to the "alt_interface_names" mapping.
 
1067
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1068
 
                                    "net.example.AlternateInterface"})
 
1069
 
    class SampleDBusObject(dbus.service.Object):
 
1070
 
        @dbus.service.method("org.example.Interface")
 
1071
 
        def SampleDBusMethod():
 
1074
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1075
 
    reachable via two interfaces: "org.example.Interface" and
 
1076
 
    "net.example.AlternateInterface", the latter of which will have
 
1077
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1078
 
    "true", unless "deprecate" is passed with a False value.
 
1080
 
    This works for methods and signals, and also for D-Bus properties
 
1081
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1082
 
    dbus_interface_annotations decorator).
 
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
 
903
    will add additional D-Bus attributes matching a certain pattern.
 
1085
 
        for orig_interface_name, alt_interface_name in (
 
1086
 
            alt_interface_names.iteritems()):
 
1088
 
            interface_names = set()
 
1089
 
            # Go though all attributes of the class
 
1090
 
            for attrname, attribute in inspect.getmembers(cls):
 
 
905
    def __new__(mcs, name, bases, attr):
 
 
906
        # Go through all the base classes which could have D-Bus
 
 
907
        # methods, signals, or properties in them
 
 
908
        for base in (b for b in bases
 
 
909
                     if issubclass(b, dbus.service.Object)):
 
 
910
            # Go though all attributes of the base class
 
 
911
            for attrname, attribute in inspect.getmembers(base):
 
1091
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1092
913
                # with the wrong interface name
 
1093
914
                if (not hasattr(attribute, "_dbus_interface")
 
1094
915
                    or not attribute._dbus_interface
 
1095
 
                    .startswith(orig_interface_name)):
 
 
916
                    .startswith("se.recompile.Mandos")):
 
1097
918
                # Create an alternate D-Bus interface name based on
 
1098
919
                # the current name
 
1099
920
                alt_interface = (attribute._dbus_interface
 
1100
 
                                 .replace(orig_interface_name,
 
1101
 
                                          alt_interface_name))
 
1102
 
                interface_names.add(alt_interface)
 
 
921
                                 .replace("se.recompile.Mandos",
 
 
922
                                          "se.bsnet.fukt.Mandos"))
 
1103
923
                # Is this a D-Bus signal?
 
1104
924
                if getattr(attribute, "_dbus_is_signal", False):
 
1105
 
                    # Extract the original non-method undecorated
 
1106
 
                    # function by black magic
 
 
925
                    # Extract the original non-method function by
 
1107
927
                    nonmethod_func = (dict(
 
1108
928
                            zip(attribute.func_code.co_freevars,
 
1109
929
                                attribute.__closure__))["func"]
 
 
1184
992
                                        attribute.func_name,
 
1185
993
                                        attribute.func_defaults,
 
1186
994
                                        attribute.func_closure)))
 
1187
 
                    # Copy annotations, if any
 
1189
 
                        attr[attrname]._dbus_annotations = (
 
1190
 
                            dict(attribute._dbus_annotations))
 
1191
 
                    except AttributeError:
 
1193
 
                # Is this a D-Bus interface?
 
1194
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1195
 
                    # Create a new, but exactly alike, function
 
1196
 
                    # object.  Decorate it to be a new D-Bus interface
 
1197
 
                    # with the alternate D-Bus interface name.  Add it
 
1199
 
                    attr[attrname] = (dbus_interface_annotations
 
1202
 
                                       (attribute.func_code,
 
1203
 
                                        attribute.func_globals,
 
1204
 
                                        attribute.func_name,
 
1205
 
                                        attribute.func_defaults,
 
1206
 
                                        attribute.func_closure)))
 
1208
 
                # Deprecate all alternate interfaces
 
1209
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1210
 
                for interface_name in interface_names:
 
1211
 
                    @dbus_interface_annotations(interface_name)
 
1213
 
                        return { "org.freedesktop.DBus.Deprecated":
 
1215
 
                    # Find an unused name
 
1216
 
                    for aname in (iname.format(i)
 
1217
 
                                  for i in itertools.count()):
 
1218
 
                        if aname not in attr:
 
1222
 
                # Replace the class with a new subclass of it with
 
1223
 
                # methods, signals, etc. as created above.
 
1224
 
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1230
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1231
 
                                "se.bsnet.fukt.Mandos"})
 
 
995
        return type.__new__(mcs, name, bases, attr)
 
1232
998
class ClientDBus(Client, DBusObjectWithProperties):
 
1233
999
    """A Client class using D-Bus
 
 
1295
1064
                                       checker is not None)
 
1296
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1297
1066
                                           "LastCheckedOK")
 
1298
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1299
 
                                               "LastCheckerStatus")
 
1300
1067
    last_approval_request = notifychangeproperty(
 
1301
1068
        datetime_to_dbus, "LastApprovalRequest")
 
1302
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1303
1070
                                               "ApprovedByDefault")
 
1304
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1305
1072
                                          "ApprovalDelay",
 
1307
 
                                          timedelta_to_milliseconds)
 
 
1074
                                          _timedelta_to_milliseconds)
 
1308
1075
    approval_duration = notifychangeproperty(
 
1309
 
        dbus.UInt64, "ApprovalDuration",
 
1310
 
        type_func = timedelta_to_milliseconds)
 
 
1076
        dbus.UInt16, "ApprovalDuration",
 
 
1077
        type_func = _timedelta_to_milliseconds)
 
1311
1078
    host = notifychangeproperty(dbus.String, "Host")
 
1312
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1314
 
                                   timedelta_to_milliseconds)
 
 
1081
                                   _timedelta_to_milliseconds)
 
1315
1082
    extended_timeout = notifychangeproperty(
 
1316
 
        dbus.UInt64, "ExtendedTimeout",
 
1317
 
        type_func = timedelta_to_milliseconds)
 
1318
 
    interval = notifychangeproperty(dbus.UInt64,
 
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
 
1084
        type_func = _timedelta_to_milliseconds)
 
 
1085
    interval = notifychangeproperty(dbus.UInt16,
 
1321
 
                                    timedelta_to_milliseconds)
 
 
1088
                                    _timedelta_to_milliseconds)
 
1322
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1324
1091
    del notifychangeproperty
 
 
1929
1705
        use_ipv6:       Boolean; to use IPv6 or not
 
1931
1707
    def __init__(self, server_address, RequestHandlerClass,
 
1932
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1933
 
        """If socketfd is set, use that file descriptor instead of
 
1934
 
        creating a new one with socket.socket().
 
 
1708
                 interface=None, use_ipv6=True):
 
1936
1709
        self.interface = interface
 
1938
1711
            self.address_family = socket.AF_INET6
 
1939
 
        if socketfd is not None:
 
1940
 
            # Save the file descriptor
 
1941
 
            self.socketfd = socketfd
 
1942
 
            # Save the original socket.socket() function
 
1943
 
            self.socket_socket = socket.socket
 
1944
 
            # To implement --socket, we monkey patch socket.socket.
 
1946
 
            # (When socketserver.TCPServer is a new-style class, we
 
1947
 
            # could make self.socket into a property instead of monkey
 
1948
 
            # patching socket.socket.)
 
1950
 
            # Create a one-time-only replacement for socket.socket()
 
1951
 
            @functools.wraps(socket.socket)
 
1952
 
            def socket_wrapper(*args, **kwargs):
 
1953
 
                # Restore original function so subsequent calls are
 
1955
 
                socket.socket = self.socket_socket
 
1956
 
                del self.socket_socket
 
1957
 
                # This time only, return a new socket object from the
 
1958
 
                # saved file descriptor.
 
1959
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1960
 
            # Replace socket.socket() function with wrapper
 
1961
 
            socket.socket = socket_wrapper
 
1962
 
        # The socketserver.TCPServer.__init__ will call
 
1963
 
        # socket.socket(), which might be our replacement,
 
1964
 
        # socket_wrapper(), if socketfd was set.
 
1965
1712
        socketserver.TCPServer.__init__(self, server_address,
 
1966
1713
                                        RequestHandlerClass)
 
1968
1714
    def server_bind(self):
 
1969
1715
        """This overrides the normal server_bind() function
 
1970
1716
        to bind to an interface if one was specified, and also NOT to
 
 
2123
 
def rfc3339_duration_to_delta(duration):
 
2124
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2126
 
    >>> rfc3339_duration_to_delta("P7D")
 
2127
 
    datetime.timedelta(7)
 
2128
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2129
 
    datetime.timedelta(0, 60)
 
2130
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2131
 
    datetime.timedelta(0, 3600)
 
2132
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2133
 
    datetime.timedelta(1)
 
2134
 
    >>> rfc3339_duration_to_delta("P1W")
 
2135
 
    datetime.timedelta(7)
 
2136
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2137
 
    datetime.timedelta(0, 330)
 
2138
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2139
 
    datetime.timedelta(1, 200)
 
2142
 
    # Parsing an RFC 3339 duration with regular expressions is not
 
2143
 
    # possible - there would have to be multiple places for the same
 
2144
 
    # values, like seconds.  The current code, while more esoteric, is
 
2145
 
    # cleaner without depending on a parsing library.  If Python had a
 
2146
 
    # built-in library for parsing we would use it, but we'd like to
 
2147
 
    # avoid excessive use of external libraries.
 
2149
 
    # New type for defining tokens, syntax, and semantics all-in-one
 
2150
 
    Token = collections.namedtuple("Token",
 
2151
 
                                   ("regexp", # To match token; if
 
2152
 
                                              # "value" is not None,
 
2153
 
                                              # must have a "group"
 
2155
 
                                    "value",  # datetime.timedelta or
 
2157
 
                                    "followers")) # Tokens valid after
 
2159
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2160
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2161
 
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2162
 
    token_second = Token(re.compile(r"(\d+)S"),
 
2163
 
                         datetime.timedelta(seconds=1),
 
2164
 
                         frozenset((token_end,)))
 
2165
 
    token_minute = Token(re.compile(r"(\d+)M"),
 
2166
 
                         datetime.timedelta(minutes=1),
 
2167
 
                         frozenset((token_second, token_end)))
 
2168
 
    token_hour = Token(re.compile(r"(\d+)H"),
 
2169
 
                       datetime.timedelta(hours=1),
 
2170
 
                       frozenset((token_minute, token_end)))
 
2171
 
    token_time = Token(re.compile(r"T"),
 
2173
 
                       frozenset((token_hour, token_minute,
 
2175
 
    token_day = Token(re.compile(r"(\d+)D"),
 
2176
 
                      datetime.timedelta(days=1),
 
2177
 
                      frozenset((token_time, token_end)))
 
2178
 
    token_month = Token(re.compile(r"(\d+)M"),
 
2179
 
                        datetime.timedelta(weeks=4),
 
2180
 
                        frozenset((token_day, token_end)))
 
2181
 
    token_year = Token(re.compile(r"(\d+)Y"),
 
2182
 
                       datetime.timedelta(weeks=52),
 
2183
 
                       frozenset((token_month, token_end)))
 
2184
 
    token_week = Token(re.compile(r"(\d+)W"),
 
2185
 
                       datetime.timedelta(weeks=1),
 
2186
 
                       frozenset((token_end,)))
 
2187
 
    token_duration = Token(re.compile(r"P"), None,
 
2188
 
                           frozenset((token_year, token_month,
 
2189
 
                                      token_day, token_time,
 
2191
 
    # Define starting values
 
2192
 
    value = datetime.timedelta() # Value so far
 
2194
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2195
 
    s = duration                # String left to parse
 
2196
 
    # Loop until end token is found
 
2197
 
    while found_token is not token_end:
 
2198
 
        # Search for any currently valid tokens
 
2199
 
        for token in followers:
 
2200
 
            match = token.regexp.match(s)
 
2201
 
            if match is not None:
 
2203
 
                if token.value is not None:
 
2204
 
                    # Value found, parse digits
 
2205
 
                    factor = int(match.group(1), 10)
 
2206
 
                    # Add to value so far
 
2207
 
                    value += factor * token.value
 
2208
 
                # Strip token from string
 
2209
 
                s = token.regexp.sub("", s, 1)
 
2212
 
                # Set valid next tokens
 
2213
 
                followers = found_token.followers
 
2216
 
            # No currently valid tokens were found
 
2217
 
            raise ValueError("Invalid RFC 3339 duration")
 
2222
1881
def string_to_delta(interval):
 
2223
1882
    """Parse a string and return a datetime.timedelta
 
 
2323
1975
    parser.add_argument("--no-dbus", action="store_false",
 
2324
1976
                        dest="use_dbus", help="Do not provide D-Bus"
 
2325
 
                        " system bus interface", default=None)
 
 
1977
                        " system bus interface")
 
2326
1978
    parser.add_argument("--no-ipv6", action="store_false",
 
2327
 
                        dest="use_ipv6", help="Do not use IPv6",
 
 
1979
                        dest="use_ipv6", help="Do not use IPv6")
 
2329
1980
    parser.add_argument("--no-restore", action="store_false",
 
2330
1981
                        dest="restore", help="Do not restore stored"
 
2331
 
                        " state", default=None)
 
2332
 
    parser.add_argument("--socket", type=int,
 
2333
 
                        help="Specify a file descriptor to a network"
 
2334
 
                        " socket to use instead of creating one")
 
2335
1983
    parser.add_argument("--statedir", metavar="DIR",
 
2336
1984
                        help="Directory to save/restore state in")
 
2337
 
    parser.add_argument("--foreground", action="store_true",
 
2338
 
                        help="Run in foreground", default=None)
 
2340
1986
    options = parser.parse_args()
 
2342
1988
    if options.check:
 
2344
 
        fail_count, test_count = doctest.testmod()
 
2345
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2347
1993
    # Default values for config file for server-global settings
 
2348
1994
    server_defaults = { "interface": "",
 
 
2546
2176
    client_class = Client
 
2548
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2550
 
    client_settings = Client.config_parser(client_config)
 
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
 
2181
    special_settings = {
 
 
2182
        # Some settings need to be accessd by special methods;
 
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
 
2184
        "approved_by_default":
 
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
 
2189
            client_config.getboolean(section, "enabled"),
 
 
2191
    # Construct a new dict of client settings of this form:
 
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
 
2193
    # with exceptions for any special settings as defined above
 
 
2194
    client_settings = dict((clientname,
 
 
2197
                                  if setting not in special_settings
 
 
2198
                                  else special_settings[setting]
 
 
2200
                                for setting, value in
 
 
2201
                                client_config.items(clientname)))
 
 
2202
                          for clientname in client_config.sections())
 
2551
2204
    old_client_settings = {}
 
2554
 
    # This is used to redirect stdout and stderr for checker processes
 
2556
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2557
 
    # Only used if server is running in foreground but not in debug
 
2559
 
    if debug or not foreground:
 
2562
2207
    # Get client data and settings from last running state.
 
2563
2208
    if server_settings["restore"]:
 
 
2597
2234
                    if (name != "secret" and
 
2598
2235
                        value != old_client_settings[client_name]
 
2600
 
                        client[name] = value
 
 
2237
                        setattr(client, name, value)
 
2601
2238
                except KeyError:
 
2604
2241
            # Clients who has passed its expire date can still be
 
2605
 
            # enabled if its last checker was successful.  Clients
 
2606
 
            # whose checker succeeded before we stored its state is
 
2607
 
            # assumed to have successfully run all checkers during
 
2609
 
            if client["enabled"]:
 
2610
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
2611
 
                    if not client["last_checked_ok"]:
 
2613
 
                            "disabling client {0} - Client never "
 
2614
 
                            "performed a successful checker"
 
2615
 
                            .format(client_name))
 
2616
 
                        client["enabled"] = False
 
2617
 
                    elif client["last_checker_status"] != 0:
 
2619
 
                            "disabling client {0} - Client "
 
2620
 
                            "last checker failed with error code {1}"
 
2621
 
                            .format(client_name,
 
2622
 
                                    client["last_checker_status"]))
 
 
2242
            # enabled if its last checker was sucessful.  Clients
 
 
2243
            # whose checker failed before we stored its state is
 
 
2244
            # assumed to have failed all checkers during downtime.
 
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
 
2246
                if ((datetime.datetime.utcnow()
 
 
2247
                     - client["last_checked_ok"])
 
 
2248
                    > client["interval"]):
 
 
2249
                    if client["last_checker_status"] != 0:
 
2623
2250
                        client["enabled"] = False
 
2625
2252
                        client["expires"] = (datetime.datetime
 
2627
2254
                                             + client["timeout"])
 
2628
 
                        logger.debug("Last checker succeeded,"
 
2629
 
                                     " keeping {0} enabled"
 
2630
 
                                     .format(client_name))
 
 
2256
            client["changedstate"] = (multiprocessing_manager
 
 
2258
                                      (multiprocessing_manager
 
 
2261
                new_client = (ClientDBusTransitional.__new__
 
 
2262
                              (ClientDBusTransitional))
 
 
2263
                tcp_server.clients[client_name] = new_client
 
 
2264
                new_client.bus = bus
 
 
2265
                for name, value in client.iteritems():
 
 
2266
                    setattr(new_client, name, value)
 
 
2267
                client_object_name = unicode(client_name).translate(
 
 
2268
                    {ord("."): ord("_"),
 
 
2269
                     ord("-"): ord("_")})
 
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
 
2272
                                                + client_object_name))
 
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
 
2280
                for name, value in client.iteritems():
 
 
2281
                    setattr(tcp_server.clients[client_name],
 
2632
 
                client["secret"] = (
 
2633
 
                    pgp.decrypt(client["encrypted_secret"],
 
2634
 
                                client_settings[client_name]
 
 
2285
                tcp_server.clients[client_name].secret = (
 
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
 
2288
                                  client_settings[client_name]
 
2637
2291
                # If decryption fails, we use secret from new settings
 
2638
 
                logger.debug("Failed to decrypt {0} old secret"
 
2639
 
                             .format(client_name))
 
2640
 
                client["secret"] = (
 
 
2292
                tcp_server.clients[client_name].secret = (
 
2641
2293
                    client_settings[client_name]["secret"])
 
2643
 
    # Add/remove clients based on new changes made to config
 
2644
 
    for client_name in (set(old_client_settings)
 
2645
 
                        - set(client_settings)):
 
2646
 
        del clients_data[client_name]
 
2647
 
    for client_name in (set(client_settings)
 
2648
 
                        - set(old_client_settings)):
 
2649
 
        clients_data[client_name] = client_settings[client_name]
 
2651
 
    # Create all client objects
 
2652
 
    for client_name, client in clients_data.iteritems():
 
2653
 
        tcp_server.clients[client_name] = client_class(
 
2654
 
            name = client_name, settings = client,
 
2655
 
            server_settings = server_settings)
 
 
2295
    # Create/remove clients based on new changes made to config
 
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
 
2297
        del tcp_server.clients[clientname]
 
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2657
2305
    if not tcp_server.clients:
 
2658
2306
        logger.warning("No clients defined")
 
2661
 
        if pidfile is not None:
 
2665
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2667
 
                logger.error("Could not write to file %r with PID %d",
 
 
2312
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
2315
            logger.error("Could not write to file %r with PID %d",
 
 
2318
            # "pidfile" was never created
 
2670
2320
        del pidfilename
 
 
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2672
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2673
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
2676
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2677
 
                                        "se.bsnet.fukt.Mandos"})
 
2678
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
2328
        class MandosDBusService(dbus.service.Object):
 
2679
2329
            """A D-Bus proxy object"""
 
2680
2330
            def __init__(self):
 
2681
2331
                dbus.service.Object.__init__(self, bus, "/")
 
2682
2332
            _interface = "se.recompile.Mandos"
 
2684
 
            @dbus_interface_annotations(_interface)
 
2686
 
                return { "org.freedesktop.DBus.Property"
 
2687
 
                         ".EmitsChangedSignal":
 
2690
2334
            @dbus.service.signal(_interface, signature="o")
 
2691
2335
            def ClientAdded(self, objpath):
 
 
2770
2414
                    if attr not in exclude:
 
2771
2415
                        client_dict[attr] = getattr(client, attr)
 
2773
 
                clients[client.name] = client_dict
 
 
2417
                clients.append(client_dict)
 
2774
2418
                del client_settings[client.name]["secret"]
 
2777
 
            with (tempfile.NamedTemporaryFile
 
2778
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2779
 
                   dir=os.path.dirname(stored_state_path),
 
2780
 
                   delete=False)) as stored_state:
 
 
2421
            with os.fdopen(os.open(stored_state_path,
 
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
 
2423
                                   0600), "wb") as stored_state:
 
2781
2424
                pickle.dump((clients, client_settings), stored_state)
 
2782
 
                tempname=stored_state.name
 
2783
 
            os.rename(tempname, stored_state_path)
 
2784
2425
        except (IOError, OSError) as e:
 
2790
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2791
 
                logger.warning("Could not save persistent state: {0}"
 
2792
 
                               .format(os.strerror(e.errno)))
 
2794
 
                logger.warning("Could not save persistent state:",
 
 
2426
            logger.warning("Could not save persistent state: {0}"
 
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2798
2431
        # Delete all clients, and settings from config