/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: 2013-10-13 01:49:18 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20131013014918-08ybiy64qxy4ceza
http://bugs.debian.org/721903
* initramfs-tools-hook: Bug fix: Make sure the right version of GnuPG
                        is copied into the initramfs image.  Always
                        assume that GPGME is used to avoid searching
                        for it since the path might not be /usr/lib.
                        Thanks to Félix Sipma <felix+debian@gueux.org>
                        for the initial bug report, and also thanks to
                        Dick Middleton <dick@lingbrae.com> for some
                        more debugging.
* initramfs-unpack: New script to help with development and debugging.
                    It is only part of the source tree, it is not
                    installed.

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-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
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.8"
 
91
version = "1.6.0"
95
92
stored_state_file = "clients.pickle"
96
93
 
97
94
logger = logging.getLogger()
98
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
99
98
 
100
99
try:
101
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
107
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
107
        with contextlib.closing(socket.socket()) as s:
109
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
112
113
        return interface_index
113
114
 
114
115
 
115
116
def initlogger(debug, level=logging.WARNING):
116
117
    """init logger and add loglevel"""
117
118
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
119
    syslogger.setFormatter(logging.Formatter
124
120
                           ('Mandos [%(process)d]: %(levelname)s:'
125
121
                            ' %(message)s'))
176
172
    def password_encode(self, password):
177
173
        # Passphrase can not be empty and can not contain newlines or
178
174
        # NUL bytes.  So we prefix it and hex encode it.
179
 
        encoded = b"mandos" + binascii.hexlify(password)
180
 
        if len(encoded) > 2048:
181
 
            # GnuPG can't handle long passwords, so encode differently
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
 
                       .replace(b"\n", b"\\n")
184
 
                       .replace(b"\0", b"\\x00"))
185
 
        return encoded
 
175
        return b"mandos" + binascii.hexlify(password)
186
176
    
187
177
    def encrypt(self, data, password):
188
178
        passphrase = self.password_encode(password)
225
215
class AvahiError(Exception):
226
216
    def __init__(self, value, *args, **kwargs):
227
217
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
230
221
 
231
222
class AvahiServiceError(AvahiError):
232
223
    pass
282
273
                            " after %i retries, exiting.",
283
274
                            self.rename_count)
284
275
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
287
278
        logger.info("Changing Zeroconf service name to %r ...",
288
279
                    self.name)
289
280
        self.remove()
337
328
            self.rename()
338
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
330
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
342
333
                                  .format(error))
343
334
    
344
335
    def cleanup(self):
395
386
        """Add the new name to the syslog messages"""
396
387
        ret = AvahiService.rename(self)
397
388
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
389
                               ('Mandos ({0}) [%(process)d]:'
399
390
                                ' %(levelname)s: %(message)s'
400
391
                                .format(self.name)))
401
392
        return ret
402
393
 
403
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
 
401
 
404
402
class Client(object):
405
403
    """A representation of a client host served by this server.
406
404
    
461
459
                        "enabled": "True",
462
460
                        }
463
461
    
 
462
    def timeout_milliseconds(self):
 
463
        "Return the 'timeout' attribute in milliseconds"
 
464
        return timedelta_to_milliseconds(self.timeout)
 
465
    
 
466
    def extended_timeout_milliseconds(self):
 
467
        "Return the 'extended_timeout' attribute in milliseconds"
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
 
469
    
 
470
    def interval_milliseconds(self):
 
471
        "Return the 'interval' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.interval)
 
473
    
 
474
    def approval_delay_milliseconds(self):
 
475
        return timedelta_to_milliseconds(self.approval_delay)
 
476
    
464
477
    @staticmethod
465
478
    def config_parser(config):
466
479
        """Construct a new dict of client settings of this form:
491
504
                          "rb") as secfile:
492
505
                    client["secret"] = secfile.read()
493
506
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
507
                raise TypeError("No secret or secfile for section {0}"
495
508
                                .format(section))
496
509
            client["timeout"] = string_to_delta(section["timeout"])
497
510
            client["extended_timeout"] = string_to_delta(
514
527
            server_settings = {}
515
528
        self.server_settings = server_settings
516
529
        # adding all client settings
517
 
        for setting, value in settings.items():
 
530
        for setting, value in settings.iteritems():
518
531
            setattr(self, setting, value)
519
532
        
520
533
        if self.enabled:
603
616
        if self.checker_initiator_tag is not None:
604
617
            gobject.source_remove(self.checker_initiator_tag)
605
618
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
619
                                      (self.interval_milliseconds(),
608
620
                                       self.start_checker))
609
621
        # Schedule a disable() when 'timeout' has passed
610
622
        if self.disable_initiator_tag is not None:
611
623
            gobject.source_remove(self.disable_initiator_tag)
612
624
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
625
                                   (self.timeout_milliseconds(),
 
626
                                    self.disable))
616
627
        # Also start a new checker *right now*.
617
628
        self.start_checker()
618
629
    
649
660
            self.disable_initiator_tag = None
650
661
        if getattr(self, "enabled", False):
651
662
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
663
                                          (timedelta_to_milliseconds
 
664
                                           (timeout), self.disable))
654
665
            self.expires = datetime.datetime.utcnow() + timeout
655
666
    
656
667
    def need_approval(self):
673
684
        # If a checker exists, make sure it is not a zombie
674
685
        try:
675
686
            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
 
687
        except (AttributeError, OSError) as error:
 
688
            if (isinstance(error, OSError)
 
689
                and error.errno != errno.ECHILD):
 
690
                raise error
681
691
        else:
682
692
            if pid:
683
693
                logger.warning("Checker was a zombie")
687
697
        # Start a new checker if needed
688
698
        if self.checker is None:
689
699
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              for attr in self.runtime_expansions }
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
693
704
            try:
694
705
                command = self.checker_command % escaped_attrs
695
706
            except TypeError as error:
776
787
    # "Set" method, so we fail early here:
777
788
    if byte_arrays and signature != "ay":
778
789
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
790
                         " signature {0!r}".format(signature))
780
791
    def decorator(func):
781
792
        func._dbus_is_property = True
782
793
        func._dbus_interface = dbus_interface
830
841
class DBusPropertyException(dbus.exceptions.DBusException):
831
842
    """A base class for D-Bus property-related exceptions
832
843
    """
833
 
    pass
 
844
    def __unicode__(self):
 
845
        return unicode(str(self))
 
846
 
834
847
 
835
848
class DBusPropertyAccessException(DBusPropertyException):
836
849
    """A property's access permissions disallows an operation.
859
872
        If called like _is_dbus_thing("method") it returns a function
860
873
        suitable for use as predicate to inspect.getmembers().
861
874
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
876
                                   False)
864
877
    
865
878
    def _get_all_dbus_things(self, thing):
914
927
            # The byte_arrays option is not supported yet on
915
928
            # signatures other than "ay".
916
929
            if prop._dbus_signature != "ay":
917
 
                raise ValueError("Byte arrays not supported for non-"
918
 
                                 "'ay' signature {!r}"
919
 
                                 .format(prop._dbus_signature))
 
930
                raise ValueError
920
931
            value = dbus.ByteArray(b''.join(chr(byte)
921
932
                                            for byte in value))
922
933
        prop(value)
986
997
                                              (prop,
987
998
                                               "_dbus_annotations",
988
999
                                               {}))
989
 
                        for name, value in annots.items():
 
1000
                        for name, value in annots.iteritems():
990
1001
                            ann_tag = document.createElement(
991
1002
                                "annotation")
992
1003
                            ann_tag.setAttribute("name", name)
995
1006
                # Add interface annotation tags
996
1007
                for annotation, value in dict(
997
1008
                    itertools.chain.from_iterable(
998
 
                        annotations().items()
 
1009
                        annotations().iteritems()
999
1010
                        for name, annotations in
1000
1011
                        self._get_all_dbus_things("interface")
1001
1012
                        if name == if_tag.getAttribute("name")
1002
 
                        )).items():
 
1013
                        )).iteritems():
1003
1014
                    ann_tag = document.createElement("annotation")
1004
1015
                    ann_tag.setAttribute("name", annotation)
1005
1016
                    ann_tag.setAttribute("value", value)
1061
1072
    """
1062
1073
    def wrapper(cls):
1063
1074
        for orig_interface_name, alt_interface_name in (
1064
 
            alt_interface_names.items()):
 
1075
            alt_interface_names.iteritems()):
1065
1076
            attr = {}
1066
1077
            interface_names = set()
1067
1078
            # Go though all attributes of the class
1184
1195
                                        attribute.func_closure)))
1185
1196
            if deprecate:
1186
1197
                # Deprecate all alternate interfaces
1187
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
1188
1199
                for interface_name in interface_names:
1189
1200
                    @dbus_interface_annotations(interface_name)
1190
1201
                    def func(self):
1199
1210
            if interface_names:
1200
1211
                # Replace the class with a new subclass of it with
1201
1212
                # methods, signals, etc. as created above.
1202
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
1203
1214
                           (cls,), attr)
1204
1215
        return cls
1205
1216
    return wrapper
1225
1236
        Client.__init__(self, *args, **kwargs)
1226
1237
        # Only now, when this client is initialized, can it show up on
1227
1238
        # the D-Bus
1228
 
        client_object_name = str(self.name).translate(
 
1239
        client_object_name = unicode(self.name).translate(
1229
1240
            {ord("."): ord("_"),
1230
1241
             ord("-"): ord("_")})
1231
1242
        self.dbus_object_path = (dbus.ObjectPath
1246
1257
                   to the D-Bus.  Default: no transform
1247
1258
        variant_level: D-Bus variant level.  Default: 1
1248
1259
        """
1249
 
        attrname = "_{}".format(dbus_name)
 
1260
        attrname = "_{0}".format(dbus_name)
1250
1261
        def setter(self, value):
1251
1262
            if hasattr(self, "dbus_object_path"):
1252
1263
                if (not hasattr(self, attrname) or
1282
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
1283
1294
                                          "ApprovalDelay",
1284
1295
                                          type_func =
1285
 
                                          lambda td: td.total_seconds()
1286
 
                                          * 1000)
 
1296
                                          timedelta_to_milliseconds)
1287
1297
    approval_duration = notifychangeproperty(
1288
1298
        dbus.UInt64, "ApprovalDuration",
1289
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1299
        type_func = timedelta_to_milliseconds)
1290
1300
    host = notifychangeproperty(dbus.String, "Host")
1291
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1292
 
                                   type_func = lambda td:
1293
 
                                       td.total_seconds() * 1000)
 
1302
                                   type_func =
 
1303
                                   timedelta_to_milliseconds)
1294
1304
    extended_timeout = notifychangeproperty(
1295
1305
        dbus.UInt64, "ExtendedTimeout",
1296
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1306
        type_func = timedelta_to_milliseconds)
1297
1307
    interval = notifychangeproperty(dbus.UInt64,
1298
1308
                                    "Interval",
1299
1309
                                    type_func =
1300
 
                                    lambda td: td.total_seconds()
1301
 
                                    * 1000)
 
1310
                                    timedelta_to_milliseconds)
1302
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
1303
1312
    
1304
1313
    del notifychangeproperty
1332
1341
                                       *args, **kwargs)
1333
1342
    
1334
1343
    def start_checker(self, *args, **kwargs):
1335
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1344
        old_checker = self.checker
 
1345
        if self.checker is not None:
 
1346
            old_checker_pid = self.checker.pid
 
1347
        else:
 
1348
            old_checker_pid = None
1336
1349
        r = Client.start_checker(self, *args, **kwargs)
1337
1350
        # Only if new checker process was started
1338
1351
        if (self.checker is not None
1347
1360
    
1348
1361
    def approve(self, value=True):
1349
1362
        self.approved = value
1350
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1351
 
                                * 1000), self._reset_approved)
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
 
1364
                            (self.approval_duration),
 
1365
                            self._reset_approved)
1352
1366
        self.send_changedstate()
1353
1367
    
1354
1368
    ## D-Bus methods, signals & properties
1457
1471
                           access="readwrite")
1458
1472
    def ApprovalDelay_dbus_property(self, value=None):
1459
1473
        if value is None:       # get
1460
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1461
 
                               * 1000)
 
1474
            return dbus.UInt64(self.approval_delay_milliseconds())
1462
1475
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1463
1476
    
1464
1477
    # ApprovalDuration - property
1466
1479
                           access="readwrite")
1467
1480
    def ApprovalDuration_dbus_property(self, value=None):
1468
1481
        if value is None:       # get
1469
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1470
 
                               * 1000)
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
 
1483
                    self.approval_duration))
1471
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1472
1485
    
1473
1486
    # Name - property
1486
1499
    def Host_dbus_property(self, value=None):
1487
1500
        if value is None:       # get
1488
1501
            return dbus.String(self.host)
1489
 
        self.host = str(value)
 
1502
        self.host = unicode(value)
1490
1503
    
1491
1504
    # Created - property
1492
1505
    @dbus_service_property(_interface, signature="s", access="read")
1539
1552
                           access="readwrite")
1540
1553
    def Timeout_dbus_property(self, value=None):
1541
1554
        if value is None:       # get
1542
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1555
            return dbus.UInt64(self.timeout_milliseconds())
1543
1556
        old_timeout = self.timeout
1544
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
1558
        # Reschedule disabling
1556
1569
                gobject.source_remove(self.disable_initiator_tag)
1557
1570
                self.disable_initiator_tag = (
1558
1571
                    gobject.timeout_add(
1559
 
                        int((self.expires - now).total_seconds()
1560
 
                            * 1000), self.disable))
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1561
1574
    
1562
1575
    # ExtendedTimeout - property
1563
1576
    @dbus_service_property(_interface, signature="t",
1564
1577
                           access="readwrite")
1565
1578
    def ExtendedTimeout_dbus_property(self, value=None):
1566
1579
        if value is None:       # get
1567
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1568
 
                               * 1000)
 
1580
            return dbus.UInt64(self.extended_timeout_milliseconds())
1569
1581
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1570
1582
    
1571
1583
    # Interval - property
1573
1585
                           access="readwrite")
1574
1586
    def Interval_dbus_property(self, value=None):
1575
1587
        if value is None:       # get
1576
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1588
            return dbus.UInt64(self.interval_milliseconds())
1577
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
1578
1590
        if getattr(self, "checker_initiator_tag", None) is None:
1579
1591
            return
1590
1602
    def Checker_dbus_property(self, value=None):
1591
1603
        if value is None:       # get
1592
1604
            return dbus.String(self.checker_command)
1593
 
        self.checker_command = str(value)
 
1605
        self.checker_command = unicode(value)
1594
1606
    
1595
1607
    # CheckerRunning - property
1596
1608
    @dbus_service_property(_interface, signature="b",
1612
1624
    @dbus_service_property(_interface, signature="ay",
1613
1625
                           access="write", byte_arrays=True)
1614
1626
    def Secret_dbus_property(self, value):
1615
 
        self.secret = bytes(value)
 
1627
        self.secret = str(value)
1616
1628
    
1617
1629
    del _interface
1618
1630
 
1652
1664
    def handle(self):
1653
1665
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1654
1666
            logger.info("TCP connection from: %s",
1655
 
                        str(self.client_address))
 
1667
                        unicode(self.client_address))
1656
1668
            logger.debug("Pipe FD: %d",
1657
1669
                         self.server.child_pipe.fileno())
1658
1670
            
1684
1696
            logger.debug("Protocol version: %r", line)
1685
1697
            try:
1686
1698
                if int(line.strip().split()[0]) > 1:
1687
 
                    raise RuntimeError(line)
 
1699
                    raise RuntimeError
1688
1700
            except (ValueError, IndexError, RuntimeError) as error:
1689
1701
                logger.error("Unknown protocol version: %s", error)
1690
1702
                return
1739
1751
                        if self.server.use_dbus:
1740
1752
                            # Emit D-Bus signal
1741
1753
                            client.NeedApproval(
1742
 
                                client.approval_delay.total_seconds()
1743
 
                                * 1000, client.approved_by_default)
 
1754
                                client.approval_delay_milliseconds(),
 
1755
                                client.approved_by_default)
1744
1756
                    else:
1745
1757
                        logger.warning("Client %s was not approved",
1746
1758
                                       client.name)
1752
1764
                    #wait until timeout or approved
1753
1765
                    time = datetime.datetime.now()
1754
1766
                    client.changedstate.acquire()
1755
 
                    client.changedstate.wait(delay.total_seconds())
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1756
1770
                    client.changedstate.release()
1757
1771
                    time2 = datetime.datetime.now()
1758
1772
                    if (time2 - time) >= delay:
1895
1909
    
1896
1910
    def add_pipe(self, parent_pipe, proc):
1897
1911
        """Dummy function; override as necessary"""
1898
 
        raise NotImplementedError()
 
1912
        raise NotImplementedError
1899
1913
 
1900
1914
 
1901
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1957
1971
                try:
1958
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1959
1973
                                           SO_BINDTODEVICE,
1960
 
                                           (self.interface + "\0")
1961
 
                                           .encode("utf-8"))
 
1974
                                           str(self.interface + '\0'))
1962
1975
                except socket.error as error:
1963
1976
                    if error.errno == errno.EPERM:
1964
1977
                        logger.error("No permission to bind to"
2167
2180
    token_duration = Token(re.compile(r"P"), None,
2168
2181
                           frozenset((token_year, token_month,
2169
2182
                                      token_day, token_time,
2170
 
                                      token_week)))
 
2183
                                      token_week))),
2171
2184
    # Define starting values
2172
2185
    value = datetime.timedelta() # Value so far
2173
2186
    found_token = None
2174
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
2175
2188
    s = duration                # String left to parse
2176
2189
    # Loop until end token is found
2177
2190
    while found_token is not token_end:
2224
2237
    timevalue = datetime.timedelta(0)
2225
2238
    for s in interval.split():
2226
2239
        try:
2227
 
            suffix = s[-1]
 
2240
            suffix = unicode(s[-1])
2228
2241
            value = int(s[:-1])
2229
2242
            if suffix == "d":
2230
2243
                delta = datetime.timedelta(value)
2237
2250
            elif suffix == "w":
2238
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
2252
            else:
2240
 
                raise ValueError("Unknown suffix {!r}"
 
2253
                raise ValueError("Unknown suffix {0!r}"
2241
2254
                                 .format(suffix))
2242
 
        except IndexError as e:
 
2255
        except (ValueError, IndexError) as e:
2243
2256
            raise ValueError(*(e.args))
2244
2257
        timevalue += delta
2245
2258
    return timevalue
2260
2273
        # Close all standard open file descriptors
2261
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2262
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2276
            raise OSError(errno.ENODEV,
 
2277
                          "{0} not a character device"
2264
2278
                          .format(os.devnull))
2265
2279
        os.dup2(null, sys.stdin.fileno())
2266
2280
        os.dup2(null, sys.stdout.fileno())
2276
2290
    
2277
2291
    parser = argparse.ArgumentParser()
2278
2292
    parser.add_argument("-v", "--version", action="version",
2279
 
                        version = "%(prog)s {}".format(version),
 
2293
                        version = "%(prog)s {0}".format(version),
2280
2294
                        help="show version number and exit")
2281
2295
    parser.add_argument("-i", "--interface", metavar="IF",
2282
2296
                        help="Bind to interface IF")
2315
2329
                        help="Directory to save/restore state in")
2316
2330
    parser.add_argument("--foreground", action="store_true",
2317
2331
                        help="Run in foreground", default=None)
2318
 
    parser.add_argument("--no-zeroconf", action="store_false",
2319
 
                        dest="zeroconf", help="Do not use Zeroconf",
2320
 
                        default=None)
2321
2332
    
2322
2333
    options = parser.parse_args()
2323
2334
    
2324
2335
    if options.check:
2325
2336
        import doctest
2326
 
        fail_count, test_count = doctest.testmod()
2327
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2337
        doctest.testmod()
 
2338
        sys.exit()
2328
2339
    
2329
2340
    # Default values for config file for server-global settings
2330
2341
    server_defaults = { "interface": "",
2332
2343
                        "port": "",
2333
2344
                        "debug": "False",
2334
2345
                        "priority":
2335
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2336
2347
                        "servicename": "Mandos",
2337
2348
                        "use_dbus": "True",
2338
2349
                        "use_ipv6": "True",
2341
2352
                        "socket": "",
2342
2353
                        "statedir": "/var/lib/mandos",
2343
2354
                        "foreground": "False",
2344
 
                        "zeroconf": "True",
2345
2355
                        }
2346
2356
    
2347
2357
    # Parse config file for server-global settings
2374
2384
    for option in ("interface", "address", "port", "debug",
2375
2385
                   "priority", "servicename", "configdir",
2376
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2377
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2387
                   "statedir", "socket", "foreground"):
2378
2388
        value = getattr(options, option)
2379
2389
        if value is not None:
2380
2390
            server_settings[option] = value
2381
2391
    del options
2382
2392
    # Force all strings to be unicode
2383
2393
    for option in server_settings.keys():
2384
 
        if isinstance(server_settings[option], bytes):
2385
 
            server_settings[option] = (server_settings[option]
2386
 
                                       .decode("utf-8"))
 
2394
        if type(server_settings[option]) is str:
 
2395
            server_settings[option] = unicode(server_settings[option])
2387
2396
    # Force all boolean options to be boolean
2388
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2389
 
                   "foreground", "zeroconf"):
 
2398
                   "foreground"):
2390
2399
        server_settings[option] = bool(server_settings[option])
2391
2400
    # Debug implies foreground
2392
2401
    if server_settings["debug"]:
2395
2404
    
2396
2405
    ##################################################################
2397
2406
    
2398
 
    if (not server_settings["zeroconf"] and
2399
 
        not (server_settings["port"]
2400
 
             or server_settings["socket"] != "")):
2401
 
            parser.error("Needs port or socket to work without"
2402
 
                         " Zeroconf")
2403
 
    
2404
2407
    # For convenience
2405
2408
    debug = server_settings["debug"]
2406
2409
    debuglevel = server_settings["debuglevel"]
2409
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2410
2413
                                     stored_state_file)
2411
2414
    foreground = server_settings["foreground"]
2412
 
    zeroconf = server_settings["zeroconf"]
2413
2415
    
2414
2416
    if debug:
2415
2417
        initlogger(debug, logging.DEBUG)
2422
2424
    
2423
2425
    if server_settings["servicename"] != "Mandos":
2424
2426
        syslogger.setFormatter(logging.Formatter
2425
 
                               ('Mandos ({}) [%(process)d]:'
 
2427
                               ('Mandos ({0}) [%(process)d]:'
2426
2428
                                ' %(levelname)s: %(message)s'
2427
2429
                                .format(server_settings
2428
2430
                                        ["servicename"])))
2436
2438
    global mandos_dbus_service
2437
2439
    mandos_dbus_service = None
2438
2440
    
2439
 
    socketfd = None
2440
 
    if server_settings["socket"] != "":
2441
 
        socketfd = server_settings["socket"]
2442
2441
    tcp_server = MandosServer((server_settings["address"],
2443
2442
                               server_settings["port"]),
2444
2443
                              ClientHandler,
2448
2447
                              gnutls_priority=
2449
2448
                              server_settings["priority"],
2450
2449
                              use_dbus=use_dbus,
2451
 
                              socketfd=socketfd)
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
2452
2452
    if not foreground:
2453
 
        pidfilename = "/run/mandos.pid"
2454
 
        if not os.path.isdir("/run/."):
2455
 
            pidfilename = "/var/run/mandos.pid"
 
2453
        pidfilename = "/var/run/mandos.pid"
2456
2454
        pidfile = None
2457
2455
        try:
2458
2456
            pidfile = open(pidfilename, "w")
2475
2473
        os.setuid(uid)
2476
2474
    except OSError as error:
2477
2475
        if error.errno != errno.EPERM:
2478
 
            raise
 
2476
            raise error
2479
2477
    
2480
2478
    if debug:
2481
2479
        # Enable all possible GnuTLS debugging
2524
2522
            use_dbus = False
2525
2523
            server_settings["use_dbus"] = False
2526
2524
            tcp_server.use_dbus = False
2527
 
    if zeroconf:
2528
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2529
 
        service = AvahiServiceToSyslog(name =
2530
 
                                       server_settings["servicename"],
2531
 
                                       servicetype = "_mandos._tcp",
2532
 
                                       protocol = protocol, bus = bus)
2533
 
        if server_settings["interface"]:
2534
 
            service.interface = (if_nametoindex
2535
 
                                 (server_settings["interface"]
2536
 
                                  .encode("utf-8")))
 
2525
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2526
    service = AvahiServiceToSyslog(name =
 
2527
                                   server_settings["servicename"],
 
2528
                                   servicetype = "_mandos._tcp",
 
2529
                                   protocol = protocol, bus = bus)
 
2530
    if server_settings["interface"]:
 
2531
        service.interface = (if_nametoindex
 
2532
                             (str(server_settings["interface"])))
2537
2533
    
2538
2534
    global multiprocessing_manager
2539
2535
    multiprocessing_manager = multiprocessing.Manager()
2563
2559
            os.remove(stored_state_path)
2564
2560
        except IOError as e:
2565
2561
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
 
2562
                logger.warning("Could not load persistent state: {0}"
2567
2563
                                .format(os.strerror(e.errno)))
2568
2564
            else:
2569
2565
                logger.critical("Could not load persistent state:",
2574
2570
                           "EOFError:", exc_info=e)
2575
2571
    
2576
2572
    with PGPEngine() as pgp:
2577
 
        for client_name, client in clients_data.items():
 
2573
        for client_name, client in clients_data.iteritems():
2578
2574
            # Skip removed clients
2579
2575
            if client_name not in client_settings:
2580
2576
                continue
2605
2601
                if datetime.datetime.utcnow() >= client["expires"]:
2606
2602
                    if not client["last_checked_ok"]:
2607
2603
                        logger.warning(
2608
 
                            "disabling client {} - Client never "
 
2604
                            "disabling client {0} - Client never "
2609
2605
                            "performed a successful checker"
2610
2606
                            .format(client_name))
2611
2607
                        client["enabled"] = False
2612
2608
                    elif client["last_checker_status"] != 0:
2613
2609
                        logger.warning(
2614
 
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
 
2610
                            "disabling client {0} - Client "
 
2611
                            "last checker failed with error code {1}"
2616
2612
                            .format(client_name,
2617
2613
                                    client["last_checker_status"]))
2618
2614
                        client["enabled"] = False
2621
2617
                                             .utcnow()
2622
2618
                                             + client["timeout"])
2623
2619
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
 
2620
                                     " keeping {0} enabled"
2625
2621
                                     .format(client_name))
2626
2622
            try:
2627
2623
                client["secret"] = (
2630
2626
                                ["secret"]))
2631
2627
            except PGPError:
2632
2628
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
 
2629
                logger.debug("Failed to decrypt {0} old secret"
2634
2630
                             .format(client_name))
2635
2631
                client["secret"] = (
2636
2632
                    client_settings[client_name]["secret"])
2644
2640
        clients_data[client_name] = client_settings[client_name]
2645
2641
    
2646
2642
    # Create all client objects
2647
 
    for client_name, client in clients_data.items():
 
2643
    for client_name, client in clients_data.iteritems():
2648
2644
        tcp_server.clients[client_name] = client_class(
2649
2645
            name = client_name, settings = client,
2650
2646
            server_settings = server_settings)
2657
2653
            try:
2658
2654
                with pidfile:
2659
2655
                    pid = os.getpid()
2660
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2661
2657
            except IOError:
2662
2658
                logger.error("Could not write to file %r with PID %d",
2663
2659
                             pidfilename, pid)
2733
2729
    
2734
2730
    def cleanup():
2735
2731
        "Cleanup function; run on exit"
2736
 
        if zeroconf:
2737
 
            service.cleanup()
 
2732
        service.cleanup()
2738
2733
        
2739
2734
        multiprocessing.active_children()
2740
2735
        wnull.close()
2754
2749
                
2755
2750
                # A list of attributes that can not be pickled
2756
2751
                # + secret.
2757
 
                exclude = { "bus", "changedstate", "secret",
2758
 
                            "checker", "server_settings" }
 
2752
                exclude = set(("bus", "changedstate", "secret",
 
2753
                               "checker", "server_settings"))
2759
2754
                for name, typ in (inspect.getmembers
2760
2755
                                  (dbus.service.Object)):
2761
2756
                    exclude.add(name)
2784
2779
                except NameError:
2785
2780
                    pass
2786
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
 
                logger.warning("Could not save persistent state: {}"
 
2782
                logger.warning("Could not save persistent state: {0}"
2788
2783
                               .format(os.strerror(e.errno)))
2789
2784
            else:
2790
2785
                logger.warning("Could not save persistent state:",
2791
2786
                               exc_info=e)
2792
 
                raise
 
2787
                raise e
2793
2788
        
2794
2789
        # Delete all clients, and settings from config
2795
2790
        while tcp_server.clients:
2819
2814
    tcp_server.server_activate()
2820
2815
    
2821
2816
    # Find out what port we got
2822
 
    if zeroconf:
2823
 
        service.port = tcp_server.socket.getsockname()[1]
 
2817
    service.port = tcp_server.socket.getsockname()[1]
2824
2818
    if use_ipv6:
2825
2819
        logger.info("Now listening on address %r, port %d,"
2826
2820
                    " flowinfo %d, scope_id %d",
2832
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2827
    
2834
2828
    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
 
2829
        # From the Avahi example code
 
2830
        try:
 
2831
            service.activate()
 
2832
        except dbus.exceptions.DBusException as error:
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
 
2834
            cleanup()
 
2835
            sys.exit(1)
 
2836
        # End of Avahi example code
2844
2837
        
2845
2838
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2839
                             lambda *args, **kwargs: