/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: 2013-10-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
# 
4
4
# Mandos server - give out binary blobs to connecting clients.
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-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 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
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.7"
 
91
version = "1.6.2"
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'))
338
335
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
336
            logger.critical("Avahi: Error in group state changed %s",
340
337
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
338
            raise AvahiGroupError("State changed: {0!s}"
342
339
                                  .format(error))
343
340
    
344
341
    def cleanup(self):
395
392
        """Add the new name to the syslog messages"""
396
393
        ret = AvahiService.rename(self)
397
394
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
395
                               ('Mandos ({0}) [%(process)d]:'
399
396
                                ' %(levelname)s: %(message)s'
400
397
                                .format(self.name)))
401
398
        return ret
402
399
 
403
400
 
 
401
def timedelta_to_milliseconds(td):
 
402
    "Convert a datetime.timedelta() to milliseconds"
 
403
    return ((td.days * 24 * 60 * 60 * 1000)
 
404
            + (td.seconds * 1000)
 
405
            + (td.microseconds // 1000))
 
406
 
 
407
 
404
408
class Client(object):
405
409
    """A representation of a client host served by this server.
406
410
    
461
465
                        "enabled": "True",
462
466
                        }
463
467
    
 
468
    def timeout_milliseconds(self):
 
469
        "Return the 'timeout' attribute in milliseconds"
 
470
        return timedelta_to_milliseconds(self.timeout)
 
471
    
 
472
    def extended_timeout_milliseconds(self):
 
473
        "Return the 'extended_timeout' attribute in milliseconds"
 
474
        return timedelta_to_milliseconds(self.extended_timeout)
 
475
    
 
476
    def interval_milliseconds(self):
 
477
        "Return the 'interval' attribute in milliseconds"
 
478
        return timedelta_to_milliseconds(self.interval)
 
479
    
 
480
    def approval_delay_milliseconds(self):
 
481
        return timedelta_to_milliseconds(self.approval_delay)
 
482
    
464
483
    @staticmethod
465
484
    def config_parser(config):
466
485
        """Construct a new dict of client settings of this form:
491
510
                          "rb") as secfile:
492
511
                    client["secret"] = secfile.read()
493
512
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
513
                raise TypeError("No secret or secfile for section {0}"
495
514
                                .format(section))
496
515
            client["timeout"] = string_to_delta(section["timeout"])
497
516
            client["extended_timeout"] = string_to_delta(
514
533
            server_settings = {}
515
534
        self.server_settings = server_settings
516
535
        # adding all client settings
517
 
        for setting, value in settings.items():
 
536
        for setting, value in settings.iteritems():
518
537
            setattr(self, setting, value)
519
538
        
520
539
        if self.enabled:
603
622
        if self.checker_initiator_tag is not None:
604
623
            gobject.source_remove(self.checker_initiator_tag)
605
624
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
625
                                      (self.interval_milliseconds(),
608
626
                                       self.start_checker))
609
627
        # Schedule a disable() when 'timeout' has passed
610
628
        if self.disable_initiator_tag is not None:
611
629
            gobject.source_remove(self.disable_initiator_tag)
612
630
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
631
                                   (self.timeout_milliseconds(),
 
632
                                    self.disable))
616
633
        # Also start a new checker *right now*.
617
634
        self.start_checker()
618
635
    
649
666
            self.disable_initiator_tag = None
650
667
        if getattr(self, "enabled", False):
651
668
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
669
                                          (timedelta_to_milliseconds
 
670
                                           (timeout), self.disable))
654
671
            self.expires = datetime.datetime.utcnow() + timeout
655
672
    
656
673
    def need_approval(self):
673
690
        # If a checker exists, make sure it is not a zombie
674
691
        try:
675
692
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
 
693
        except (AttributeError, OSError) as error:
 
694
            if (isinstance(error, OSError)
 
695
                and error.errno != errno.ECHILD):
 
696
                raise error
681
697
        else:
682
698
            if pid:
683
699
                logger.warning("Checker was a zombie")
687
703
        # Start a new checker if needed
688
704
        if self.checker is None:
689
705
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(unicode(getattr(self,
692
 
                                                            attr)))
693
 
                              for attr in self.runtime_expansions }
 
706
            escaped_attrs = dict(
 
707
                (attr, re.escape(unicode(getattr(self, attr))))
 
708
                for attr in
 
709
                self.runtime_expansions)
694
710
            try:
695
711
                command = self.checker_command % escaped_attrs
696
712
            except TypeError as error:
777
793
    # "Set" method, so we fail early here:
778
794
    if byte_arrays and signature != "ay":
779
795
        raise ValueError("Byte arrays not supported for non-'ay'"
780
 
                         " signature {!r}".format(signature))
 
796
                         " signature {0!r}".format(signature))
781
797
    def decorator(func):
782
798
        func._dbus_is_property = True
783
799
        func._dbus_interface = dbus_interface
862
878
        If called like _is_dbus_thing("method") it returns a function
863
879
        suitable for use as predicate to inspect.getmembers().
864
880
        """
865
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
881
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
866
882
                                   False)
867
883
    
868
884
    def _get_all_dbus_things(self, thing):
917
933
            # The byte_arrays option is not supported yet on
918
934
            # signatures other than "ay".
919
935
            if prop._dbus_signature != "ay":
920
 
                raise ValueError("Byte arrays not supported for non-"
921
 
                                 "'ay' signature {!r}"
922
 
                                 .format(prop._dbus_signature))
 
936
                raise ValueError
923
937
            value = dbus.ByteArray(b''.join(chr(byte)
924
938
                                            for byte in value))
925
939
        prop(value)
989
1003
                                              (prop,
990
1004
                                               "_dbus_annotations",
991
1005
                                               {}))
992
 
                        for name, value in annots.items():
 
1006
                        for name, value in annots.iteritems():
993
1007
                            ann_tag = document.createElement(
994
1008
                                "annotation")
995
1009
                            ann_tag.setAttribute("name", name)
998
1012
                # Add interface annotation tags
999
1013
                for annotation, value in dict(
1000
1014
                    itertools.chain.from_iterable(
1001
 
                        annotations().items()
 
1015
                        annotations().iteritems()
1002
1016
                        for name, annotations in
1003
1017
                        self._get_all_dbus_things("interface")
1004
1018
                        if name == if_tag.getAttribute("name")
1005
 
                        )).items():
 
1019
                        )).iteritems():
1006
1020
                    ann_tag = document.createElement("annotation")
1007
1021
                    ann_tag.setAttribute("name", annotation)
1008
1022
                    ann_tag.setAttribute("value", value)
1064
1078
    """
1065
1079
    def wrapper(cls):
1066
1080
        for orig_interface_name, alt_interface_name in (
1067
 
            alt_interface_names.items()):
 
1081
            alt_interface_names.iteritems()):
1068
1082
            attr = {}
1069
1083
            interface_names = set()
1070
1084
            # Go though all attributes of the class
1187
1201
                                        attribute.func_closure)))
1188
1202
            if deprecate:
1189
1203
                # Deprecate all alternate interfaces
1190
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1204
                iname="_AlternateDBusNames_interface_annotation{0}"
1191
1205
                for interface_name in interface_names:
1192
1206
                    @dbus_interface_annotations(interface_name)
1193
1207
                    def func(self):
1202
1216
            if interface_names:
1203
1217
                # Replace the class with a new subclass of it with
1204
1218
                # methods, signals, etc. as created above.
1205
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1219
                cls = type(b"{0}Alternate".format(cls.__name__),
1206
1220
                           (cls,), attr)
1207
1221
        return cls
1208
1222
    return wrapper
1249
1263
                   to the D-Bus.  Default: no transform
1250
1264
        variant_level: D-Bus variant level.  Default: 1
1251
1265
        """
1252
 
        attrname = "_{}".format(dbus_name)
 
1266
        attrname = "_{0}".format(dbus_name)
1253
1267
        def setter(self, value):
1254
1268
            if hasattr(self, "dbus_object_path"):
1255
1269
                if (not hasattr(self, attrname) or
1285
1299
    approval_delay = notifychangeproperty(dbus.UInt64,
1286
1300
                                          "ApprovalDelay",
1287
1301
                                          type_func =
1288
 
                                          lambda td: td.total_seconds()
1289
 
                                          * 1000)
 
1302
                                          timedelta_to_milliseconds)
1290
1303
    approval_duration = notifychangeproperty(
1291
1304
        dbus.UInt64, "ApprovalDuration",
1292
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1305
        type_func = timedelta_to_milliseconds)
1293
1306
    host = notifychangeproperty(dbus.String, "Host")
1294
1307
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
 
                                   type_func = lambda td:
1296
 
                                       td.total_seconds() * 1000)
 
1308
                                   type_func =
 
1309
                                   timedelta_to_milliseconds)
1297
1310
    extended_timeout = notifychangeproperty(
1298
1311
        dbus.UInt64, "ExtendedTimeout",
1299
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1312
        type_func = timedelta_to_milliseconds)
1300
1313
    interval = notifychangeproperty(dbus.UInt64,
1301
1314
                                    "Interval",
1302
1315
                                    type_func =
1303
 
                                    lambda td: td.total_seconds()
1304
 
                                    * 1000)
 
1316
                                    timedelta_to_milliseconds)
1305
1317
    checker_command = notifychangeproperty(dbus.String, "Checker")
1306
1318
    
1307
1319
    del notifychangeproperty
1335
1347
                                       *args, **kwargs)
1336
1348
    
1337
1349
    def start_checker(self, *args, **kwargs):
1338
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1350
        old_checker = self.checker
 
1351
        if self.checker is not None:
 
1352
            old_checker_pid = self.checker.pid
 
1353
        else:
 
1354
            old_checker_pid = None
1339
1355
        r = Client.start_checker(self, *args, **kwargs)
1340
1356
        # Only if new checker process was started
1341
1357
        if (self.checker is not None
1350
1366
    
1351
1367
    def approve(self, value=True):
1352
1368
        self.approved = value
1353
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1354
 
                                * 1000), self._reset_approved)
 
1369
        gobject.timeout_add(timedelta_to_milliseconds
 
1370
                            (self.approval_duration),
 
1371
                            self._reset_approved)
1355
1372
        self.send_changedstate()
1356
1373
    
1357
1374
    ## D-Bus methods, signals & properties
1460
1477
                           access="readwrite")
1461
1478
    def ApprovalDelay_dbus_property(self, value=None):
1462
1479
        if value is None:       # get
1463
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1464
 
                               * 1000)
 
1480
            return dbus.UInt64(self.approval_delay_milliseconds())
1465
1481
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1466
1482
    
1467
1483
    # ApprovalDuration - property
1469
1485
                           access="readwrite")
1470
1486
    def ApprovalDuration_dbus_property(self, value=None):
1471
1487
        if value is None:       # get
1472
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1473
 
                               * 1000)
 
1488
            return dbus.UInt64(timedelta_to_milliseconds(
 
1489
                    self.approval_duration))
1474
1490
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1475
1491
    
1476
1492
    # Name - property
1542
1558
                           access="readwrite")
1543
1559
    def Timeout_dbus_property(self, value=None):
1544
1560
        if value is None:       # get
1545
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1561
            return dbus.UInt64(self.timeout_milliseconds())
1546
1562
        old_timeout = self.timeout
1547
1563
        self.timeout = datetime.timedelta(0, 0, 0, value)
1548
1564
        # Reschedule disabling
1559
1575
                gobject.source_remove(self.disable_initiator_tag)
1560
1576
                self.disable_initiator_tag = (
1561
1577
                    gobject.timeout_add(
1562
 
                        int((self.expires - now).total_seconds()
1563
 
                            * 1000), self.disable))
 
1578
                        timedelta_to_milliseconds(self.expires - now),
 
1579
                        self.disable))
1564
1580
    
1565
1581
    # ExtendedTimeout - property
1566
1582
    @dbus_service_property(_interface, signature="t",
1567
1583
                           access="readwrite")
1568
1584
    def ExtendedTimeout_dbus_property(self, value=None):
1569
1585
        if value is None:       # get
1570
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1571
 
                               * 1000)
 
1586
            return dbus.UInt64(self.extended_timeout_milliseconds())
1572
1587
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1573
1588
    
1574
1589
    # Interval - property
1576
1591
                           access="readwrite")
1577
1592
    def Interval_dbus_property(self, value=None):
1578
1593
        if value is None:       # get
1579
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1594
            return dbus.UInt64(self.interval_milliseconds())
1580
1595
        self.interval = datetime.timedelta(0, 0, 0, value)
1581
1596
        if getattr(self, "checker_initiator_tag", None) is None:
1582
1597
            return
1687
1702
            logger.debug("Protocol version: %r", line)
1688
1703
            try:
1689
1704
                if int(line.strip().split()[0]) > 1:
1690
 
                    raise RuntimeError(line)
 
1705
                    raise RuntimeError
1691
1706
            except (ValueError, IndexError, RuntimeError) as error:
1692
1707
                logger.error("Unknown protocol version: %s", error)
1693
1708
                return
1742
1757
                        if self.server.use_dbus:
1743
1758
                            # Emit D-Bus signal
1744
1759
                            client.NeedApproval(
1745
 
                                client.approval_delay.total_seconds()
1746
 
                                * 1000, client.approved_by_default)
 
1760
                                client.approval_delay_milliseconds(),
 
1761
                                client.approved_by_default)
1747
1762
                    else:
1748
1763
                        logger.warning("Client %s was not approved",
1749
1764
                                       client.name)
1755
1770
                    #wait until timeout or approved
1756
1771
                    time = datetime.datetime.now()
1757
1772
                    client.changedstate.acquire()
1758
 
                    client.changedstate.wait(delay.total_seconds())
 
1773
                    client.changedstate.wait(
 
1774
                        float(timedelta_to_milliseconds(delay)
 
1775
                              / 1000))
1759
1776
                    client.changedstate.release()
1760
1777
                    time2 = datetime.datetime.now()
1761
1778
                    if (time2 - time) >= delay:
1898
1915
    
1899
1916
    def add_pipe(self, parent_pipe, proc):
1900
1917
        """Dummy function; override as necessary"""
1901
 
        raise NotImplementedError()
 
1918
        raise NotImplementedError
1902
1919
 
1903
1920
 
1904
1921
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2169
2186
    token_duration = Token(re.compile(r"P"), None,
2170
2187
                           frozenset((token_year, token_month,
2171
2188
                                      token_day, token_time,
2172
 
                                      token_week)))
 
2189
                                      token_week))),
2173
2190
    # Define starting values
2174
2191
    value = datetime.timedelta() # Value so far
2175
2192
    found_token = None
2176
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2193
    followers = frozenset(token_duration,) # Following valid tokens
2177
2194
    s = duration                # String left to parse
2178
2195
    # Loop until end token is found
2179
2196
    while found_token is not token_end:
2239
2256
            elif suffix == "w":
2240
2257
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2241
2258
            else:
2242
 
                raise ValueError("Unknown suffix {!r}"
 
2259
                raise ValueError("Unknown suffix {0!r}"
2243
2260
                                 .format(suffix))
2244
 
        except IndexError as e:
 
2261
        except (ValueError, IndexError) as e:
2245
2262
            raise ValueError(*(e.args))
2246
2263
        timevalue += delta
2247
2264
    return timevalue
2262
2279
        # Close all standard open file descriptors
2263
2280
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2264
2281
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2265
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2282
            raise OSError(errno.ENODEV,
 
2283
                          "{0} not a character device"
2266
2284
                          .format(os.devnull))
2267
2285
        os.dup2(null, sys.stdin.fileno())
2268
2286
        os.dup2(null, sys.stdout.fileno())
2278
2296
    
2279
2297
    parser = argparse.ArgumentParser()
2280
2298
    parser.add_argument("-v", "--version", action="version",
2281
 
                        version = "%(prog)s {}".format(version),
 
2299
                        version = "%(prog)s {0}".format(version),
2282
2300
                        help="show version number and exit")
2283
2301
    parser.add_argument("-i", "--interface", metavar="IF",
2284
2302
                        help="Bind to interface IF")
2317
2335
                        help="Directory to save/restore state in")
2318
2336
    parser.add_argument("--foreground", action="store_true",
2319
2337
                        help="Run in foreground", default=None)
2320
 
    parser.add_argument("--no-zeroconf", action="store_false",
2321
 
                        dest="zeroconf", help="Do not use Zeroconf",
2322
 
                        default=None)
2323
2338
    
2324
2339
    options = parser.parse_args()
2325
2340
    
2326
2341
    if options.check:
2327
2342
        import doctest
2328
 
        fail_count, test_count = doctest.testmod()
2329
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2343
        doctest.testmod()
 
2344
        sys.exit()
2330
2345
    
2331
2346
    # Default values for config file for server-global settings
2332
2347
    server_defaults = { "interface": "",
2343
2358
                        "socket": "",
2344
2359
                        "statedir": "/var/lib/mandos",
2345
2360
                        "foreground": "False",
2346
 
                        "zeroconf": "True",
2347
2361
                        }
2348
2362
    
2349
2363
    # Parse config file for server-global settings
2376
2390
    for option in ("interface", "address", "port", "debug",
2377
2391
                   "priority", "servicename", "configdir",
2378
2392
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2379
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2393
                   "statedir", "socket", "foreground"):
2380
2394
        value = getattr(options, option)
2381
2395
        if value is not None:
2382
2396
            server_settings[option] = value
2387
2401
            server_settings[option] = unicode(server_settings[option])
2388
2402
    # Force all boolean options to be boolean
2389
2403
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
 
                   "foreground", "zeroconf"):
 
2404
                   "foreground"):
2391
2405
        server_settings[option] = bool(server_settings[option])
2392
2406
    # Debug implies foreground
2393
2407
    if server_settings["debug"]:
2396
2410
    
2397
2411
    ##################################################################
2398
2412
    
2399
 
    if (not server_settings["zeroconf"] and
2400
 
        not (server_settings["port"]
2401
 
             or server_settings["socket"] != "")):
2402
 
            parser.error("Needs port or socket to work without"
2403
 
                         " Zeroconf")
2404
 
    
2405
2413
    # For convenience
2406
2414
    debug = server_settings["debug"]
2407
2415
    debuglevel = server_settings["debuglevel"]
2410
2418
    stored_state_path = os.path.join(server_settings["statedir"],
2411
2419
                                     stored_state_file)
2412
2420
    foreground = server_settings["foreground"]
2413
 
    zeroconf = server_settings["zeroconf"]
2414
2421
    
2415
2422
    if debug:
2416
2423
        initlogger(debug, logging.DEBUG)
2423
2430
    
2424
2431
    if server_settings["servicename"] != "Mandos":
2425
2432
        syslogger.setFormatter(logging.Formatter
2426
 
                               ('Mandos ({}) [%(process)d]:'
 
2433
                               ('Mandos ({0}) [%(process)d]:'
2427
2434
                                ' %(levelname)s: %(message)s'
2428
2435
                                .format(server_settings
2429
2436
                                        ["servicename"])))
2437
2444
    global mandos_dbus_service
2438
2445
    mandos_dbus_service = None
2439
2446
    
2440
 
    socketfd = None
2441
 
    if server_settings["socket"] != "":
2442
 
        socketfd = server_settings["socket"]
2443
2447
    tcp_server = MandosServer((server_settings["address"],
2444
2448
                               server_settings["port"]),
2445
2449
                              ClientHandler,
2449
2453
                              gnutls_priority=
2450
2454
                              server_settings["priority"],
2451
2455
                              use_dbus=use_dbus,
2452
 
                              socketfd=socketfd)
 
2456
                              socketfd=(server_settings["socket"]
 
2457
                                        or None))
2453
2458
    if not foreground:
2454
2459
        pidfilename = "/run/mandos.pid"
2455
2460
        if not os.path.isdir("/run/."):
2476
2481
        os.setuid(uid)
2477
2482
    except OSError as error:
2478
2483
        if error.errno != errno.EPERM:
2479
 
            raise
 
2484
            raise error
2480
2485
    
2481
2486
    if debug:
2482
2487
        # Enable all possible GnuTLS debugging
2525
2530
            use_dbus = False
2526
2531
            server_settings["use_dbus"] = False
2527
2532
            tcp_server.use_dbus = False
2528
 
    if zeroconf:
2529
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
 
        service = AvahiServiceToSyslog(name =
2531
 
                                       server_settings["servicename"],
2532
 
                                       servicetype = "_mandos._tcp",
2533
 
                                       protocol = protocol, bus = bus)
2534
 
        if server_settings["interface"]:
2535
 
            service.interface = (if_nametoindex
2536
 
                                 (str(server_settings["interface"])))
 
2533
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2534
    service = AvahiServiceToSyslog(name =
 
2535
                                   server_settings["servicename"],
 
2536
                                   servicetype = "_mandos._tcp",
 
2537
                                   protocol = protocol, bus = bus)
 
2538
    if server_settings["interface"]:
 
2539
        service.interface = (if_nametoindex
 
2540
                             (str(server_settings["interface"])))
2537
2541
    
2538
2542
    global multiprocessing_manager
2539
2543
    multiprocessing_manager = multiprocessing.Manager()
2563
2567
            os.remove(stored_state_path)
2564
2568
        except IOError as e:
2565
2569
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
 
2570
                logger.warning("Could not load persistent state: {0}"
2567
2571
                                .format(os.strerror(e.errno)))
2568
2572
            else:
2569
2573
                logger.critical("Could not load persistent state:",
2574
2578
                           "EOFError:", exc_info=e)
2575
2579
    
2576
2580
    with PGPEngine() as pgp:
2577
 
        for client_name, client in clients_data.items():
 
2581
        for client_name, client in clients_data.iteritems():
2578
2582
            # Skip removed clients
2579
2583
            if client_name not in client_settings:
2580
2584
                continue
2605
2609
                if datetime.datetime.utcnow() >= client["expires"]:
2606
2610
                    if not client["last_checked_ok"]:
2607
2611
                        logger.warning(
2608
 
                            "disabling client {} - Client never "
 
2612
                            "disabling client {0} - Client never "
2609
2613
                            "performed a successful checker"
2610
2614
                            .format(client_name))
2611
2615
                        client["enabled"] = False
2612
2616
                    elif client["last_checker_status"] != 0:
2613
2617
                        logger.warning(
2614
 
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
 
2618
                            "disabling client {0} - Client "
 
2619
                            "last checker failed with error code {1}"
2616
2620
                            .format(client_name,
2617
2621
                                    client["last_checker_status"]))
2618
2622
                        client["enabled"] = False
2621
2625
                                             .utcnow()
2622
2626
                                             + client["timeout"])
2623
2627
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
 
2628
                                     " keeping {0} enabled"
2625
2629
                                     .format(client_name))
2626
2630
            try:
2627
2631
                client["secret"] = (
2630
2634
                                ["secret"]))
2631
2635
            except PGPError:
2632
2636
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
 
2637
                logger.debug("Failed to decrypt {0} old secret"
2634
2638
                             .format(client_name))
2635
2639
                client["secret"] = (
2636
2640
                    client_settings[client_name]["secret"])
2644
2648
        clients_data[client_name] = client_settings[client_name]
2645
2649
    
2646
2650
    # Create all client objects
2647
 
    for client_name, client in clients_data.items():
 
2651
    for client_name, client in clients_data.iteritems():
2648
2652
        tcp_server.clients[client_name] = client_class(
2649
2653
            name = client_name, settings = client,
2650
2654
            server_settings = server_settings)
2733
2737
    
2734
2738
    def cleanup():
2735
2739
        "Cleanup function; run on exit"
2736
 
        if zeroconf:
2737
 
            service.cleanup()
 
2740
        service.cleanup()
2738
2741
        
2739
2742
        multiprocessing.active_children()
2740
2743
        wnull.close()
2754
2757
                
2755
2758
                # A list of attributes that can not be pickled
2756
2759
                # + secret.
2757
 
                exclude = { "bus", "changedstate", "secret",
2758
 
                            "checker", "server_settings" }
 
2760
                exclude = set(("bus", "changedstate", "secret",
 
2761
                               "checker", "server_settings"))
2759
2762
                for name, typ in (inspect.getmembers
2760
2763
                                  (dbus.service.Object)):
2761
2764
                    exclude.add(name)
2784
2787
                except NameError:
2785
2788
                    pass
2786
2789
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
 
                logger.warning("Could not save persistent state: {}"
 
2790
                logger.warning("Could not save persistent state: {0}"
2788
2791
                               .format(os.strerror(e.errno)))
2789
2792
            else:
2790
2793
                logger.warning("Could not save persistent state:",
2791
2794
                               exc_info=e)
2792
 
                raise
 
2795
                raise e
2793
2796
        
2794
2797
        # Delete all clients, and settings from config
2795
2798
        while tcp_server.clients:
2819
2822
    tcp_server.server_activate()
2820
2823
    
2821
2824
    # Find out what port we got
2822
 
    if zeroconf:
2823
 
        service.port = tcp_server.socket.getsockname()[1]
 
2825
    service.port = tcp_server.socket.getsockname()[1]
2824
2826
    if use_ipv6:
2825
2827
        logger.info("Now listening on address %r, port %d,"
2826
2828
                    " flowinfo %d, scope_id %d",
2832
2834
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2835
    
2834
2836
    try:
2835
 
        if zeroconf:
2836
 
            # From the Avahi example code
2837
 
            try:
2838
 
                service.activate()
2839
 
            except dbus.exceptions.DBusException as error:
2840
 
                logger.critical("D-Bus Exception", exc_info=error)
2841
 
                cleanup()
2842
 
                sys.exit(1)
2843
 
            # End of Avahi example code
 
2837
        # From the Avahi example code
 
2838
        try:
 
2839
            service.activate()
 
2840
        except dbus.exceptions.DBusException as error:
 
2841
            logger.critical("D-Bus Exception", exc_info=error)
 
2842
            cleanup()
 
2843
            sys.exit(1)
 
2844
        # End of Avahi example code
2844
2845
        
2845
2846
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2847
                             lambda *args, **kwargs: