172
175
    def password_encode(self, password):
 
173
176
        # Passphrase can not be empty and can not contain newlines or
 
174
177
        # NUL bytes.  So we prefix it and hex encode it.
 
175
 
        return b"mandos" + binascii.hexlify(password)
 
 
178
        encoded = b"mandos" + binascii.hexlify(password)
 
 
179
        if len(encoded) > 2048:
 
 
180
            # GnuPG can't handle long passwords, so encode differently
 
 
181
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
182
                       .replace(b"\n", b"\\n")
 
 
183
                       .replace(b"\0", b"\\x00"))
 
177
186
    def encrypt(self, data, password):
 
178
 
        self.gnupg.passphrase = self.password_encode(password)
 
179
 
        with open(os.devnull, "w") as devnull:
 
181
 
                proc = self.gnupg.run(['--symmetric'],
 
182
 
                                      create_fhs=['stdin', 'stdout'],
 
183
 
                                      attach_fhs={'stderr': devnull})
 
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
187
 
                    ciphertext = f.read()
 
191
 
        self.gnupg.passphrase = None
 
 
187
        passphrase = self.password_encode(password)
 
 
188
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
 
190
            passfile.write(passphrase)
 
 
192
            proc = subprocess.Popen(['gpg', '--symmetric',
 
 
196
                                    stdin = subprocess.PIPE,
 
 
197
                                    stdout = subprocess.PIPE,
 
 
198
                                    stderr = subprocess.PIPE)
 
 
199
            ciphertext, err = proc.communicate(input = data)
 
 
200
        if proc.returncode != 0:
 
192
202
        return ciphertext
 
194
204
    def decrypt(self, data, password):
 
195
 
        self.gnupg.passphrase = self.password_encode(password)
 
196
 
        with open(os.devnull, "w") as devnull:
 
198
 
                proc = self.gnupg.run(['--decrypt'],
 
199
 
                                      create_fhs=['stdin', 'stdout'],
 
200
 
                                      attach_fhs={'stderr': devnull})
 
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
204
 
                    decrypted_plaintext = f.read()
 
208
 
        self.gnupg.passphrase = None
 
 
205
        passphrase = self.password_encode(password)
 
 
206
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
 
208
            passfile.write(passphrase)
 
 
210
            proc = subprocess.Popen(['gpg', '--decrypt',
 
 
214
                                    stdin = subprocess.PIPE,
 
 
215
                                    stdout = subprocess.PIPE,
 
 
216
                                    stderr = subprocess.PIPE)
 
 
217
            decrypted_plaintext, err = proc.communicate(input
 
 
219
        if proc.returncode != 0:
 
209
221
        return decrypted_plaintext
 
 
434
449
    runtime_expansions: Allowed attributes for runtime expansion.
 
435
450
    expires:    datetime.datetime(); time (UTC) when a client will be
 
436
451
                disabled, or None
 
 
452
    server_settings: The server_settings dict from main()
 
439
455
    runtime_expansions = ("approval_delay", "approval_duration",
 
440
 
                          "created", "enabled", "fingerprint",
 
441
 
                          "host", "interval", "last_checked_ok",
 
 
456
                          "created", "enabled", "expires",
 
 
457
                          "fingerprint", "host", "interval",
 
 
458
                          "last_approval_request", "last_checked_ok",
 
442
459
                          "last_enabled", "name", "timeout")
 
443
 
    client_defaults = { "timeout": "5m",
 
444
 
                        "extended_timeout": "15m",
 
 
460
    client_defaults = { "timeout": "PT5M",
 
 
461
                        "extended_timeout": "PT15M",
 
446
463
                        "checker": "fping -q -- %%(host)s",
 
448
 
                        "approval_delay": "0s",
 
449
 
                        "approval_duration": "1s",
 
 
465
                        "approval_delay": "PT0S",
 
 
466
                        "approval_duration": "PT1S",
 
450
467
                        "approved_by_default": "True",
 
451
468
                        "enabled": "True",
 
 
570
590
        if getattr(self, "enabled", False):
 
571
591
            # Already enabled
 
573
 
        self.send_changedstate()
 
574
593
        self.expires = datetime.datetime.utcnow() + self.timeout
 
575
594
        self.enabled = True
 
576
595
        self.last_enabled = datetime.datetime.utcnow()
 
577
596
        self.init_checker()
 
 
597
        self.send_changedstate()
 
579
599
    def disable(self, quiet=True):
 
580
600
        """Disable this client."""
 
581
601
        if not getattr(self, "enabled", False):
 
584
 
            self.send_changedstate()
 
586
604
            logger.info("Disabling client %s", self.name)
 
587
 
        if getattr(self, "disable_initiator_tag", False):
 
 
605
        if getattr(self, "disable_initiator_tag", None) is not None:
 
588
606
            gobject.source_remove(self.disable_initiator_tag)
 
589
607
            self.disable_initiator_tag = None
 
590
608
        self.expires = None
 
591
 
        if getattr(self, "checker_initiator_tag", False):
 
 
609
        if getattr(self, "checker_initiator_tag", None) is not None:
 
592
610
            gobject.source_remove(self.checker_initiator_tag)
 
593
611
            self.checker_initiator_tag = None
 
594
612
        self.stop_checker()
 
595
613
        self.enabled = False
 
 
615
            self.send_changedstate()
 
596
616
        # Do not run this again if called by a gobject.timeout_add
 
 
657
682
        If a checker already exists, leave it running and do
 
659
684
        # The reason for not killing a running checker is that if we
 
660
 
        # did that, then if a checker (for some reason) started
 
661
 
        # running slowly and taking more than 'interval' time, the
 
662
 
        # client would inevitably timeout, since no checker would get
 
663
 
        # a chance to run to completion.  If we instead leave running
 
 
685
        # did that, and if a checker (for some reason) started running
 
 
686
        # slowly and taking more than 'interval' time, then the client
 
 
687
        # would inevitably timeout, since no checker would get a
 
 
688
        # chance to run to completion.  If we instead leave running
 
664
689
        # checkers alone, the checker would have to take more time
 
665
690
        # than 'timeout' for the client to be disabled, which is as it
 
 
680
706
                                      self.current_checker_command)
 
681
707
        # Start a new checker if needed
 
682
708
        if self.checker is None:
 
 
709
            # Escape attributes for the shell
 
 
710
            escaped_attrs = dict(
 
 
711
                (attr, re.escape(unicode(getattr(self, attr))))
 
 
713
                self.runtime_expansions)
 
684
 
                # In case checker_command has exactly one % operator
 
685
 
                command = self.checker_command % self.host
 
687
 
                # Escape attributes for the shell
 
688
 
                escaped_attrs = dict(
 
690
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
694
 
                    self.runtime_expansions)
 
697
 
                    command = self.checker_command % escaped_attrs
 
698
 
                except TypeError as error:
 
699
 
                    logger.error('Could not format string "%s"',
 
700
 
                                 self.checker_command, exc_info=error)
 
701
 
                    return True # Try again later
 
 
715
                command = self.checker_command % escaped_attrs
 
 
716
            except TypeError as error:
 
 
717
                logger.error('Could not format string "%s"',
 
 
718
                             self.checker_command, exc_info=error)
 
 
719
                return True # Try again later
 
702
720
            self.current_checker_command = command
 
704
722
                logger.info("Starting checker %r for %s",
 
 
707
725
                # in normal mode, that is already done by daemon(),
 
708
726
                # and in debug mode we don't want to.  (Stdin is
 
709
727
                # always replaced by /dev/null.)
 
 
728
                # The exception is when not debugging but nevertheless
 
 
729
                # running in the foreground; use the previously
 
 
732
                if (not self.server_settings["debug"]
 
 
733
                    and self.server_settings["foreground"]):
 
 
734
                    popen_args.update({"stdout": wnull,
 
710
736
                self.checker = subprocess.Popen(command,
 
713
 
                self.checker_callback_tag = (gobject.child_watch_add
 
715
 
                                              self.checker_callback,
 
717
 
                # The checker may have completed before the gobject
 
718
 
                # watch was added.  Check for this.
 
719
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
721
 
                    gobject.source_remove(self.checker_callback_tag)
 
722
 
                    self.checker_callback(pid, status, command)
 
723
740
            except OSError as error:
 
724
741
                logger.error("Failed to start subprocess",
 
 
744
            self.checker_callback_tag = (gobject.child_watch_add
 
 
746
                                          self.checker_callback,
 
 
748
            # The checker may have completed before the gobject
 
 
749
            # watch was added.  Check for this.
 
 
751
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
752
            except OSError as error:
 
 
753
                if error.errno == errno.ECHILD:
 
 
754
                    # This should never happen
 
 
755
                    logger.error("Child process vanished",
 
 
760
                gobject.source_remove(self.checker_callback_tag)
 
 
761
                self.checker_callback(pid, status, command)
 
726
762
        # Re-run this periodically if run by gobject.timeout_add
 
 
1021
1059
                       variant_level=variant_level)
 
1024
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
1026
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
1027
 
    will add additional D-Bus attributes matching a certain pattern.
 
 
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1063
    """A class decorator; applied to a subclass of
 
 
1064
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1065
    interface names according to the "alt_interface_names" mapping.
 
 
1068
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1069
                                    "net.example.AlternateInterface"})
 
 
1070
    class SampleDBusObject(dbus.service.Object):
 
 
1071
        @dbus.service.method("org.example.Interface")
 
 
1072
        def SampleDBusMethod():
 
 
1075
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1076
    reachable via two interfaces: "org.example.Interface" and
 
 
1077
    "net.example.AlternateInterface", the latter of which will have
 
 
1078
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1079
    "true", unless "deprecate" is passed with a False value.
 
 
1081
    This works for methods and signals, and also for D-Bus properties
 
 
1082
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1083
    dbus_interface_annotations decorator).
 
1029
 
    def __new__(mcs, name, bases, attr):
 
1030
 
        # Go through all the base classes which could have D-Bus
 
1031
 
        # methods, signals, or properties in them
 
1032
 
        old_interface_names = []
 
1033
 
        for base in (b for b in bases
 
1034
 
                     if issubclass(b, dbus.service.Object)):
 
1035
 
            # Go though all attributes of the base class
 
1036
 
            for attrname, attribute in inspect.getmembers(base):
 
 
1086
        for orig_interface_name, alt_interface_name in (
 
 
1087
            alt_interface_names.iteritems()):
 
 
1089
            interface_names = set()
 
 
1090
            # Go though all attributes of the class
 
 
1091
            for attrname, attribute in inspect.getmembers(cls):
 
1037
1092
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1038
1093
                # with the wrong interface name
 
1039
1094
                if (not hasattr(attribute, "_dbus_interface")
 
1040
1095
                    or not attribute._dbus_interface
 
1041
 
                    .startswith("se.recompile.Mandos")):
 
 
1096
                    .startswith(orig_interface_name)):
 
1043
1098
                # Create an alternate D-Bus interface name based on
 
1044
1099
                # the current name
 
1045
1100
                alt_interface = (attribute._dbus_interface
 
1046
 
                                 .replace("se.recompile.Mandos",
 
1047
 
                                          "se.bsnet.fukt.Mandos"))
 
1048
 
                if alt_interface != attribute._dbus_interface:
 
1049
 
                    old_interface_names.append(alt_interface)
 
 
1101
                                 .replace(orig_interface_name,
 
 
1102
                                          alt_interface_name))
 
 
1103
                interface_names.add(alt_interface)
 
1050
1104
                # Is this a D-Bus signal?
 
1051
1105
                if getattr(attribute, "_dbus_is_signal", False):
 
1052
 
                    # Extract the original non-method function by
 
 
1106
                    # Extract the original non-method undecorated
 
 
1107
                    # function by black magic
 
1054
1108
                    nonmethod_func = (dict(
 
1055
1109
                            zip(attribute.func_code.co_freevars,
 
1056
1110
                                attribute.__closure__))["func"]
 
 
1151
1205
                                        attribute.func_name,
 
1152
1206
                                        attribute.func_defaults,
 
1153
1207
                                        attribute.func_closure)))
 
1154
 
        # Deprecate all old interfaces
 
1155
 
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
 
1156
 
        for old_interface_name in old_interface_names:
 
1157
 
            @dbus_interface_annotations(old_interface_name)
 
1159
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
 
1160
 
            # Find an unused name
 
1161
 
            for aname in (iname.format(i) for i in itertools.count()):
 
1162
 
                if aname not in attr:
 
1165
 
        return type.__new__(mcs, name, bases, attr)
 
 
1209
                # Deprecate all alternate interfaces
 
 
1210
                iname="_AlternateDBusNames_interface_annotation{0}"
 
 
1211
                for interface_name in interface_names:
 
 
1212
                    @dbus_interface_annotations(interface_name)
 
 
1214
                        return { "org.freedesktop.DBus.Deprecated":
 
 
1216
                    # Find an unused name
 
 
1217
                    for aname in (iname.format(i)
 
 
1218
                                  for i in itertools.count()):
 
 
1219
                        if aname not in attr:
 
 
1223
                # Replace the class with a new subclass of it with
 
 
1224
                # methods, signals, etc. as created above.
 
 
1225
                cls = type(b"{0}Alternate".format(cls.__name__),
 
 
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1232
                                "se.bsnet.fukt.Mandos"})
 
1168
1233
class ClientDBus(Client, DBusObjectWithProperties):
 
1169
1234
    """A Client class using D-Bus
 
 
1500
1561
    def Timeout_dbus_property(self, value=None):
 
1501
1562
        if value is None:       # get
 
1502
1563
            return dbus.UInt64(self.timeout_milliseconds())
 
 
1564
        old_timeout = self.timeout
 
1503
1565
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1504
 
        # Reschedule timeout
 
 
1566
        # Reschedule disabling
 
1505
1567
        if self.enabled:
 
1506
1568
            now = datetime.datetime.utcnow()
 
1507
 
            time_to_die = timedelta_to_milliseconds(
 
1508
 
                (self.last_checked_ok + self.timeout) - now)
 
1509
 
            if time_to_die <= 0:
 
 
1569
            self.expires += self.timeout - old_timeout
 
 
1570
            if self.expires <= now:
 
1510
1571
                # The timeout has passed
 
1513
 
                self.expires = (now +
 
1514
 
                                datetime.timedelta(milliseconds =
 
1516
1574
                if (getattr(self, "disable_initiator_tag", None)
 
1519
1577
                gobject.source_remove(self.disable_initiator_tag)
 
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
 
 
1578
                self.disable_initiator_tag = (
 
 
1579
                    gobject.timeout_add(
 
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
1524
1583
    # ExtendedTimeout - property
 
1525
1584
    @dbus_service_property(_interface, signature="t",
 
 
1876
1930
        use_ipv6:       Boolean; to use IPv6 or not
 
1878
1932
    def __init__(self, server_address, RequestHandlerClass,
 
1879
 
                 interface=None, use_ipv6=True):
 
 
1933
                 interface=None, use_ipv6=True, socketfd=None):
 
 
1934
        """If socketfd is set, use that file descriptor instead of
 
 
1935
        creating a new one with socket.socket().
 
1880
1937
        self.interface = interface
 
1882
1939
            self.address_family = socket.AF_INET6
 
 
1940
        if socketfd is not None:
 
 
1941
            # Save the file descriptor
 
 
1942
            self.socketfd = socketfd
 
 
1943
            # Save the original socket.socket() function
 
 
1944
            self.socket_socket = socket.socket
 
 
1945
            # To implement --socket, we monkey patch socket.socket.
 
 
1947
            # (When socketserver.TCPServer is a new-style class, we
 
 
1948
            # could make self.socket into a property instead of monkey
 
 
1949
            # patching socket.socket.)
 
 
1951
            # Create a one-time-only replacement for socket.socket()
 
 
1952
            @functools.wraps(socket.socket)
 
 
1953
            def socket_wrapper(*args, **kwargs):
 
 
1954
                # Restore original function so subsequent calls are
 
 
1956
                socket.socket = self.socket_socket
 
 
1957
                del self.socket_socket
 
 
1958
                # This time only, return a new socket object from the
 
 
1959
                # saved file descriptor.
 
 
1960
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
1961
            # Replace socket.socket() function with wrapper
 
 
1962
            socket.socket = socket_wrapper
 
 
1963
        # The socketserver.TCPServer.__init__ will call
 
 
1964
        # socket.socket(), which might be our replacement,
 
 
1965
        # socket_wrapper(), if socketfd was set.
 
1883
1966
        socketserver.TCPServer.__init__(self, server_address,
 
1884
1967
                                        RequestHandlerClass)
 
1885
1969
    def server_bind(self):
 
1886
1970
        """This overrides the normal server_bind() function
 
1887
1971
        to bind to an interface if one was specified, and also NOT to
 
 
1896
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1897
1981
                                           SO_BINDTODEVICE,
 
 
1982
                                           str(self.interface + '\0'))
 
1900
1983
                except socket.error as error:
 
1901
 
                    if error[0] == errno.EPERM:
 
1902
 
                        logger.error("No permission to"
 
1903
 
                                     " bind to interface %s",
 
1905
 
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1984
                    if error.errno == errno.EPERM:
 
 
1985
                        logger.error("No permission to bind to"
 
 
1986
                                     " interface %s", self.interface)
 
 
1987
                    elif error.errno == errno.ENOPROTOOPT:
 
1906
1988
                        logger.error("SO_BINDTODEVICE not available;"
 
1907
1989
                                     " cannot bind to interface %s",
 
1908
1990
                                     self.interface)
 
 
1991
                    elif error.errno == errno.ENODEV:
 
 
1992
                        logger.error("Interface %s does not exist,"
 
 
1993
                                     " cannot bind", self.interface)
 
1911
1996
        # Only bind(2) the socket if we really need to.
 
 
1971
2057
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1972
2058
                   proc = None, client_object=None):
 
1974
 
            gobject.IO_IN: "IN",   # There is data to read.
 
1975
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1977
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1978
 
            gobject.IO_ERR: "ERR", # Error condition.
 
1979
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1980
 
                                    # broken, usually for pipes and
 
1983
 
        conditions_string = ' | '.join(name
 
1985
 
                                       condition_names.iteritems()
 
1986
 
                                       if cond & condition)
 
1987
2059
        # error, or the other end of multiprocessing.Pipe has closed
 
1988
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
 
2060
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1989
2061
            # Wait for other process to exit
 
 
 
2124
def rfc3339_duration_to_delta(duration):
 
 
2125
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2127
    >>> rfc3339_duration_to_delta("P7D")
 
 
2128
    datetime.timedelta(7)
 
 
2129
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2130
    datetime.timedelta(0, 60)
 
 
2131
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2132
    datetime.timedelta(0, 3600)
 
 
2133
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2134
    datetime.timedelta(1)
 
 
2135
    >>> rfc3339_duration_to_delta("P1W")
 
 
2136
    datetime.timedelta(7)
 
 
2137
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2138
    datetime.timedelta(0, 330)
 
 
2139
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2140
    datetime.timedelta(1, 200)
 
 
2143
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2144
    # possible - there would have to be multiple places for the same
 
 
2145
    # values, like seconds.  The current code, while more esoteric, is
 
 
2146
    # cleaner without depending on a parsing library.  If Python had a
 
 
2147
    # built-in library for parsing we would use it, but we'd like to
 
 
2148
    # avoid excessive use of external libraries.
 
 
2150
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2151
    Token = collections.namedtuple("Token",
 
 
2152
                                   ("regexp", # To match token; if
 
 
2153
                                              # "value" is not None,
 
 
2154
                                              # must have a "group"
 
 
2156
                                    "value",  # datetime.timedelta or
 
 
2158
                                    "followers")) # Tokens valid after
 
 
2160
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2161
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2162
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2163
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2164
                         datetime.timedelta(seconds=1),
 
 
2165
                         frozenset((token_end,)))
 
 
2166
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2167
                         datetime.timedelta(minutes=1),
 
 
2168
                         frozenset((token_second, token_end)))
 
 
2169
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2170
                       datetime.timedelta(hours=1),
 
 
2171
                       frozenset((token_minute, token_end)))
 
 
2172
    token_time = Token(re.compile(r"T"),
 
 
2174
                       frozenset((token_hour, token_minute,
 
 
2176
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2177
                      datetime.timedelta(days=1),
 
 
2178
                      frozenset((token_time, token_end)))
 
 
2179
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2180
                        datetime.timedelta(weeks=4),
 
 
2181
                        frozenset((token_day, token_end)))
 
 
2182
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2183
                       datetime.timedelta(weeks=52),
 
 
2184
                       frozenset((token_month, token_end)))
 
 
2185
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2186
                       datetime.timedelta(weeks=1),
 
 
2187
                       frozenset((token_end,)))
 
 
2188
    token_duration = Token(re.compile(r"P"), None,
 
 
2189
                           frozenset((token_year, token_month,
 
 
2190
                                      token_day, token_time,
 
 
2192
    # Define starting values
 
 
2193
    value = datetime.timedelta() # Value so far
 
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
 
 
2196
    s = duration                # String left to parse
 
 
2197
    # Loop until end token is found
 
 
2198
    while found_token is not token_end:
 
 
2199
        # Search for any currently valid tokens
 
 
2200
        for token in followers:
 
 
2201
            match = token.regexp.match(s)
 
 
2202
            if match is not None:
 
 
2204
                if token.value is not None:
 
 
2205
                    # Value found, parse digits
 
 
2206
                    factor = int(match.group(1), 10)
 
 
2207
                    # Add to value so far
 
 
2208
                    value += factor * token.value
 
 
2209
                # Strip token from string
 
 
2210
                s = token.regexp.sub("", s, 1)
 
 
2213
                # Set valid next tokens
 
 
2214
                followers = found_token.followers
 
 
2217
            # No currently valid tokens were found
 
 
2218
            raise ValueError("Invalid RFC 3339 duration")
 
2052
2223
def string_to_delta(interval):
 
2053
2224
    """Parse a string and return a datetime.timedelta
 
 
2147
2324
    parser.add_argument("--no-dbus", action="store_false",
 
2148
2325
                        dest="use_dbus", help="Do not provide D-Bus"
 
2149
 
                        " system bus interface")
 
 
2326
                        " system bus interface", default=None)
 
2150
2327
    parser.add_argument("--no-ipv6", action="store_false",
 
2151
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2328
                        dest="use_ipv6", help="Do not use IPv6",
 
2152
2330
    parser.add_argument("--no-restore", action="store_false",
 
2153
2331
                        dest="restore", help="Do not restore stored"
 
 
2332
                        " state", default=None)
 
 
2333
    parser.add_argument("--socket", type=int,
 
 
2334
                        help="Specify a file descriptor to a network"
 
 
2335
                        " socket to use instead of creating one")
 
2155
2336
    parser.add_argument("--statedir", metavar="DIR",
 
2156
2337
                        help="Directory to save/restore state in")
 
 
2338
    parser.add_argument("--foreground", action="store_true",
 
 
2339
                        help="Run in foreground", default=None)
 
 
2340
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2341
                        dest="zeroconf", help="Do not use Zeroconf",
 
2158
2344
    options = parser.parse_args()
 
2160
2346
    if options.check:
 
 
2348
        fail_count, test_count = doctest.testmod()
 
 
2349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2165
2351
    # Default values for config file for server-global settings
 
2166
2352
    server_defaults = { "interface": "",
 
 
2185
2374
    # Convert the SafeConfigParser object to a dict
 
2186
2375
    server_settings = server_config.defaults()
 
2187
2376
    # Use the appropriate methods on the non-string config options
 
2188
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
2377
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2189
2378
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2191
2380
    if server_settings["port"]:
 
2192
2381
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
2383
    if server_settings["socket"]:
 
 
2384
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
2386
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
2387
        # over with an opened os.devnull.  But we don't want this to
 
 
2388
        # happen with a supplied network socket.
 
 
2389
        if 0 <= server_settings["socket"] <= 2:
 
 
2390
            server_settings["socket"] = os.dup(server_settings
 
2194
2392
    del server_config
 
2196
2394
    # Override the settings from the config file with command line
 
 
2207
2405
    for option in server_settings.keys():
 
2208
2406
        if type(server_settings[option]) is str:
 
2209
2407
            server_settings[option] = unicode(server_settings[option])
 
 
2408
    # Force all boolean options to be boolean
 
 
2409
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
2410
                   "foreground", "zeroconf"):
 
 
2411
        server_settings[option] = bool(server_settings[option])
 
 
2412
    # Debug implies foreground
 
 
2413
    if server_settings["debug"]:
 
 
2414
        server_settings["foreground"] = True
 
2210
2415
    # Now we have our good server settings in "server_settings"
 
2212
2417
    ##################################################################
 
 
2419
    if (not server_settings["zeroconf"] and
 
 
2420
        not (server_settings["port"]
 
 
2421
             or server_settings["socket"] != "")):
 
 
2422
            parser.error("Needs port or socket to work without"
 
2214
2425
    # For convenience
 
2215
2426
    debug = server_settings["debug"]
 
2216
2427
    debuglevel = server_settings["debuglevel"]
 
 
2323
2545
            use_dbus = False
 
2324
2546
            server_settings["use_dbus"] = False
 
2325
2547
            tcp_server.use_dbus = False
 
2326
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2327
 
    service = AvahiServiceToSyslog(name =
 
2328
 
                                   server_settings["servicename"],
 
2329
 
                                   servicetype = "_mandos._tcp",
 
2330
 
                                   protocol = protocol, bus = bus)
 
2331
 
    if server_settings["interface"]:
 
2332
 
        service.interface = (if_nametoindex
 
2333
 
                             (str(server_settings["interface"])))
 
 
2549
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2550
        service = AvahiServiceToSyslog(name =
 
 
2551
                                       server_settings["servicename"],
 
 
2552
                                       servicetype = "_mandos._tcp",
 
 
2553
                                       protocol = protocol, bus = bus)
 
 
2554
        if server_settings["interface"]:
 
 
2555
            service.interface = (if_nametoindex
 
 
2556
                                 (str(server_settings["interface"])))
 
2335
2558
    global multiprocessing_manager
 
2336
2559
    multiprocessing_manager = multiprocessing.Manager()
 
2338
2561
    client_class = Client
 
2340
 
        client_class = functools.partial(ClientDBusTransitional,
 
 
2563
        client_class = functools.partial(ClientDBus, bus = bus)
 
2343
2565
    client_settings = Client.config_parser(client_config)
 
2344
2566
    old_client_settings = {}
 
2345
2567
    clients_data = {}
 
 
2569
    # This is used to redirect stdout and stderr for checker processes
 
 
2571
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
2572
    # Only used if server is running in foreground but not in debug
 
 
2574
    if debug or not foreground:
 
2347
2577
    # Get client data and settings from last running state.
 
2348
2578
    if server_settings["restore"]:
 
 
2432
2666
    # Create all client objects
 
2433
2667
    for client_name, client in clients_data.iteritems():
 
2434
2668
        tcp_server.clients[client_name] = client_class(
 
2435
 
            name = client_name, settings = client)
 
 
2669
            name = client_name, settings = client,
 
 
2670
            server_settings = server_settings)
 
2437
2672
    if not tcp_server.clients:
 
2438
2673
        logger.warning("No clients defined")
 
2444
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2447
 
            logger.error("Could not write to file %r with PID %d",
 
2450
 
            # "pidfile" was never created
 
 
2676
        if pidfile is not None:
 
 
2680
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
2682
                logger.error("Could not write to file %r with PID %d",
 
2452
2685
        del pidfilename
 
2453
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2455
2687
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2456
2688
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
2691
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
2692
                                        "se.bsnet.fukt.Mandos"})
 
2459
2693
        class MandosDBusService(DBusObjectWithProperties):
 
2460
2694
            """A D-Bus proxy object"""
 
2461
2695
            def __init__(self):
 
 
2556
2790
                del client_settings[client.name]["secret"]
 
2559
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2562
 
                                                (stored_state_path))
 
2563
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
 
2793
            with (tempfile.NamedTemporaryFile
 
 
2794
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
 
2795
                   dir=os.path.dirname(stored_state_path),
 
 
2796
                   delete=False)) as stored_state:
 
2564
2797
                pickle.dump((clients, client_settings), stored_state)
 
 
2798
                tempname=stored_state.name
 
2565
2799
            os.rename(tempname, stored_state_path)
 
2566
2800
        except (IOError, OSError) as e: