/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-20 13:52:09 UTC
  • mfrom: (299.1.1 release)
  • Revision ID: teddy@recompile.se-20120520135209-4qencnc8bx594u2u
Tags: version-1.5.4-1
* Makefile (version): Changed to "1.5.4".
* NEWS (Version 1.5.4): New entry.
* debian/changelog (1.5.4-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
68
68
import binascii
69
69
import tempfile
70
70
import itertools
71
 
import collections
72
71
 
73
72
import dbus
74
73
import dbus.service
79
78
import ctypes.util
80
79
import xml.dom.minidom
81
80
import inspect
 
81
import GnuPGInterface
82
82
 
83
83
try:
84
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.5"
 
91
version = "1.5.4"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
95
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
96
98
 
97
99
try:
98
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
114
116
def initlogger(debug, level=logging.WARNING):
115
117
    """init logger and add loglevel"""
116
118
    
117
 
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
122
119
    syslogger.setFormatter(logging.Formatter
123
120
                           ('Mandos [%(process)d]: %(levelname)s:'
124
121
                            ' %(message)s'))
142
139
class PGPEngine(object):
143
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
144
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
145
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
146
 
        self.gnupgargs = ['--batch',
147
 
                          '--home', self.tempdir,
148
 
                          '--force-mdc',
149
 
                          '--quiet',
150
 
                          '--no-use-agent']
 
144
        self.gnupg = GnuPGInterface.GnuPG()
 
145
        self.gnupg.options.meta_interactive = False
 
146
        self.gnupg.options.homedir = self.tempdir
 
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
151
150
    
152
151
    def __enter__(self):
153
152
        return self
154
153
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
154
    def __exit__ (self, exc_type, exc_value, traceback):
156
155
        self._cleanup()
157
156
        return False
158
157
    
175
174
    def password_encode(self, password):
176
175
        # Passphrase can not be empty and can not contain newlines or
177
176
        # NUL bytes.  So we prefix it and hex encode it.
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"))
184
 
        return encoded
 
177
        return b"mandos" + binascii.hexlify(password)
185
178
    
186
179
    def encrypt(self, data, password):
187
 
        passphrase = self.password_encode(password)
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
189
 
                                         ) as passfile:
190
 
            passfile.write(passphrase)
191
 
            passfile.flush()
192
 
            proc = subprocess.Popen(['gpg', '--symmetric',
193
 
                                     '--passphrase-file',
194
 
                                     passfile.name]
195
 
                                    + self.gnupgargs,
196
 
                                    stdin = subprocess.PIPE,
197
 
                                    stdout = subprocess.PIPE,
198
 
                                    stderr = subprocess.PIPE)
199
 
            ciphertext, err = proc.communicate(input = data)
200
 
        if proc.returncode != 0:
201
 
            raise PGPError(err)
 
180
        self.gnupg.passphrase = self.password_encode(password)
 
181
        with open(os.devnull, "w") as devnull:
 
182
            try:
 
183
                proc = self.gnupg.run(['--symmetric'],
 
184
                                      create_fhs=['stdin', 'stdout'],
 
185
                                      attach_fhs={'stderr': devnull})
 
186
                with contextlib.closing(proc.handles['stdin']) as f:
 
187
                    f.write(data)
 
188
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
                    ciphertext = f.read()
 
190
                proc.wait()
 
191
            except IOError as e:
 
192
                raise PGPError(e)
 
193
        self.gnupg.passphrase = None
202
194
        return ciphertext
203
195
    
204
196
    def decrypt(self, data, password):
205
 
        passphrase = self.password_encode(password)
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
207
 
                                         ) as passfile:
208
 
            passfile.write(passphrase)
209
 
            passfile.flush()
210
 
            proc = subprocess.Popen(['gpg', '--decrypt',
211
 
                                     '--passphrase-file',
212
 
                                     passfile.name]
213
 
                                    + self.gnupgargs,
214
 
                                    stdin = subprocess.PIPE,
215
 
                                    stdout = subprocess.PIPE,
216
 
                                    stderr = subprocess.PIPE)
217
 
            decrypted_plaintext, err = proc.communicate(input
218
 
                                                        = data)
219
 
        if proc.returncode != 0:
220
 
            raise PGPError(err)
 
197
        self.gnupg.passphrase = self.password_encode(password)
 
198
        with open(os.devnull, "w") as devnull:
 
199
            try:
 
200
                proc = self.gnupg.run(['--decrypt'],
 
201
                                      create_fhs=['stdin', 'stdout'],
 
202
                                      attach_fhs={'stderr': devnull})
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
 
204
                    f.write(data)
 
205
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
                    decrypted_plaintext = f.read()
 
207
                proc.wait()
 
208
            except IOError as e:
 
209
                raise PGPError(e)
 
210
        self.gnupg.passphrase = None
221
211
        return decrypted_plaintext
222
212
 
223
213
 
243
233
               Used to optionally bind to the specified interface.
244
234
    name: string; Example: 'Mandos'
245
235
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
237
    port: integer; what port to announce
248
238
    TXT: list of strings; TXT record for the service
249
239
    domain: string; Domain to publish on, default to .local if empty.
449
439
    runtime_expansions: Allowed attributes for runtime expansion.
450
440
    expires:    datetime.datetime(); time (UTC) when a client will be
451
441
                disabled, or None
452
 
    server_settings: The server_settings dict from main()
453
442
    """
454
443
    
455
444
    runtime_expansions = ("approval_delay", "approval_duration",
457
446
                          "fingerprint", "host", "interval",
458
447
                          "last_approval_request", "last_checked_ok",
459
448
                          "last_enabled", "name", "timeout")
460
 
    client_defaults = { "timeout": "PT5M",
461
 
                        "extended_timeout": "PT15M",
462
 
                        "interval": "PT2M",
 
449
    client_defaults = { "timeout": "5m",
 
450
                        "extended_timeout": "15m",
 
451
                        "interval": "2m",
463
452
                        "checker": "fping -q -- %%(host)s",
464
453
                        "host": "",
465
 
                        "approval_delay": "PT0S",
466
 
                        "approval_duration": "PT1S",
 
454
                        "approval_delay": "0s",
 
455
                        "approval_duration": "1s",
467
456
                        "approved_by_default": "True",
468
457
                        "enabled": "True",
469
458
                        }
530
519
        
531
520
        return settings
532
521
    
533
 
    def __init__(self, settings, name = None, server_settings=None):
 
522
    def __init__(self, settings, name = None):
534
523
        self.name = name
535
 
        if server_settings is None:
536
 
            server_settings = {}
537
 
        self.server_settings = server_settings
538
524
        # adding all client settings
539
525
        for setting, value in settings.iteritems():
540
526
            setattr(self, setting, value)
693
679
        # If a checker exists, make sure it is not a zombie
694
680
        try:
695
681
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
 
        except AttributeError:
697
 
            pass
698
 
        except OSError as error:
699
 
            if error.errno != errno.ECHILD:
700
 
                raise
 
682
        except (AttributeError, OSError) as error:
 
683
            if (isinstance(error, OSError)
 
684
                and error.errno != errno.ECHILD):
 
685
                raise error
701
686
        else:
702
687
            if pid:
703
688
                logger.warning("Checker was a zombie")
725
710
                # in normal mode, that is already done by daemon(),
726
711
                # and in debug mode we don't want to.  (Stdin is
727
712
                # always replaced by /dev/null.)
728
 
                # The exception is when not debugging but nevertheless
729
 
                # running in the foreground; use the previously
730
 
                # created wnull.
731
 
                popen_args = {}
732
 
                if (not self.server_settings["debug"]
733
 
                    and self.server_settings["foreground"]):
734
 
                    popen_args.update({"stdout": wnull,
735
 
                                       "stderr": wnull })
736
713
                self.checker = subprocess.Popen(command,
737
714
                                                close_fds=True,
738
 
                                                shell=True, cwd="/",
739
 
                                                **popen_args)
 
715
                                                shell=True, cwd="/")
740
716
            except OSError as error:
741
717
                logger.error("Failed to start subprocess",
742
718
                             exc_info=error)
743
 
                return True
744
719
            self.checker_callback_tag = (gobject.child_watch_add
745
720
                                         (self.checker.pid,
746
721
                                          self.checker_callback,
747
722
                                          data=command))
748
723
            # The checker may have completed before the gobject
749
724
            # watch was added.  Check for this.
750
 
            try:
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",
756
 
                                 exc_info=error)
757
 
                    return True
758
 
                raise
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
759
726
            if pid:
760
727
                gobject.source_remove(self.checker_callback_tag)
761
728
                self.checker_callback(pid, status, command)
937
904
            # The byte_arrays option is not supported yet on
938
905
            # signatures other than "ay".
939
906
            if prop._dbus_signature != "ay":
940
 
                raise ValueError("Byte arrays not supported for non-"
941
 
                                 "'ay' signature {0!r}"
942
 
                                 .format(prop._dbus_signature))
 
907
                raise ValueError
943
908
            value = dbus.ByteArray(b''.join(chr(byte)
944
909
                                            for byte in value))
945
910
        prop(value)
1051
1016
        return xmlstring
1052
1017
 
1053
1018
 
1054
 
def datetime_to_dbus(dt, variant_level=0):
 
1019
def datetime_to_dbus (dt, variant_level=0):
1055
1020
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1056
1021
    if dt is None:
1057
1022
        return dbus.String("", variant_level = variant_level)
1065
1030
    interface names according to the "alt_interface_names" mapping.
1066
1031
    Usage:
1067
1032
    
1068
 
    @alternate_dbus_interfaces({"org.example.Interface":
1069
 
                                    "net.example.AlternateInterface"})
 
1033
    @alternate_dbus_names({"org.example.Interface":
 
1034
                               "net.example.AlternateInterface"})
1070
1035
    class SampleDBusObject(dbus.service.Object):
1071
1036
        @dbus.service.method("org.example.Interface")
1072
1037
        def SampleDBusMethod():
1103
1068
                interface_names.add(alt_interface)
1104
1069
                # Is this a D-Bus signal?
1105
1070
                if getattr(attribute, "_dbus_is_signal", False):
1106
 
                    # Extract the original non-method undecorated
1107
 
                    # function by black magic
 
1071
                    # Extract the original non-method function by
 
1072
                    # black magic
1108
1073
                    nonmethod_func = (dict(
1109
1074
                            zip(attribute.func_code.co_freevars,
1110
1075
                                attribute.__closure__))["func"]
1353
1318
                                       *args, **kwargs)
1354
1319
    
1355
1320
    def start_checker(self, *args, **kwargs):
1356
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1321
        old_checker = self.checker
 
1322
        if self.checker is not None:
 
1323
            old_checker_pid = self.checker.pid
 
1324
        else:
 
1325
            old_checker_pid = None
1357
1326
        r = Client.start_checker(self, *args, **kwargs)
1358
1327
        # Only if new checker process was started
1359
1328
        if (self.checker is not None
1704
1673
            logger.debug("Protocol version: %r", line)
1705
1674
            try:
1706
1675
                if int(line.strip().split()[0]) > 1:
1707
 
                    raise RuntimeError(line)
 
1676
                    raise RuntimeError
1708
1677
            except (ValueError, IndexError, RuntimeError) as error:
1709
1678
                logger.error("Unknown protocol version: %s", error)
1710
1679
                return
1917
1886
    
1918
1887
    def add_pipe(self, parent_pipe, proc):
1919
1888
        """Dummy function; override as necessary"""
1920
 
        raise NotImplementedError()
 
1889
        raise NotImplementedError
1921
1890
 
1922
1891
 
1923
1892
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1930
1899
        use_ipv6:       Boolean; to use IPv6 or not
1931
1900
    """
1932
1901
    def __init__(self, server_address, RequestHandlerClass,
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().
1936
 
        """
 
1902
                 interface=None, use_ipv6=True):
1937
1903
        self.interface = interface
1938
1904
        if use_ipv6:
1939
1905
            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.
1946
 
            # 
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.)
1950
 
            # 
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
1955
 
                # not affected.
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.
1966
1906
        socketserver.TCPServer.__init__(self, server_address,
1967
1907
                                        RequestHandlerClass)
1968
 
    
1969
1908
    def server_bind(self):
1970
1909
        """This overrides the normal server_bind() function
1971
1910
        to bind to an interface if one was specified, and also NOT to
1979
1918
                try:
1980
1919
                    self.socket.setsockopt(socket.SOL_SOCKET,
1981
1920
                                           SO_BINDTODEVICE,
1982
 
                                           str(self.interface + '\0'))
 
1921
                                           str(self.interface
 
1922
                                               + '\0'))
1983
1923
                except socket.error as error:
1984
1924
                    if error.errno == errno.EPERM:
1985
 
                        logger.error("No permission to bind to"
1986
 
                                     " interface %s", self.interface)
 
1925
                        logger.error("No permission to"
 
1926
                                     " bind to interface %s",
 
1927
                                     self.interface)
1987
1928
                    elif error.errno == errno.ENOPROTOOPT:
1988
1929
                        logger.error("SO_BINDTODEVICE not available;"
1989
1930
                                     " cannot bind to interface %s",
1990
1931
                                     self.interface)
1991
1932
                    elif error.errno == errno.ENODEV:
1992
 
                        logger.error("Interface %s does not exist,"
1993
 
                                     " cannot bind", self.interface)
 
1933
                        logger.error("Interface %s does not"
 
1934
                                     " exist, cannot bind",
 
1935
                                     self.interface)
1994
1936
                    else:
1995
1937
                        raise
1996
1938
        # Only bind(2) the socket if we really need to.
1999
1941
                if self.address_family == socket.AF_INET6:
2000
1942
                    any_address = "::" # in6addr_any
2001
1943
                else:
2002
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1944
                    any_address = socket.INADDR_ANY
2003
1945
                self.server_address = (any_address,
2004
1946
                                       self.server_address[1])
2005
1947
            elif not self.server_address[1]:
2026
1968
    """
2027
1969
    def __init__(self, server_address, RequestHandlerClass,
2028
1970
                 interface=None, use_ipv6=True, clients=None,
2029
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1971
                 gnutls_priority=None, use_dbus=True):
2030
1972
        self.enabled = False
2031
1973
        self.clients = clients
2032
1974
        if self.clients is None:
2036
1978
        IPv6_TCPServer.__init__(self, server_address,
2037
1979
                                RequestHandlerClass,
2038
1980
                                interface = interface,
2039
 
                                use_ipv6 = use_ipv6,
2040
 
                                socketfd = socketfd)
 
1981
                                use_ipv6 = use_ipv6)
2041
1982
    def server_activate(self):
2042
1983
        if self.enabled:
2043
1984
            return socketserver.TCPServer.server_activate(self)
2121
2062
        return True
2122
2063
 
2123
2064
 
2124
 
def rfc3339_duration_to_delta(duration):
2125
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2126
 
    
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)
2141
 
    """
2142
 
    
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.
2149
 
    
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"
2155
 
                                              # containing digits
2156
 
                                    "value",  # datetime.timedelta or
2157
 
                                              # None
2158
 
                                    "followers")) # Tokens valid after
2159
 
                                                  # this token
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"),
2173
 
                       None,
2174
 
                       frozenset((token_hour, token_minute,
2175
 
                                  token_second)))
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,
2191
 
                                      token_week))),
2192
 
    # Define starting values
2193
 
    value = datetime.timedelta() # Value so far
2194
 
    found_token = None
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:
2203
 
                # Token found
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)
2211
 
                # Go to found token
2212
 
                found_token = token
2213
 
                # Set valid next tokens
2214
 
                followers = found_token.followers
2215
 
                break
2216
 
        else:
2217
 
            # No currently valid tokens were found
2218
 
            raise ValueError("Invalid RFC 3339 duration")
2219
 
    # End token found
2220
 
    return value
2221
 
 
2222
 
 
2223
2065
def string_to_delta(interval):
2224
2066
    """Parse a string and return a datetime.timedelta
2225
2067
    
2236
2078
    >>> string_to_delta('5m 30s')
2237
2079
    datetime.timedelta(0, 330)
2238
2080
    """
2239
 
    
2240
 
    try:
2241
 
        return rfc3339_duration_to_delta(interval)
2242
 
    except ValueError:
2243
 
        pass
2244
 
    
2245
2081
    timevalue = datetime.timedelta(0)
2246
2082
    for s in interval.split():
2247
2083
        try:
2260
2096
            else:
2261
2097
                raise ValueError("Unknown suffix {0!r}"
2262
2098
                                 .format(suffix))
2263
 
        except IndexError as e:
 
2099
        except (ValueError, IndexError) as e:
2264
2100
            raise ValueError(*(e.args))
2265
2101
        timevalue += delta
2266
2102
    return timevalue
2310
2146
                        help="Run self-test")
2311
2147
    parser.add_argument("--debug", action="store_true",
2312
2148
                        help="Debug mode; run in foreground and log"
2313
 
                        " to terminal", default=None)
 
2149
                        " to terminal")
2314
2150
    parser.add_argument("--debuglevel", metavar="LEVEL",
2315
2151
                        help="Debug level for stdout output")
2316
2152
    parser.add_argument("--priority", help="GnuTLS"
2323
2159
                        " files")
2324
2160
    parser.add_argument("--no-dbus", action="store_false",
2325
2161
                        dest="use_dbus", help="Do not provide D-Bus"
2326
 
                        " system bus interface", default=None)
 
2162
                        " system bus interface")
2327
2163
    parser.add_argument("--no-ipv6", action="store_false",
2328
 
                        dest="use_ipv6", help="Do not use IPv6",
2329
 
                        default=None)
 
2164
                        dest="use_ipv6", help="Do not use IPv6")
2330
2165
    parser.add_argument("--no-restore", action="store_false",
2331
2166
                        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")
 
2167
                        " state")
2336
2168
    parser.add_argument("--statedir", metavar="DIR",
2337
2169
                        help="Directory to save/restore state in")
2338
 
    parser.add_argument("--foreground", action="store_true",
2339
 
                        help="Run in foreground", default=None)
2340
2170
    
2341
2171
    options = parser.parse_args()
2342
2172
    
2343
2173
    if options.check:
2344
2174
        import doctest
2345
 
        fail_count, test_count = doctest.testmod()
2346
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2175
        doctest.testmod()
 
2176
        sys.exit()
2347
2177
    
2348
2178
    # Default values for config file for server-global settings
2349
2179
    server_defaults = { "interface": "",
2351
2181
                        "port": "",
2352
2182
                        "debug": "False",
2353
2183
                        "priority":
2354
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2184
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2355
2185
                        "servicename": "Mandos",
2356
2186
                        "use_dbus": "True",
2357
2187
                        "use_ipv6": "True",
2358
2188
                        "debuglevel": "",
2359
2189
                        "restore": "True",
2360
 
                        "socket": "",
2361
 
                        "statedir": "/var/lib/mandos",
2362
 
                        "foreground": "False",
 
2190
                        "statedir": "/var/lib/mandos"
2363
2191
                        }
2364
2192
    
2365
2193
    # Parse config file for server-global settings
2370
2198
    # Convert the SafeConfigParser object to a dict
2371
2199
    server_settings = server_config.defaults()
2372
2200
    # Use the appropriate methods on the non-string config options
2373
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2201
    for option in ("debug", "use_dbus", "use_ipv6"):
2374
2202
        server_settings[option] = server_config.getboolean("DEFAULT",
2375
2203
                                                           option)
2376
2204
    if server_settings["port"]:
2377
2205
        server_settings["port"] = server_config.getint("DEFAULT",
2378
2206
                                                       "port")
2379
 
    if server_settings["socket"]:
2380
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2381
 
                                                         "socket")
2382
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2383
 
        # over with an opened os.devnull.  But we don't want this to
2384
 
        # happen with a supplied network socket.
2385
 
        if 0 <= server_settings["socket"] <= 2:
2386
 
            server_settings["socket"] = os.dup(server_settings
2387
 
                                               ["socket"])
2388
2207
    del server_config
2389
2208
    
2390
2209
    # Override the settings from the config file with command line
2392
2211
    for option in ("interface", "address", "port", "debug",
2393
2212
                   "priority", "servicename", "configdir",
2394
2213
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2395
 
                   "statedir", "socket", "foreground"):
 
2214
                   "statedir"):
2396
2215
        value = getattr(options, option)
2397
2216
        if value is not None:
2398
2217
            server_settings[option] = value
2401
2220
    for option in server_settings.keys():
2402
2221
        if type(server_settings[option]) is str:
2403
2222
            server_settings[option] = unicode(server_settings[option])
2404
 
    # Force all boolean options to be boolean
2405
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2406
 
                   "foreground"):
2407
 
        server_settings[option] = bool(server_settings[option])
2408
 
    # Debug implies foreground
2409
 
    if server_settings["debug"]:
2410
 
        server_settings["foreground"] = True
2411
2223
    # Now we have our good server settings in "server_settings"
2412
2224
    
2413
2225
    ##################################################################
2419
2231
    use_ipv6 = server_settings["use_ipv6"]
2420
2232
    stored_state_path = os.path.join(server_settings["statedir"],
2421
2233
                                     stored_state_file)
2422
 
    foreground = server_settings["foreground"]
2423
2234
    
2424
2235
    if debug:
2425
2236
        initlogger(debug, logging.DEBUG)
2454
2265
                              use_ipv6=use_ipv6,
2455
2266
                              gnutls_priority=
2456
2267
                              server_settings["priority"],
2457
 
                              use_dbus=use_dbus,
2458
 
                              socketfd=(server_settings["socket"]
2459
 
                                        or None))
2460
 
    if not foreground:
2461
 
        pidfilename = "/run/mandos.pid"
2462
 
        if not os.path.isdir("/run/."):
2463
 
            pidfilename = "/var/run/mandos.pid"
2464
 
        pidfile = None
 
2268
                              use_dbus=use_dbus)
 
2269
    if not debug:
 
2270
        pidfilename = "/var/run/mandos.pid"
2465
2271
        try:
2466
2272
            pidfile = open(pidfilename, "w")
2467
2273
        except IOError as e:
2483
2289
        os.setuid(uid)
2484
2290
    except OSError as error:
2485
2291
        if error.errno != errno.EPERM:
2486
 
            raise
 
2292
            raise error
2487
2293
    
2488
2294
    if debug:
2489
2295
        # Enable all possible GnuTLS debugging
2506
2312
            os.close(null)
2507
2313
    
2508
2314
    # Need to fork before connecting to D-Bus
2509
 
    if not foreground:
 
2315
    if not debug:
2510
2316
        # Close all input and output, do double fork, etc.
2511
2317
        daemon()
2512
2318
    
2513
 
    # multiprocessing will use threads, so before we use gobject we
2514
 
    # need to inform gobject that threads will be used.
2515
2319
    gobject.threads_init()
2516
2320
    
2517
2321
    global main_loop
2552
2356
    old_client_settings = {}
2553
2357
    clients_data = {}
2554
2358
    
2555
 
    # This is used to redirect stdout and stderr for checker processes
2556
 
    global wnull
2557
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2558
 
    # Only used if server is running in foreground but not in debug
2559
 
    # mode
2560
 
    if debug or not foreground:
2561
 
        wnull.close()
2562
 
    
2563
2359
    # Get client data and settings from last running state.
2564
2360
    if server_settings["restore"]:
2565
2361
        try:
2581
2377
    
2582
2378
    with PGPEngine() as pgp:
2583
2379
        for client_name, client in clients_data.iteritems():
2584
 
            # Skip removed clients
2585
 
            if client_name not in client_settings:
2586
 
                continue
2587
 
            
2588
2380
            # Decide which value to use after restoring saved state.
2589
2381
            # We have three different values: Old config file,
2590
2382
            # new config file, and saved state.
2652
2444
    # Create all client objects
2653
2445
    for client_name, client in clients_data.iteritems():
2654
2446
        tcp_server.clients[client_name] = client_class(
2655
 
            name = client_name, settings = client,
2656
 
            server_settings = server_settings)
 
2447
            name = client_name, settings = client)
2657
2448
    
2658
2449
    if not tcp_server.clients:
2659
2450
        logger.warning("No clients defined")
2660
2451
    
2661
 
    if not foreground:
2662
 
        if pidfile is not None:
2663
 
            try:
2664
 
                with pidfile:
2665
 
                    pid = os.getpid()
2666
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2667
 
            except IOError:
2668
 
                logger.error("Could not write to file %r with PID %d",
2669
 
                             pidfilename, pid)
2670
 
        del pidfile
 
2452
    if not debug:
 
2453
        try:
 
2454
            with pidfile:
 
2455
                pid = os.getpid()
 
2456
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2457
            del pidfile
 
2458
        except IOError:
 
2459
            logger.error("Could not write to file %r with PID %d",
 
2460
                         pidfilename, pid)
 
2461
        except NameError:
 
2462
            # "pidfile" was never created
 
2463
            pass
2671
2464
        del pidfilename
2672
2465
    
2673
2466
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2742
2535
        service.cleanup()
2743
2536
        
2744
2537
        multiprocessing.active_children()
2745
 
        wnull.close()
2746
2538
        if not (tcp_server.clients or client_settings):
2747
2539
            return
2748
2540
        
2760
2552
                # A list of attributes that can not be pickled
2761
2553
                # + secret.
2762
2554
                exclude = set(("bus", "changedstate", "secret",
2763
 
                               "checker", "server_settings"))
 
2555
                               "checker"))
2764
2556
                for name, typ in (inspect.getmembers
2765
2557
                                  (dbus.service.Object)):
2766
2558
                    exclude.add(name)
2794
2586
            else:
2795
2587
                logger.warning("Could not save persistent state:",
2796
2588
                               exc_info=e)
2797
 
                raise
 
2589
                raise e
2798
2590
        
2799
2591
        # Delete all clients, and settings from config
2800
2592
        while tcp_server.clients: