/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-06-22 23:33:56 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120622233356-odoqqt2ki2gssn37
* Makefile (check): Also check mandos-ctl.
* mandos-ctl: All options taking a time interval argument can now take
              an RFC 3339 duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
  (main): New "--check" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new "--check" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
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.4"
 
91
version = "1.6.0"
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
 
    syslogger = (logging.handlers.SysLogHandler
118
 
                 (facility =
119
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
120
 
                  address = str("/dev/log")))
121
119
    syslogger.setFormatter(logging.Formatter
122
120
                           ('Mandos [%(process)d]: %(levelname)s:'
123
121
                            ' %(message)s'))
141
139
class PGPEngine(object):
142
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
143
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
144
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
 
        self.gnupgargs = ['--batch',
146
 
                          '--home', self.tempdir,
147
 
                          '--force-mdc',
148
 
                          '--quiet',
149
 
                          '--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'])
150
150
    
151
151
    def __enter__(self):
152
152
        return self
174
174
    def password_encode(self, password):
175
175
        # Passphrase can not be empty and can not contain newlines or
176
176
        # NUL bytes.  So we prefix it and hex encode it.
177
 
        encoded = b"mandos" + binascii.hexlify(password)
178
 
        if len(encoded) > 2048:
179
 
            # GnuPG can't handle long passwords, so encode differently
180
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
181
 
                       .replace(b"\n", b"\\n")
182
 
                       .replace(b"\0", b"\\x00"))
183
 
        return encoded
 
177
        return b"mandos" + binascii.hexlify(password)
184
178
    
185
179
    def encrypt(self, data, password):
186
 
        passphrase = self.password_encode(password)
187
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
188
 
                                         ) as passfile:
189
 
            passfile.write(passphrase)
190
 
            passfile.flush()
191
 
            proc = subprocess.Popen(['gpg', '--symmetric',
192
 
                                     '--passphrase-file',
193
 
                                     passfile.name]
194
 
                                    + self.gnupgargs,
195
 
                                    stdin = subprocess.PIPE,
196
 
                                    stdout = subprocess.PIPE,
197
 
                                    stderr = subprocess.PIPE)
198
 
            ciphertext, err = proc.communicate(input = data)
199
 
        if proc.returncode != 0:
200
 
            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
201
194
        return ciphertext
202
195
    
203
196
    def decrypt(self, data, password):
204
 
        passphrase = self.password_encode(password)
205
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
206
 
                                         ) as passfile:
207
 
            passfile.write(passphrase)
208
 
            passfile.flush()
209
 
            proc = subprocess.Popen(['gpg', '--decrypt',
210
 
                                     '--passphrase-file',
211
 
                                     passfile.name]
212
 
                                    + self.gnupgargs,
213
 
                                    stdin = subprocess.PIPE,
214
 
                                    stdout = subprocess.PIPE,
215
 
                                    stderr = subprocess.PIPE)
216
 
            decrypted_plaintext, err = proc.communicate(input
217
 
                                                        = data)
218
 
        if proc.returncode != 0:
219
 
            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
220
211
        return decrypted_plaintext
221
212
 
222
213
 
242
233
               Used to optionally bind to the specified interface.
243
234
    name: string; Example: 'Mandos'
244
235
    type: string; Example: '_mandos._tcp'.
245
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
246
237
    port: integer; what port to announce
247
238
    TXT: list of strings; TXT record for the service
248
239
    domain: string; Domain to publish on, default to .local if empty.
448
439
    runtime_expansions: Allowed attributes for runtime expansion.
449
440
    expires:    datetime.datetime(); time (UTC) when a client will be
450
441
                disabled, or None
451
 
    server_settings: The server_settings dict from main()
452
442
    """
453
443
    
454
444
    runtime_expansions = ("approval_delay", "approval_duration",
456
446
                          "fingerprint", "host", "interval",
457
447
                          "last_approval_request", "last_checked_ok",
458
448
                          "last_enabled", "name", "timeout")
459
 
    client_defaults = { "timeout": "PT5M",
460
 
                        "extended_timeout": "PT15M",
461
 
                        "interval": "PT2M",
 
449
    client_defaults = { "timeout": "5m",
 
450
                        "extended_timeout": "15m",
 
451
                        "interval": "2m",
462
452
                        "checker": "fping -q -- %%(host)s",
463
453
                        "host": "",
464
 
                        "approval_delay": "PT0S",
465
 
                        "approval_duration": "PT1S",
 
454
                        "approval_delay": "0s",
 
455
                        "approval_duration": "1s",
466
456
                        "approved_by_default": "True",
467
457
                        "enabled": "True",
468
458
                        }
529
519
        
530
520
        return settings
531
521
    
532
 
    def __init__(self, settings, name = None, server_settings=None):
 
522
    def __init__(self, settings, name = None):
533
523
        self.name = name
534
 
        if server_settings is None:
535
 
            server_settings = {}
536
 
        self.server_settings = server_settings
537
524
        # adding all client settings
538
525
        for setting, value in settings.iteritems():
539
526
            setattr(self, setting, value)
692
679
        # If a checker exists, make sure it is not a zombie
693
680
        try:
694
681
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
695
 
        except AttributeError:
696
 
            pass
697
 
        except OSError as error:
698
 
            if error.errno != errno.ECHILD:
699
 
                raise
 
682
        except (AttributeError, OSError) as error:
 
683
            if (isinstance(error, OSError)
 
684
                and error.errno != errno.ECHILD):
 
685
                raise error
700
686
        else:
701
687
            if pid:
702
688
                logger.warning("Checker was a zombie")
724
710
                # in normal mode, that is already done by daemon(),
725
711
                # and in debug mode we don't want to.  (Stdin is
726
712
                # always replaced by /dev/null.)
727
 
                # The exception is when not debugging but nevertheless
728
 
                # running in the foreground; use the previously
729
 
                # created wnull.
730
 
                popen_args = {}
731
 
                if (not self.server_settings["debug"]
732
 
                    and self.server_settings["foreground"]):
733
 
                    popen_args.update({"stdout": wnull,
734
 
                                       "stderr": wnull })
735
713
                self.checker = subprocess.Popen(command,
736
714
                                                close_fds=True,
737
 
                                                shell=True, cwd="/",
738
 
                                                **popen_args)
 
715
                                                shell=True, cwd="/")
739
716
            except OSError as error:
740
717
                logger.error("Failed to start subprocess",
741
718
                             exc_info=error)
742
 
                return True
743
719
            self.checker_callback_tag = (gobject.child_watch_add
744
720
                                         (self.checker.pid,
745
721
                                          self.checker_callback,
746
722
                                          data=command))
747
723
            # The checker may have completed before the gobject
748
724
            # watch was added.  Check for this.
749
 
            try:
750
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
751
 
            except OSError as error:
752
 
                if error.errno == errno.ECHILD:
753
 
                    # This should never happen
754
 
                    logger.error("Child process vanished",
755
 
                                 exc_info=error)
756
 
                    return True
757
 
                raise
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
758
726
            if pid:
759
727
                gobject.source_remove(self.checker_callback_tag)
760
728
                self.checker_callback(pid, status, command)
936
904
            # The byte_arrays option is not supported yet on
937
905
            # signatures other than "ay".
938
906
            if prop._dbus_signature != "ay":
939
 
                raise ValueError("Byte arrays not supported for non-"
940
 
                                 "'ay' signature {0!r}"
941
 
                                 .format(prop._dbus_signature))
 
907
                raise ValueError
942
908
            value = dbus.ByteArray(b''.join(chr(byte)
943
909
                                            for byte in value))
944
910
        prop(value)
1102
1068
                interface_names.add(alt_interface)
1103
1069
                # Is this a D-Bus signal?
1104
1070
                if getattr(attribute, "_dbus_is_signal", False):
1105
 
                    # Extract the original non-method undecorated
1106
 
                    # function by black magic
 
1071
                    # Extract the original non-method function by
 
1072
                    # black magic
1107
1073
                    nonmethod_func = (dict(
1108
1074
                            zip(attribute.func_code.co_freevars,
1109
1075
                                attribute.__closure__))["func"]
1707
1673
            logger.debug("Protocol version: %r", line)
1708
1674
            try:
1709
1675
                if int(line.strip().split()[0]) > 1:
1710
 
                    raise RuntimeError(line)
 
1676
                    raise RuntimeError
1711
1677
            except (ValueError, IndexError, RuntimeError) as error:
1712
1678
                logger.error("Unknown protocol version: %s", error)
1713
1679
                return
1920
1886
    
1921
1887
    def add_pipe(self, parent_pipe, proc):
1922
1888
        """Dummy function; override as necessary"""
1923
 
        raise NotImplementedError()
 
1889
        raise NotImplementedError
1924
1890
 
1925
1891
 
1926
1892
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2002
1968
                if self.address_family == socket.AF_INET6:
2003
1969
                    any_address = "::" # in6addr_any
2004
1970
                else:
2005
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1971
                    any_address = socket.INADDR_ANY
2006
1972
                self.server_address = (any_address,
2007
1973
                                       self.server_address[1])
2008
1974
            elif not self.server_address[1]:
2124
2090
        return True
2125
2091
 
2126
2092
 
2127
 
def rfc3339_duration_to_delta(duration):
2128
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2129
 
    
2130
 
    >>> rfc3339_duration_to_delta("P7D")
2131
 
    datetime.timedelta(7)
2132
 
    >>> rfc3339_duration_to_delta("PT60S")
2133
 
    datetime.timedelta(0, 60)
2134
 
    >>> rfc3339_duration_to_delta("PT60M")
2135
 
    datetime.timedelta(0, 3600)
2136
 
    >>> rfc3339_duration_to_delta("PT24H")
2137
 
    datetime.timedelta(1)
2138
 
    >>> rfc3339_duration_to_delta("P1W")
2139
 
    datetime.timedelta(7)
2140
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2141
 
    datetime.timedelta(0, 330)
2142
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2143
 
    datetime.timedelta(1, 200)
2144
 
    """
2145
 
    
2146
 
    # Parsing an RFC 3339 duration with regular expressions is not
2147
 
    # possible - there would have to be multiple places for the same
2148
 
    # values, like seconds.  The current code, while more esoteric, is
2149
 
    # cleaner without depending on a parsing library.  If Python had a
2150
 
    # built-in library for parsing we would use it, but we'd like to
2151
 
    # avoid excessive use of external libraries.
2152
 
    
2153
 
    # New type for defining tokens, syntax, and semantics all-in-one
2154
 
    Token = collections.namedtuple("Token",
2155
 
                                   ("regexp", # To match token; if
2156
 
                                              # "value" is not None,
2157
 
                                              # must have a "group"
2158
 
                                              # containing digits
2159
 
                                    "value",  # datetime.timedelta or
2160
 
                                              # None
2161
 
                                    "followers")) # Tokens valid after
2162
 
                                                  # this token
2163
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2165
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2166
 
    token_second = Token(re.compile(r"(\d+)S"),
2167
 
                         datetime.timedelta(seconds=1),
2168
 
                         frozenset((token_end,)))
2169
 
    token_minute = Token(re.compile(r"(\d+)M"),
2170
 
                         datetime.timedelta(minutes=1),
2171
 
                         frozenset((token_second, token_end)))
2172
 
    token_hour = Token(re.compile(r"(\d+)H"),
2173
 
                       datetime.timedelta(hours=1),
2174
 
                       frozenset((token_minute, token_end)))
2175
 
    token_time = Token(re.compile(r"T"),
2176
 
                       None,
2177
 
                       frozenset((token_hour, token_minute,
2178
 
                                  token_second)))
2179
 
    token_day = Token(re.compile(r"(\d+)D"),
2180
 
                      datetime.timedelta(days=1),
2181
 
                      frozenset((token_time, token_end)))
2182
 
    token_month = Token(re.compile(r"(\d+)M"),
2183
 
                        datetime.timedelta(weeks=4),
2184
 
                        frozenset((token_day, token_end)))
2185
 
    token_year = Token(re.compile(r"(\d+)Y"),
2186
 
                       datetime.timedelta(weeks=52),
2187
 
                       frozenset((token_month, token_end)))
2188
 
    token_week = Token(re.compile(r"(\d+)W"),
2189
 
                       datetime.timedelta(weeks=1),
2190
 
                       frozenset((token_end,)))
2191
 
    token_duration = Token(re.compile(r"P"), None,
2192
 
                           frozenset((token_year, token_month,
2193
 
                                      token_day, token_time,
2194
 
                                      token_week))),
2195
 
    # Define starting values
2196
 
    value = datetime.timedelta() # Value so far
2197
 
    found_token = None
2198
 
    followers = frozenset(token_duration,) # Following valid tokens
2199
 
    s = duration                # String left to parse
2200
 
    # Loop until end token is found
2201
 
    while found_token is not token_end:
2202
 
        # Search for any currently valid tokens
2203
 
        for token in followers:
2204
 
            match = token.regexp.match(s)
2205
 
            if match is not None:
2206
 
                # Token found
2207
 
                if token.value is not None:
2208
 
                    # Value found, parse digits
2209
 
                    factor = int(match.group(1), 10)
2210
 
                    # Add to value so far
2211
 
                    value += factor * token.value
2212
 
                # Strip token from string
2213
 
                s = token.regexp.sub("", s, 1)
2214
 
                # Go to found token
2215
 
                found_token = token
2216
 
                # Set valid next tokens
2217
 
                followers = found_token.followers
2218
 
                break
2219
 
        else:
2220
 
            # No currently valid tokens were found
2221
 
            raise ValueError("Invalid RFC 3339 duration")
2222
 
    # End token found
2223
 
    return value
2224
 
 
2225
 
 
2226
2093
def string_to_delta(interval):
2227
2094
    """Parse a string and return a datetime.timedelta
2228
2095
    
2239
2106
    >>> string_to_delta('5m 30s')
2240
2107
    datetime.timedelta(0, 330)
2241
2108
    """
2242
 
    
2243
 
    try:
2244
 
        return rfc3339_duration_to_delta(interval)
2245
 
    except ValueError:
2246
 
        pass
2247
 
    
2248
2109
    timevalue = datetime.timedelta(0)
2249
2110
    for s in interval.split():
2250
2111
        try:
2263
2124
            else:
2264
2125
                raise ValueError("Unknown suffix {0!r}"
2265
2126
                                 .format(suffix))
2266
 
        except IndexError as e:
 
2127
        except (ValueError, IndexError) as e:
2267
2128
            raise ValueError(*(e.args))
2268
2129
        timevalue += delta
2269
2130
    return timevalue
2313
2174
                        help="Run self-test")
2314
2175
    parser.add_argument("--debug", action="store_true",
2315
2176
                        help="Debug mode; run in foreground and log"
2316
 
                        " to terminal", default=None)
 
2177
                        " to terminal")
2317
2178
    parser.add_argument("--debuglevel", metavar="LEVEL",
2318
2179
                        help="Debug level for stdout output")
2319
2180
    parser.add_argument("--priority", help="GnuTLS"
2326
2187
                        " files")
2327
2188
    parser.add_argument("--no-dbus", action="store_false",
2328
2189
                        dest="use_dbus", help="Do not provide D-Bus"
2329
 
                        " system bus interface", default=None)
 
2190
                        " system bus interface")
2330
2191
    parser.add_argument("--no-ipv6", action="store_false",
2331
 
                        dest="use_ipv6", help="Do not use IPv6",
2332
 
                        default=None)
 
2192
                        dest="use_ipv6", help="Do not use IPv6")
2333
2193
    parser.add_argument("--no-restore", action="store_false",
2334
2194
                        dest="restore", help="Do not restore stored"
2335
 
                        " state", default=None)
 
2195
                        " state")
2336
2196
    parser.add_argument("--socket", type=int,
2337
2197
                        help="Specify a file descriptor to a network"
2338
2198
                        " socket to use instead of creating one")
2339
2199
    parser.add_argument("--statedir", metavar="DIR",
2340
2200
                        help="Directory to save/restore state in")
2341
2201
    parser.add_argument("--foreground", action="store_true",
2342
 
                        help="Run in foreground", default=None)
 
2202
                        help="Run in foreground")
2343
2203
    
2344
2204
    options = parser.parse_args()
2345
2205
    
2346
2206
    if options.check:
2347
2207
        import doctest
2348
 
        fail_count, test_count = doctest.testmod()
2349
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2208
        doctest.testmod()
 
2209
        sys.exit()
2350
2210
    
2351
2211
    # Default values for config file for server-global settings
2352
2212
    server_defaults = { "interface": "",
2354
2214
                        "port": "",
2355
2215
                        "debug": "False",
2356
2216
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2217
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2358
2218
                        "servicename": "Mandos",
2359
2219
                        "use_dbus": "True",
2360
2220
                        "use_ipv6": "True",
2404
2264
    for option in server_settings.keys():
2405
2265
        if type(server_settings[option]) is str:
2406
2266
            server_settings[option] = unicode(server_settings[option])
2407
 
    # Force all boolean options to be boolean
2408
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2409
 
                   "foreground"):
2410
 
        server_settings[option] = bool(server_settings[option])
2411
2267
    # Debug implies foreground
2412
2268
    if server_settings["debug"]:
2413
2269
        server_settings["foreground"] = True
2461
2317
                              socketfd=(server_settings["socket"]
2462
2318
                                        or None))
2463
2319
    if not foreground:
2464
 
        pidfilename = "/run/mandos.pid"
2465
 
        if not os.path.isdir("/run/."):
2466
 
            pidfilename = "/var/run/mandos.pid"
 
2320
        pidfilename = "/var/run/mandos.pid"
2467
2321
        pidfile = None
2468
2322
        try:
2469
2323
            pidfile = open(pidfilename, "w")
2486
2340
        os.setuid(uid)
2487
2341
    except OSError as error:
2488
2342
        if error.errno != errno.EPERM:
2489
 
            raise
 
2343
            raise error
2490
2344
    
2491
2345
    if debug:
2492
2346
        # Enable all possible GnuTLS debugging
2555
2409
    old_client_settings = {}
2556
2410
    clients_data = {}
2557
2411
    
2558
 
    # This is used to redirect stdout and stderr for checker processes
2559
 
    global wnull
2560
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2561
 
    # Only used if server is running in foreground but not in debug
2562
 
    # mode
2563
 
    if debug or not foreground:
2564
 
        wnull.close()
2565
 
    
2566
2412
    # Get client data and settings from last running state.
2567
2413
    if server_settings["restore"]:
2568
2414
        try:
2584
2430
    
2585
2431
    with PGPEngine() as pgp:
2586
2432
        for client_name, client in clients_data.iteritems():
2587
 
            # Skip removed clients
2588
 
            if client_name not in client_settings:
2589
 
                continue
2590
 
            
2591
2433
            # Decide which value to use after restoring saved state.
2592
2434
            # We have three different values: Old config file,
2593
2435
            # new config file, and saved state.
2655
2497
    # Create all client objects
2656
2498
    for client_name, client in clients_data.iteritems():
2657
2499
        tcp_server.clients[client_name] = client_class(
2658
 
            name = client_name, settings = client,
2659
 
            server_settings = server_settings)
 
2500
            name = client_name, settings = client)
2660
2501
    
2661
2502
    if not tcp_server.clients:
2662
2503
        logger.warning("No clients defined")
2745
2586
        service.cleanup()
2746
2587
        
2747
2588
        multiprocessing.active_children()
2748
 
        wnull.close()
2749
2589
        if not (tcp_server.clients or client_settings):
2750
2590
            return
2751
2591
        
2763
2603
                # A list of attributes that can not be pickled
2764
2604
                # + secret.
2765
2605
                exclude = set(("bus", "changedstate", "secret",
2766
 
                               "checker", "server_settings"))
 
2606
                               "checker"))
2767
2607
                for name, typ in (inspect.getmembers
2768
2608
                                  (dbus.service.Object)):
2769
2609
                    exclude.add(name)
2797
2637
            else:
2798
2638
                logger.warning("Could not save persistent state:",
2799
2639
                               exc_info=e)
2800
 
                raise
 
2640
                raise e
2801
2641
        
2802
2642
        # Delete all clients, and settings from config
2803
2643
        while tcp_server.clients: