104
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
105
        with contextlib.closing(socket.socket()) as s:
 
106
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
 
                                struct.pack(b"16s16x", interface))
 
108
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
 
107
                                struct.pack(str("16s16x"),
 
 
109
        interface_index = struct.unpack(str("I"),
 
109
111
        return interface_index
 
112
114
def initlogger(debug, level=logging.WARNING):
 
113
115
    """init logger and add loglevel"""
 
116
117
    syslogger = (logging.handlers.SysLogHandler
 
118
119
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
119
 
                  address = "/dev/log"))
 
 
120
                  address = str("/dev/log")))
 
120
121
    syslogger.setFormatter(logging.Formatter
 
121
122
                           ('Mandos [%(process)d]: %(levelname)s:'
 
 
222
223
class AvahiError(Exception):
 
223
224
    def __init__(self, value, *args, **kwargs):
 
224
225
        self.value = value
 
225
 
        return super(AvahiError, self).__init__(value, *args,
 
 
226
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
227
    def __unicode__(self):
 
 
228
        return unicode(repr(self.value))
 
228
230
class AvahiServiceError(AvahiError):
 
 
335
337
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
336
338
            logger.critical("Avahi: Error in group state changed %s",
 
338
 
            raise AvahiGroupError("State changed: {!s}"
 
 
340
            raise AvahiGroupError("State changed: {0!s}"
 
341
343
    def cleanup(self):
 
 
392
394
        """Add the new name to the syslog messages"""
 
393
395
        ret = AvahiService.rename(self)
 
394
396
        syslogger.setFormatter(logging.Formatter
 
395
 
                               ('Mandos ({}) [%(process)d]:'
 
 
397
                               ('Mandos ({0}) [%(process)d]:'
 
396
398
                                ' %(levelname)s: %(message)s'
 
397
399
                                .format(self.name)))
 
 
403
def timedelta_to_milliseconds(td):
 
 
404
    "Convert a datetime.timedelta() to milliseconds"
 
 
405
    return ((td.days * 24 * 60 * 60 * 1000)
 
 
406
            + (td.seconds * 1000)
 
 
407
            + (td.microseconds // 1000))
 
401
410
class Client(object):
 
402
411
    """A representation of a client host served by this server.
 
 
458
467
                        "enabled": "True",
 
 
470
    def timeout_milliseconds(self):
 
 
471
        "Return the 'timeout' attribute in milliseconds"
 
 
472
        return timedelta_to_milliseconds(self.timeout)
 
 
474
    def extended_timeout_milliseconds(self):
 
 
475
        "Return the 'extended_timeout' attribute in milliseconds"
 
 
476
        return timedelta_to_milliseconds(self.extended_timeout)
 
 
478
    def interval_milliseconds(self):
 
 
479
        "Return the 'interval' attribute in milliseconds"
 
 
480
        return timedelta_to_milliseconds(self.interval)
 
 
482
    def approval_delay_milliseconds(self):
 
 
483
        return timedelta_to_milliseconds(self.approval_delay)
 
462
486
    def config_parser(config):
 
463
487
        """Construct a new dict of client settings of this form:
 
 
488
512
                          "rb") as secfile:
 
489
513
                    client["secret"] = secfile.read()
 
491
 
                raise TypeError("No secret or secfile for section {}"
 
 
515
                raise TypeError("No secret or secfile for section {0}"
 
492
516
                                .format(section))
 
493
517
            client["timeout"] = string_to_delta(section["timeout"])
 
494
518
            client["extended_timeout"] = string_to_delta(
 
 
511
535
            server_settings = {}
 
512
536
        self.server_settings = server_settings
 
513
537
        # adding all client settings
 
514
 
        for setting, value in settings.items():
 
 
538
        for setting, value in settings.iteritems():
 
515
539
            setattr(self, setting, value)
 
 
600
624
        if self.checker_initiator_tag is not None:
 
601
625
            gobject.source_remove(self.checker_initiator_tag)
 
602
626
        self.checker_initiator_tag = (gobject.timeout_add
 
604
 
                                           .total_seconds() * 1000),
 
 
627
                                      (self.interval_milliseconds(),
 
605
628
                                       self.start_checker))
 
606
629
        # Schedule a disable() when 'timeout' has passed
 
607
630
        if self.disable_initiator_tag is not None:
 
608
631
            gobject.source_remove(self.disable_initiator_tag)
 
609
632
        self.disable_initiator_tag = (gobject.timeout_add
 
611
 
                                           .total_seconds() * 1000),
 
 
633
                                   (self.timeout_milliseconds(),
 
613
635
        # Also start a new checker *right now*.
 
614
636
        self.start_checker()
 
 
646
668
            self.disable_initiator_tag = None
 
647
669
        if getattr(self, "enabled", False):
 
648
670
            self.disable_initiator_tag = (gobject.timeout_add
 
649
 
                                          (int(timeout.total_seconds()
 
650
 
                                               * 1000), self.disable))
 
 
671
                                          (timedelta_to_milliseconds
 
 
672
                                           (timeout), self.disable))
 
651
673
            self.expires = datetime.datetime.utcnow() + timeout
 
653
675
    def need_approval(self):
 
 
684
706
        # Start a new checker if needed
 
685
707
        if self.checker is None:
 
686
708
            # Escape attributes for the shell
 
687
 
            escaped_attrs = { attr:
 
688
 
                                  re.escape(unicode(getattr(self,
 
690
 
                              for attr in self.runtime_expansions }
 
 
709
            escaped_attrs = dict(
 
 
710
                (attr, re.escape(unicode(getattr(self, attr))))
 
 
712
                self.runtime_expansions)
 
692
714
                command = self.checker_command % escaped_attrs
 
693
715
            except TypeError as error:
 
 
774
796
    # "Set" method, so we fail early here:
 
775
797
    if byte_arrays and signature != "ay":
 
776
798
        raise ValueError("Byte arrays not supported for non-'ay'"
 
777
 
                         " signature {!r}".format(signature))
 
 
799
                         " signature {0!r}".format(signature))
 
778
800
    def decorator(func):
 
779
801
        func._dbus_is_property = True
 
780
802
        func._dbus_interface = dbus_interface
 
 
828
850
class DBusPropertyException(dbus.exceptions.DBusException):
 
829
851
    """A base class for D-Bus property-related exceptions
 
 
853
    def __unicode__(self):
 
 
854
        return unicode(str(self))
 
833
857
class DBusPropertyAccessException(DBusPropertyException):
 
834
858
    """A property's access permissions disallows an operation.
 
 
857
881
        If called like _is_dbus_thing("method") it returns a function
 
858
882
        suitable for use as predicate to inspect.getmembers().
 
860
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
884
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
863
887
    def _get_all_dbus_things(self, thing):
 
 
913
937
            # signatures other than "ay".
 
914
938
            if prop._dbus_signature != "ay":
 
915
939
                raise ValueError("Byte arrays not supported for non-"
 
916
 
                                 "'ay' signature {!r}"
 
 
940
                                 "'ay' signature {0!r}"
 
917
941
                                 .format(prop._dbus_signature))
 
918
942
            value = dbus.ByteArray(b''.join(chr(byte)
 
919
943
                                            for byte in value))
 
 
985
1009
                                               "_dbus_annotations",
 
987
 
                        for name, value in annots.items():
 
 
1011
                        for name, value in annots.iteritems():
 
988
1012
                            ann_tag = document.createElement(
 
990
1014
                            ann_tag.setAttribute("name", name)
 
 
993
1017
                # Add interface annotation tags
 
994
1018
                for annotation, value in dict(
 
995
1019
                    itertools.chain.from_iterable(
 
996
 
                        annotations().items()
 
 
1020
                        annotations().iteritems()
 
997
1021
                        for name, annotations in
 
998
1022
                        self._get_all_dbus_things("interface")
 
999
1023
                        if name == if_tag.getAttribute("name")
 
1001
1025
                    ann_tag = document.createElement("annotation")
 
1002
1026
                    ann_tag.setAttribute("name", annotation)
 
1003
1027
                    ann_tag.setAttribute("value", value)
 
 
1060
1084
    def wrapper(cls):
 
1061
1085
        for orig_interface_name, alt_interface_name in (
 
1062
 
            alt_interface_names.items()):
 
 
1086
            alt_interface_names.iteritems()):
 
1064
1088
            interface_names = set()
 
1065
1089
            # Go though all attributes of the class
 
 
1182
1206
                                        attribute.func_closure)))
 
1184
1208
                # Deprecate all alternate interfaces
 
1185
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
 
1209
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1186
1210
                for interface_name in interface_names:
 
1187
1211
                    @dbus_interface_annotations(interface_name)
 
1188
1212
                    def func(self):
 
 
1197
1221
            if interface_names:
 
1198
1222
                # Replace the class with a new subclass of it with
 
1199
1223
                # methods, signals, etc. as created above.
 
1200
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
 
1224
                cls = type(b"{0}Alternate".format(cls.__name__),
 
 
1244
1268
                   to the D-Bus.  Default: no transform
 
1245
1269
        variant_level: D-Bus variant level.  Default: 1
 
1247
 
        attrname = "_{}".format(dbus_name)
 
 
1271
        attrname = "_{0}".format(dbus_name)
 
1248
1272
        def setter(self, value):
 
1249
1273
            if hasattr(self, "dbus_object_path"):
 
1250
1274
                if (not hasattr(self, attrname) or
 
 
1280
1304
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1281
1305
                                          "ApprovalDelay",
 
1283
 
                                          lambda td: td.total_seconds()
 
 
1307
                                          timedelta_to_milliseconds)
 
1285
1308
    approval_duration = notifychangeproperty(
 
1286
1309
        dbus.UInt64, "ApprovalDuration",
 
1287
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1310
        type_func = timedelta_to_milliseconds)
 
1288
1311
    host = notifychangeproperty(dbus.String, "Host")
 
1289
1312
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1290
 
                                   type_func = lambda td:
 
1291
 
                                       td.total_seconds() * 1000)
 
 
1314
                                   timedelta_to_milliseconds)
 
1292
1315
    extended_timeout = notifychangeproperty(
 
1293
1316
        dbus.UInt64, "ExtendedTimeout",
 
1294
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1317
        type_func = timedelta_to_milliseconds)
 
1295
1318
    interval = notifychangeproperty(dbus.UInt64,
 
1298
 
                                    lambda td: td.total_seconds()
 
 
1321
                                    timedelta_to_milliseconds)
 
1300
1322
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1302
1324
    del notifychangeproperty
 
 
1346
1368
    def approve(self, value=True):
 
1347
1369
        self.approved = value
 
1348
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1349
 
                                * 1000), self._reset_approved)
 
 
1370
        gobject.timeout_add(timedelta_to_milliseconds
 
 
1371
                            (self.approval_duration),
 
 
1372
                            self._reset_approved)
 
1350
1373
        self.send_changedstate()
 
1352
1375
    ## D-Bus methods, signals & properties
 
 
1455
1478
                           access="readwrite")
 
1456
1479
    def ApprovalDelay_dbus_property(self, value=None):
 
1457
1480
        if value is None:       # get
 
1458
 
            return dbus.UInt64(self.approval_delay.total_seconds()
 
 
1481
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1460
1482
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1462
1484
    # ApprovalDuration - property
 
 
1464
1486
                           access="readwrite")
 
1465
1487
    def ApprovalDuration_dbus_property(self, value=None):
 
1466
1488
        if value is None:       # get
 
1467
 
            return dbus.UInt64(self.approval_duration.total_seconds()
 
 
1489
            return dbus.UInt64(timedelta_to_milliseconds(
 
 
1490
                    self.approval_duration))
 
1469
1491
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1471
1493
    # Name - property
 
 
1537
1559
                           access="readwrite")
 
1538
1560
    def Timeout_dbus_property(self, value=None):
 
1539
1561
        if value is None:       # get
 
1540
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
 
1562
            return dbus.UInt64(self.timeout_milliseconds())
 
1541
1563
        old_timeout = self.timeout
 
1542
1564
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1543
1565
        # Reschedule disabling
 
 
1554
1576
                gobject.source_remove(self.disable_initiator_tag)
 
1555
1577
                self.disable_initiator_tag = (
 
1556
1578
                    gobject.timeout_add(
 
1557
 
                        int((self.expires - now).total_seconds()
 
1558
 
                            * 1000), self.disable))
 
 
1579
                        timedelta_to_milliseconds(self.expires - now),
 
1560
1582
    # ExtendedTimeout - property
 
1561
1583
    @dbus_service_property(_interface, signature="t",
 
1562
1584
                           access="readwrite")
 
1563
1585
    def ExtendedTimeout_dbus_property(self, value=None):
 
1564
1586
        if value is None:       # get
 
1565
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
 
1587
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1567
1588
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1569
1590
    # Interval - property
 
 
1571
1592
                           access="readwrite")
 
1572
1593
    def Interval_dbus_property(self, value=None):
 
1573
1594
        if value is None:       # get
 
1574
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
 
1595
            return dbus.UInt64(self.interval_milliseconds())
 
1575
1596
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1576
1597
        if getattr(self, "checker_initiator_tag", None) is None:
 
 
1610
1631
    @dbus_service_property(_interface, signature="ay",
 
1611
1632
                           access="write", byte_arrays=True)
 
1612
1633
    def Secret_dbus_property(self, value):
 
1613
 
        self.secret = bytes(value)
 
 
1634
        self.secret = str(value)
 
 
1737
1758
                        if self.server.use_dbus:
 
1738
1759
                            # Emit D-Bus signal
 
1739
1760
                            client.NeedApproval(
 
1740
 
                                client.approval_delay.total_seconds()
 
1741
 
                                * 1000, client.approved_by_default)
 
 
1761
                                client.approval_delay_milliseconds(),
 
 
1762
                                client.approved_by_default)
 
1743
1764
                        logger.warning("Client %s was not approved",
 
 
1750
1771
                    #wait until timeout or approved
 
1751
1772
                    time = datetime.datetime.now()
 
1752
1773
                    client.changedstate.acquire()
 
1753
 
                    client.changedstate.wait(delay.total_seconds())
 
 
1774
                    client.changedstate.wait(
 
 
1775
                        float(timedelta_to_milliseconds(delay)
 
1754
1777
                    client.changedstate.release()
 
1755
1778
                    time2 = datetime.datetime.now()
 
1756
1779
                    if (time2 - time) >= delay:
 
 
1956
1979
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1957
1980
                                           SO_BINDTODEVICE,
 
1958
 
                                           (self.interface + "\0")
 
 
1981
                                           str(self.interface + '\0'))
 
1960
1982
                except socket.error as error:
 
1961
1983
                    if error.errno == errno.EPERM:
 
1962
1984
                        logger.error("No permission to bind to"
 
 
2165
2187
    token_duration = Token(re.compile(r"P"), None,
 
2166
2188
                           frozenset((token_year, token_month,
 
2167
2189
                                      token_day, token_time,
 
2169
2191
    # Define starting values
 
2170
2192
    value = datetime.timedelta() # Value so far
 
2171
2193
    found_token = None
 
2172
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
 
2194
    followers = frozenset(token_duration,) # Following valid tokens
 
2173
2195
    s = duration                # String left to parse
 
2174
2196
    # Loop until end token is found
 
2175
2197
    while found_token is not token_end:
 
 
2235
2257
            elif suffix == "w":
 
2236
2258
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
2238
 
                raise ValueError("Unknown suffix {!r}"
 
 
2260
                raise ValueError("Unknown suffix {0!r}"
 
2239
2261
                                 .format(suffix))
 
2240
2262
        except IndexError as e:
 
2241
2263
            raise ValueError(*(e.args))
 
 
2258
2280
        # Close all standard open file descriptors
 
2259
2281
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2260
2282
        if not stat.S_ISCHR(os.fstat(null).st_mode):
 
2261
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
 
2283
            raise OSError(errno.ENODEV,
 
 
2284
                          "{0} not a character device"
 
2262
2285
                          .format(os.devnull))
 
2263
2286
        os.dup2(null, sys.stdin.fileno())
 
2264
2287
        os.dup2(null, sys.stdout.fileno())
 
 
2275
2298
    parser = argparse.ArgumentParser()
 
2276
2299
    parser.add_argument("-v", "--version", action="version",
 
2277
 
                        version = "%(prog)s {}".format(version),
 
 
2300
                        version = "%(prog)s {0}".format(version),
 
2278
2301
                        help="show version number and exit")
 
2279
2302
    parser.add_argument("-i", "--interface", metavar="IF",
 
2280
2303
                        help="Bind to interface IF")
 
 
2313
2336
                        help="Directory to save/restore state in")
 
2314
2337
    parser.add_argument("--foreground", action="store_true",
 
2315
2338
                        help="Run in foreground", default=None)
 
2316
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2317
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
2320
2340
    options = parser.parse_args()
 
 
2372
2391
    for option in ("interface", "address", "port", "debug",
 
2373
2392
                   "priority", "servicename", "configdir",
 
2374
2393
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2375
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
 
2394
                   "statedir", "socket", "foreground"):
 
2376
2395
        value = getattr(options, option)
 
2377
2396
        if value is not None:
 
2378
2397
            server_settings[option] = value
 
2380
2399
    # Force all strings to be unicode
 
2381
2400
    for option in server_settings.keys():
 
2382
 
        if isinstance(server_settings[option], bytes):
 
2383
 
            server_settings[option] = (server_settings[option]
 
 
2401
        if type(server_settings[option]) is str:
 
 
2402
            server_settings[option] = unicode(server_settings[option])
 
2385
2403
    # Force all boolean options to be boolean
 
2386
2404
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2387
 
                   "foreground", "zeroconf"):
 
2388
2406
        server_settings[option] = bool(server_settings[option])
 
2389
2407
    # Debug implies foreground
 
2390
2408
    if server_settings["debug"]:
 
 
2394
2412
    ##################################################################
 
2396
 
    if (not server_settings["zeroconf"] and
 
2397
 
        not (server_settings["port"]
 
2398
 
             or server_settings["socket"] != "")):
 
2399
 
            parser.error("Needs port or socket to work without"
 
2402
2414
    # For convenience
 
2403
2415
    debug = server_settings["debug"]
 
2404
2416
    debuglevel = server_settings["debuglevel"]
 
 
2407
2419
    stored_state_path = os.path.join(server_settings["statedir"],
 
2408
2420
                                     stored_state_file)
 
2409
2421
    foreground = server_settings["foreground"]
 
2410
 
    zeroconf = server_settings["zeroconf"]
 
2413
2424
        initlogger(debug, logging.DEBUG)
 
 
2421
2432
    if server_settings["servicename"] != "Mandos":
 
2422
2433
        syslogger.setFormatter(logging.Formatter
 
2423
 
                               ('Mandos ({}) [%(process)d]:'
 
 
2434
                               ('Mandos ({0}) [%(process)d]:'
 
2424
2435
                                ' %(levelname)s: %(message)s'
 
2425
2436
                                .format(server_settings
 
2426
2437
                                        ["servicename"])))
 
 
2434
2445
    global mandos_dbus_service
 
2435
2446
    mandos_dbus_service = None
 
2438
 
    if server_settings["socket"] != "":
 
2439
 
        socketfd = server_settings["socket"]
 
2440
2448
    tcp_server = MandosServer((server_settings["address"],
 
2441
2449
                               server_settings["port"]),
 
 
2446
2454
                              gnutls_priority=
 
2447
2455
                              server_settings["priority"],
 
2448
2456
                              use_dbus=use_dbus,
 
 
2457
                              socketfd=(server_settings["socket"]
 
2450
2459
    if not foreground:
 
2451
2460
        pidfilename = "/run/mandos.pid"
 
2452
2461
        if not os.path.isdir("/run/."):
 
 
2522
2531
            use_dbus = False
 
2523
2532
            server_settings["use_dbus"] = False
 
2524
2533
            tcp_server.use_dbus = False
 
2526
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2527
 
        service = AvahiServiceToSyslog(name =
 
2528
 
                                       server_settings["servicename"],
 
2529
 
                                       servicetype = "_mandos._tcp",
 
2530
 
                                       protocol = protocol, bus = bus)
 
2531
 
        if server_settings["interface"]:
 
2532
 
            service.interface = (if_nametoindex
 
2533
 
                                 (server_settings["interface"]
 
 
2534
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2535
    service = AvahiServiceToSyslog(name =
 
 
2536
                                   server_settings["servicename"],
 
 
2537
                                   servicetype = "_mandos._tcp",
 
 
2538
                                   protocol = protocol, bus = bus)
 
 
2539
    if server_settings["interface"]:
 
 
2540
        service.interface = (if_nametoindex
 
 
2541
                             (str(server_settings["interface"])))
 
2536
2543
    global multiprocessing_manager
 
2537
2544
    multiprocessing_manager = multiprocessing.Manager()
 
 
2561
2568
            os.remove(stored_state_path)
 
2562
2569
        except IOError as e:
 
2563
2570
            if e.errno == errno.ENOENT:
 
2564
 
                logger.warning("Could not load persistent state: {}"
 
 
2571
                logger.warning("Could not load persistent state: {0}"
 
2565
2572
                                .format(os.strerror(e.errno)))
 
2567
2574
                logger.critical("Could not load persistent state:",
 
 
2603
2610
                if datetime.datetime.utcnow() >= client["expires"]:
 
2604
2611
                    if not client["last_checked_ok"]:
 
2605
2612
                        logger.warning(
 
2606
 
                            "disabling client {} - Client never "
 
 
2613
                            "disabling client {0} - Client never "
 
2607
2614
                            "performed a successful checker"
 
2608
2615
                            .format(client_name))
 
2609
2616
                        client["enabled"] = False
 
2610
2617
                    elif client["last_checker_status"] != 0:
 
2611
2618
                        logger.warning(
 
2612
 
                            "disabling client {} - Client last"
 
2613
 
                            " checker failed with error code {}"
 
 
2619
                            "disabling client {0} - Client "
 
 
2620
                            "last checker failed with error code {1}"
 
2614
2621
                            .format(client_name,
 
2615
2622
                                    client["last_checker_status"]))
 
2616
2623
                        client["enabled"] = False
 
 
2629
2636
            except PGPError:
 
2630
2637
                # If decryption fails, we use secret from new settings
 
2631
 
                logger.debug("Failed to decrypt {} old secret"
 
 
2638
                logger.debug("Failed to decrypt {0} old secret"
 
2632
2639
                             .format(client_name))
 
2633
2640
                client["secret"] = (
 
2634
2641
                    client_settings[client_name]["secret"])
 
 
2642
2649
        clients_data[client_name] = client_settings[client_name]
 
2644
2651
    # Create all client objects
 
2645
 
    for client_name, client in clients_data.items():
 
 
2652
    for client_name, client in clients_data.iteritems():
 
2646
2653
        tcp_server.clients[client_name] = client_class(
 
2647
2654
            name = client_name, settings = client,
 
2648
2655
            server_settings = server_settings)
 
 
2753
2759
                # A list of attributes that can not be pickled
 
2755
 
                exclude = { "bus", "changedstate", "secret",
 
2756
 
                            "checker", "server_settings" }
 
 
2761
                exclude = set(("bus", "changedstate", "secret",
 
 
2762
                               "checker", "server_settings"))
 
2757
2763
                for name, typ in (inspect.getmembers
 
2758
2764
                                  (dbus.service.Object)):
 
2759
2765
                    exclude.add(name)
 
 
2782
2788
                except NameError:
 
2784
2790
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2785
 
                logger.warning("Could not save persistent state: {}"
 
 
2791
                logger.warning("Could not save persistent state: {0}"
 
2786
2792
                               .format(os.strerror(e.errno)))
 
2788
2794
                logger.warning("Could not save persistent state:",
 
 
2817
2823
    tcp_server.server_activate()
 
2819
2825
    # Find out what port we got
 
2821
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2826
    service.port = tcp_server.socket.getsockname()[1]
 
2823
2828
        logger.info("Now listening on address %r, port %d,"
 
2824
2829
                    " flowinfo %d, scope_id %d",
 
 
2830
2835
    #service.interface = tcp_server.socket.getsockname()[3]
 
2834
 
            # From the Avahi example code
 
2837
 
            except dbus.exceptions.DBusException as error:
 
2838
 
                logger.critical("D-Bus Exception", exc_info=error)
 
2841
 
            # End of Avahi example code
 
 
2838
        # From the Avahi example code
 
 
2841
        except dbus.exceptions.DBusException as error:
 
 
2842
            logger.critical("D-Bus Exception", exc_info=error)
 
 
2845
        # End of Avahi example code
 
2843
2847
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2844
2848
                             lambda *args, **kwargs: