/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:56:38 UTC
  • mfrom: (589.1.1 socket-option)
  • Revision ID: teddy@recompile.se-20120526225638-4hvqyrvmj0036lfn
Merge "--socket" option for server.

This is suggested by the GNU Coding Standards' Table of Long Options,
and will probably also allow socket activation (e.g. by systemd(8)).

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.6"
 
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
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)
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,
1979
1948
                try:
1980
1949
                    self.socket.setsockopt(socket.SOL_SOCKET,
1981
1950
                                           SO_BINDTODEVICE,
1982
 
                                           str(self.interface + '\0'))
 
1951
                                           str(self.interface
 
1952
                                               + '\0'))
1983
1953
                except socket.error as error:
1984
1954
                    if error.errno == errno.EPERM:
1985
 
                        logger.error("No permission to bind to"
1986
 
                                     " interface %s", self.interface)
 
1955
                        logger.error("No permission to"
 
1956
                                     " bind to interface %s",
 
1957
                                     self.interface)
1987
1958
                    elif error.errno == errno.ENOPROTOOPT:
1988
1959
                        logger.error("SO_BINDTODEVICE not available;"
1989
1960
                                     " cannot bind to interface %s",
1990
1961
                                     self.interface)
1991
1962
                    elif error.errno == errno.ENODEV:
1992
 
                        logger.error("Interface %s does not exist,"
1993
 
                                     " cannot bind", self.interface)
 
1963
                        logger.error("Interface %s does not"
 
1964
                                     " exist, cannot bind",
 
1965
                                     self.interface)
1994
1966
                    else:
1995
1967
                        raise
1996
1968
        # Only bind(2) the socket if we really need to.
1999
1971
                if self.address_family == socket.AF_INET6:
2000
1972
                    any_address = "::" # in6addr_any
2001
1973
                else:
2002
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1974
                    any_address = socket.INADDR_ANY
2003
1975
                self.server_address = (any_address,
2004
1976
                                       self.server_address[1])
2005
1977
            elif not self.server_address[1]:
2121
2093
        return True
2122
2094
 
2123
2095
 
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
2096
def string_to_delta(interval):
2224
2097
    """Parse a string and return a datetime.timedelta
2225
2098
    
2236
2109
    >>> string_to_delta('5m 30s')
2237
2110
    datetime.timedelta(0, 330)
2238
2111
    """
2239
 
    
2240
 
    try:
2241
 
        return rfc3339_duration_to_delta(interval)
2242
 
    except ValueError:
2243
 
        pass
2244
 
    
2245
2112
    timevalue = datetime.timedelta(0)
2246
2113
    for s in interval.split():
2247
2114
        try:
2260
2127
            else:
2261
2128
                raise ValueError("Unknown suffix {0!r}"
2262
2129
                                 .format(suffix))
2263
 
        except IndexError as e:
 
2130
        except (ValueError, IndexError) as e:
2264
2131
            raise ValueError(*(e.args))
2265
2132
        timevalue += delta
2266
2133
    return timevalue
2310
2177
                        help="Run self-test")
2311
2178
    parser.add_argument("--debug", action="store_true",
2312
2179
                        help="Debug mode; run in foreground and log"
2313
 
                        " to terminal", default=None)
 
2180
                        " to terminal")
2314
2181
    parser.add_argument("--debuglevel", metavar="LEVEL",
2315
2182
                        help="Debug level for stdout output")
2316
2183
    parser.add_argument("--priority", help="GnuTLS"
2323
2190
                        " files")
2324
2191
    parser.add_argument("--no-dbus", action="store_false",
2325
2192
                        dest="use_dbus", help="Do not provide D-Bus"
2326
 
                        " system bus interface", default=None)
 
2193
                        " system bus interface")
2327
2194
    parser.add_argument("--no-ipv6", action="store_false",
2328
 
                        dest="use_ipv6", help="Do not use IPv6",
2329
 
                        default=None)
 
2195
                        dest="use_ipv6", help="Do not use IPv6")
2330
2196
    parser.add_argument("--no-restore", action="store_false",
2331
2197
                        dest="restore", help="Do not restore stored"
2332
 
                        " state", default=None)
 
2198
                        " state")
2333
2199
    parser.add_argument("--socket", type=int,
2334
2200
                        help="Specify a file descriptor to a network"
2335
2201
                        " socket to use instead of creating one")
2336
2202
    parser.add_argument("--statedir", metavar="DIR",
2337
2203
                        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",
2342
 
                        default=None)
2343
2204
    
2344
2205
    options = parser.parse_args()
2345
2206
    
2346
2207
    if options.check:
2347
2208
        import doctest
2348
 
        fail_count, test_count = doctest.testmod()
2349
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2209
        doctest.testmod()
 
2210
        sys.exit()
2350
2211
    
2351
2212
    # Default values for config file for server-global settings
2352
2213
    server_defaults = { "interface": "",
2354
2215
                        "port": "",
2355
2216
                        "debug": "False",
2356
2217
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2218
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2358
2219
                        "servicename": "Mandos",
2359
2220
                        "use_dbus": "True",
2360
2221
                        "use_ipv6": "True",
2361
2222
                        "debuglevel": "",
2362
2223
                        "restore": "True",
2363
2224
                        "socket": "",
2364
 
                        "statedir": "/var/lib/mandos",
2365
 
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
 
2225
                        "statedir": "/var/lib/mandos"
2367
2226
                        }
2368
2227
    
2369
2228
    # Parse config file for server-global settings
2374
2233
    # Convert the SafeConfigParser object to a dict
2375
2234
    server_settings = server_config.defaults()
2376
2235
    # Use the appropriate methods on the non-string config options
2377
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2236
    for option in ("debug", "use_dbus", "use_ipv6"):
2378
2237
        server_settings[option] = server_config.getboolean("DEFAULT",
2379
2238
                                                           option)
2380
2239
    if server_settings["port"]:
2396
2255
    for option in ("interface", "address", "port", "debug",
2397
2256
                   "priority", "servicename", "configdir",
2398
2257
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2258
                   "statedir", "socket"):
2400
2259
        value = getattr(options, option)
2401
2260
        if value is not None:
2402
2261
            server_settings[option] = value
2405
2264
    for option in server_settings.keys():
2406
2265
        if type(server_settings[option]) is str:
2407
2266
            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
2415
2267
    # Now we have our good server settings in "server_settings"
2416
2268
    
2417
2269
    ##################################################################
2418
2270
    
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"
2423
 
                         " Zeroconf")
2424
 
    
2425
2271
    # For convenience
2426
2272
    debug = server_settings["debug"]
2427
2273
    debuglevel = server_settings["debuglevel"]
2429
2275
    use_ipv6 = server_settings["use_ipv6"]
2430
2276
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2277
                                     stored_state_file)
2432
 
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2278
    
2435
2279
    if debug:
2436
2280
        initlogger(debug, logging.DEBUG)
2457
2301
    global mandos_dbus_service
2458
2302
    mandos_dbus_service = None
2459
2303
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2304
    tcp_server = MandosServer((server_settings["address"],
2464
2305
                               server_settings["port"]),
2465
2306
                              ClientHandler,
2469
2310
                              gnutls_priority=
2470
2311
                              server_settings["priority"],
2471
2312
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
2473
 
    if not foreground:
2474
 
        pidfilename = "/run/mandos.pid"
2475
 
        if not os.path.isdir("/run/."):
2476
 
            pidfilename = "/var/run/mandos.pid"
2477
 
        pidfile = None
 
2313
                              socketfd=(server_settings["socket"]
 
2314
                                        or None))
 
2315
    if not debug:
 
2316
        pidfilename = "/var/run/mandos.pid"
2478
2317
        try:
2479
2318
            pidfile = open(pidfilename, "w")
2480
2319
        except IOError as e:
2496
2335
        os.setuid(uid)
2497
2336
    except OSError as error:
2498
2337
        if error.errno != errno.EPERM:
2499
 
            raise
 
2338
            raise error
2500
2339
    
2501
2340
    if debug:
2502
2341
        # Enable all possible GnuTLS debugging
2519
2358
            os.close(null)
2520
2359
    
2521
2360
    # Need to fork before connecting to D-Bus
2522
 
    if not foreground:
 
2361
    if not debug:
2523
2362
        # Close all input and output, do double fork, etc.
2524
2363
        daemon()
2525
2364
    
2545
2384
            use_dbus = False
2546
2385
            server_settings["use_dbus"] = False
2547
2386
            tcp_server.use_dbus = False
2548
 
    if zeroconf:
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"])))
 
2387
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2388
    service = AvahiServiceToSyslog(name =
 
2389
                                   server_settings["servicename"],
 
2390
                                   servicetype = "_mandos._tcp",
 
2391
                                   protocol = protocol, bus = bus)
 
2392
    if server_settings["interface"]:
 
2393
        service.interface = (if_nametoindex
 
2394
                             (str(server_settings["interface"])))
2557
2395
    
2558
2396
    global multiprocessing_manager
2559
2397
    multiprocessing_manager = multiprocessing.Manager()
2566
2404
    old_client_settings = {}
2567
2405
    clients_data = {}
2568
2406
    
2569
 
    # This is used to redirect stdout and stderr for checker processes
2570
 
    global wnull
2571
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2572
 
    # Only used if server is running in foreground but not in debug
2573
 
    # mode
2574
 
    if debug or not foreground:
2575
 
        wnull.close()
2576
 
    
2577
2407
    # Get client data and settings from last running state.
2578
2408
    if server_settings["restore"]:
2579
2409
        try:
2595
2425
    
2596
2426
    with PGPEngine() as pgp:
2597
2427
        for client_name, client in clients_data.iteritems():
2598
 
            # Skip removed clients
2599
 
            if client_name not in client_settings:
2600
 
                continue
2601
 
            
2602
2428
            # Decide which value to use after restoring saved state.
2603
2429
            # We have three different values: Old config file,
2604
2430
            # new config file, and saved state.
2666
2492
    # Create all client objects
2667
2493
    for client_name, client in clients_data.iteritems():
2668
2494
        tcp_server.clients[client_name] = client_class(
2669
 
            name = client_name, settings = client,
2670
 
            server_settings = server_settings)
 
2495
            name = client_name, settings = client)
2671
2496
    
2672
2497
    if not tcp_server.clients:
2673
2498
        logger.warning("No clients defined")
2674
2499
    
2675
 
    if not foreground:
2676
 
        if pidfile is not None:
2677
 
            try:
2678
 
                with pidfile:
2679
 
                    pid = os.getpid()
2680
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2681
 
            except IOError:
2682
 
                logger.error("Could not write to file %r with PID %d",
2683
 
                             pidfilename, pid)
2684
 
        del pidfile
 
2500
    if not debug:
 
2501
        try:
 
2502
            with pidfile:
 
2503
                pid = os.getpid()
 
2504
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2505
            del pidfile
 
2506
        except IOError:
 
2507
            logger.error("Could not write to file %r with PID %d",
 
2508
                         pidfilename, pid)
 
2509
        except NameError:
 
2510
            # "pidfile" was never created
 
2511
            pass
2685
2512
        del pidfilename
2686
2513
    
2687
2514
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2753
2580
    
2754
2581
    def cleanup():
2755
2582
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2583
        service.cleanup()
2758
2584
        
2759
2585
        multiprocessing.active_children()
2760
 
        wnull.close()
2761
2586
        if not (tcp_server.clients or client_settings):
2762
2587
            return
2763
2588
        
2775
2600
                # A list of attributes that can not be pickled
2776
2601
                # + secret.
2777
2602
                exclude = set(("bus", "changedstate", "secret",
2778
 
                               "checker", "server_settings"))
 
2603
                               "checker"))
2779
2604
                for name, typ in (inspect.getmembers
2780
2605
                                  (dbus.service.Object)):
2781
2606
                    exclude.add(name)
2809
2634
            else:
2810
2635
                logger.warning("Could not save persistent state:",
2811
2636
                               exc_info=e)
2812
 
                raise
 
2637
                raise e
2813
2638
        
2814
2639
        # Delete all clients, and settings from config
2815
2640
        while tcp_server.clients:
2839
2664
    tcp_server.server_activate()
2840
2665
    
2841
2666
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2667
    service.port = tcp_server.socket.getsockname()[1]
2844
2668
    if use_ipv6:
2845
2669
        logger.info("Now listening on address %r, port %d,"
2846
2670
                    " flowinfo %d, scope_id %d",
2852
2676
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2677
    
2854
2678
    try:
2855
 
        if zeroconf:
2856
 
            # From the Avahi example code
2857
 
            try:
2858
 
                service.activate()
2859
 
            except dbus.exceptions.DBusException as error:
2860
 
                logger.critical("D-Bus Exception", exc_info=error)
2861
 
                cleanup()
2862
 
                sys.exit(1)
2863
 
            # End of Avahi example code
 
2679
        # From the Avahi example code
 
2680
        try:
 
2681
            service.activate()
 
2682
        except dbus.exceptions.DBusException as error:
 
2683
            logger.critical("D-Bus Exception", exc_info=error)
 
2684
            cleanup()
 
2685
            sys.exit(1)
 
2686
        # End of Avahi example code
2864
2687
        
2865
2688
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2689
                             lambda *args, **kwargs: