/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: 2014-06-14 02:55:24 UTC
  • Revision ID: teddy@recompile.se-20140614025524-k03150tjp4t89w1d
plugin-runner: Restore resources correctly if fork() fails.

* plugin-runner.c (main): If fork() fails, close pipe FD's and restore
                          signal mask for SIGCHLD.

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.
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.5"
95
92
stored_state_file = "clients.pickle"
96
93
 
97
94
logger = logging.getLogger()
107
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
105
        with contextlib.closing(socket.socket()) as s:
109
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
112
111
        return interface_index
113
112
 
114
113
 
119
118
    syslogger = (logging.handlers.SysLogHandler
120
119
                 (facility =
121
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
 
121
                  address = str("/dev/log")))
123
122
    syslogger.setFormatter(logging.Formatter
124
123
                           ('Mandos [%(process)d]: %(levelname)s:'
125
124
                            ' %(message)s'))
225
224
class AvahiError(Exception):
226
225
    def __init__(self, value, *args, **kwargs):
227
226
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
227
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
228
    def __unicode__(self):
 
229
        return unicode(repr(self.value))
230
230
 
231
231
class AvahiServiceError(AvahiError):
232
232
    pass
282
282
                            " after %i retries, exiting.",
283
283
                            self.rename_count)
284
284
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
285
        self.name = unicode(self.server
 
286
                            .GetAlternativeServiceName(self.name))
287
287
        logger.info("Changing Zeroconf service name to %r ...",
288
288
                    self.name)
289
289
        self.remove()
337
337
            self.rename()
338
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
339
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
340
                            unicode(error))
 
341
            raise AvahiGroupError("State changed: {0!s}"
342
342
                                  .format(error))
343
343
    
344
344
    def cleanup(self):
395
395
        """Add the new name to the syslog messages"""
396
396
        ret = AvahiService.rename(self)
397
397
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
398
                               ('Mandos ({0}) [%(process)d]:'
399
399
                                ' %(levelname)s: %(message)s'
400
400
                                .format(self.name)))
401
401
        return ret
402
402
 
403
403
 
 
404
def timedelta_to_milliseconds(td):
 
405
    "Convert a datetime.timedelta() to milliseconds"
 
406
    return ((td.days * 24 * 60 * 60 * 1000)
 
407
            + (td.seconds * 1000)
 
408
            + (td.microseconds // 1000))
 
409
 
 
410
 
404
411
class Client(object):
405
412
    """A representation of a client host served by this server.
406
413
    
461
468
                        "enabled": "True",
462
469
                        }
463
470
    
 
471
    def timeout_milliseconds(self):
 
472
        "Return the 'timeout' attribute in milliseconds"
 
473
        return timedelta_to_milliseconds(self.timeout)
 
474
    
 
475
    def extended_timeout_milliseconds(self):
 
476
        "Return the 'extended_timeout' attribute in milliseconds"
 
477
        return timedelta_to_milliseconds(self.extended_timeout)
 
478
    
 
479
    def interval_milliseconds(self):
 
480
        "Return the 'interval' attribute in milliseconds"
 
481
        return timedelta_to_milliseconds(self.interval)
 
482
    
 
483
    def approval_delay_milliseconds(self):
 
484
        return timedelta_to_milliseconds(self.approval_delay)
 
485
    
464
486
    @staticmethod
465
487
    def config_parser(config):
466
488
        """Construct a new dict of client settings of this form:
491
513
                          "rb") as secfile:
492
514
                    client["secret"] = secfile.read()
493
515
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
516
                raise TypeError("No secret or secfile for section {0}"
495
517
                                .format(section))
496
518
            client["timeout"] = string_to_delta(section["timeout"])
497
519
            client["extended_timeout"] = string_to_delta(
514
536
            server_settings = {}
515
537
        self.server_settings = server_settings
516
538
        # adding all client settings
517
 
        for setting, value in settings.items():
 
539
        for setting, value in settings.iteritems():
518
540
            setattr(self, setting, value)
519
541
        
520
542
        if self.enabled:
603
625
        if self.checker_initiator_tag is not None:
604
626
            gobject.source_remove(self.checker_initiator_tag)
605
627
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
628
                                      (self.interval_milliseconds(),
608
629
                                       self.start_checker))
609
630
        # Schedule a disable() when 'timeout' has passed
610
631
        if self.disable_initiator_tag is not None:
611
632
            gobject.source_remove(self.disable_initiator_tag)
612
633
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
634
                                   (self.timeout_milliseconds(),
 
635
                                    self.disable))
616
636
        # Also start a new checker *right now*.
617
637
        self.start_checker()
618
638
    
649
669
            self.disable_initiator_tag = None
650
670
        if getattr(self, "enabled", False):
651
671
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
672
                                          (timedelta_to_milliseconds
 
673
                                           (timeout), self.disable))
654
674
            self.expires = datetime.datetime.utcnow() + timeout
655
675
    
656
676
    def need_approval(self):
687
707
        # Start a new checker if needed
688
708
        if self.checker is None:
689
709
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              for attr in self.runtime_expansions }
 
710
            escaped_attrs = dict(
 
711
                (attr, re.escape(unicode(getattr(self, attr))))
 
712
                for attr in
 
713
                self.runtime_expansions)
693
714
            try:
694
715
                command = self.checker_command % escaped_attrs
695
716
            except TypeError as error:
776
797
    # "Set" method, so we fail early here:
777
798
    if byte_arrays and signature != "ay":
778
799
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
800
                         " signature {0!r}".format(signature))
780
801
    def decorator(func):
781
802
        func._dbus_is_property = True
782
803
        func._dbus_interface = dbus_interface
813
834
    """Decorator to annotate D-Bus methods, signals or properties
814
835
    Usage:
815
836
    
816
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
817
 
                       "org.freedesktop.DBus.Property."
818
 
                       "EmitsChangedSignal": "false"})
819
837
    @dbus_service_property("org.example.Interface", signature="b",
820
838
                           access="r")
 
839
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
840
                        "org.freedesktop.DBus.Property."
 
841
                        "EmitsChangedSignal": "false"})
821
842
    def Property_dbus_property(self):
822
843
        return dbus.Boolean(False)
823
844
    """
830
851
class DBusPropertyException(dbus.exceptions.DBusException):
831
852
    """A base class for D-Bus property-related exceptions
832
853
    """
833
 
    pass
 
854
    def __unicode__(self):
 
855
        return unicode(str(self))
 
856
 
834
857
 
835
858
class DBusPropertyAccessException(DBusPropertyException):
836
859
    """A property's access permissions disallows an operation.
859
882
        If called like _is_dbus_thing("method") it returns a function
860
883
        suitable for use as predicate to inspect.getmembers().
861
884
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
885
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
886
                                   False)
864
887
    
865
888
    def _get_all_dbus_things(self, thing):
915
938
            # signatures other than "ay".
916
939
            if prop._dbus_signature != "ay":
917
940
                raise ValueError("Byte arrays not supported for non-"
918
 
                                 "'ay' signature {!r}"
 
941
                                 "'ay' signature {0!r}"
919
942
                                 .format(prop._dbus_signature))
920
943
            value = dbus.ByteArray(b''.join(chr(byte)
921
944
                                            for byte in value))
946
969
                                           value.variant_level+1)
947
970
        return dbus.Dictionary(properties, signature="sv")
948
971
    
949
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
950
 
    def PropertiesChanged(self, interface_name, changed_properties,
951
 
                          invalidated_properties):
952
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
953
 
        standard.
954
 
        """
955
 
        pass
956
 
    
957
972
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
958
973
                         out_signature="s",
959
974
                         path_keyword='object_path',
994
1009
                                              (prop,
995
1010
                                               "_dbus_annotations",
996
1011
                                               {}))
997
 
                        for name, value in annots.items():
 
1012
                        for name, value in annots.iteritems():
998
1013
                            ann_tag = document.createElement(
999
1014
                                "annotation")
1000
1015
                            ann_tag.setAttribute("name", name)
1003
1018
                # Add interface annotation tags
1004
1019
                for annotation, value in dict(
1005
1020
                    itertools.chain.from_iterable(
1006
 
                        annotations().items()
 
1021
                        annotations().iteritems()
1007
1022
                        for name, annotations in
1008
1023
                        self._get_all_dbus_things("interface")
1009
1024
                        if name == if_tag.getAttribute("name")
1010
 
                        )).items():
 
1025
                        )).iteritems():
1011
1026
                    ann_tag = document.createElement("annotation")
1012
1027
                    ann_tag.setAttribute("name", annotation)
1013
1028
                    ann_tag.setAttribute("value", value)
1069
1084
    """
1070
1085
    def wrapper(cls):
1071
1086
        for orig_interface_name, alt_interface_name in (
1072
 
            alt_interface_names.items()):
 
1087
            alt_interface_names.iteritems()):
1073
1088
            attr = {}
1074
1089
            interface_names = set()
1075
1090
            # Go though all attributes of the class
1192
1207
                                        attribute.func_closure)))
1193
1208
            if deprecate:
1194
1209
                # Deprecate all alternate interfaces
1195
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1210
                iname="_AlternateDBusNames_interface_annotation{0}"
1196
1211
                for interface_name in interface_names:
1197
1212
                    @dbus_interface_annotations(interface_name)
1198
1213
                    def func(self):
1207
1222
            if interface_names:
1208
1223
                # Replace the class with a new subclass of it with
1209
1224
                # methods, signals, etc. as created above.
1210
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1225
                cls = type(b"{0}Alternate".format(cls.__name__),
1211
1226
                           (cls,), attr)
1212
1227
        return cls
1213
1228
    return wrapper
1226
1241
    runtime_expansions = (Client.runtime_expansions
1227
1242
                          + ("dbus_object_path",))
1228
1243
    
1229
 
    _interface = "se.recompile.Mandos.Client"
1230
 
    
1231
1244
    # dbus.service.Object doesn't use super(), so we can't either.
1232
1245
    
1233
1246
    def __init__(self, bus = None, *args, **kwargs):
1235
1248
        Client.__init__(self, *args, **kwargs)
1236
1249
        # Only now, when this client is initialized, can it show up on
1237
1250
        # the D-Bus
1238
 
        client_object_name = str(self.name).translate(
 
1251
        client_object_name = unicode(self.name).translate(
1239
1252
            {ord("."): ord("_"),
1240
1253
             ord("-"): ord("_")})
1241
1254
        self.dbus_object_path = (dbus.ObjectPath
1245
1258
    
1246
1259
    def notifychangeproperty(transform_func,
1247
1260
                             dbus_name, type_func=lambda x: x,
1248
 
                             variant_level=1, invalidate_only=False,
1249
 
                             _interface=_interface):
 
1261
                             variant_level=1):
1250
1262
        """ Modify a variable so that it's a property which announces
1251
1263
        its changes to DBus.
1252
1264
        
1257
1269
                   to the D-Bus.  Default: no transform
1258
1270
        variant_level: D-Bus variant level.  Default: 1
1259
1271
        """
1260
 
        attrname = "_{}".format(dbus_name)
 
1272
        attrname = "_{0}".format(dbus_name)
1261
1273
        def setter(self, value):
1262
1274
            if hasattr(self, "dbus_object_path"):
1263
1275
                if (not hasattr(self, attrname) or
1264
1276
                    type_func(getattr(self, attrname, None))
1265
1277
                    != type_func(value)):
1266
 
                    if invalidate_only:
1267
 
                        self.PropertiesChanged(_interface,
1268
 
                                               dbus.Dictionary(),
1269
 
                                               dbus.Array
1270
 
                                               ((dbus_name,)))
1271
 
                    else:
1272
 
                        dbus_value = transform_func(type_func(value),
1273
 
                                                    variant_level
1274
 
                                                    =variant_level)
1275
 
                        self.PropertyChanged(dbus.String(dbus_name),
1276
 
                                             dbus_value)
1277
 
                        self.PropertiesChanged(_interface,
1278
 
                                               dbus.Dictionary({
1279
 
                                    dbus.String(dbus_name):
1280
 
                                        dbus_value }), dbus.Array())
 
1278
                    dbus_value = transform_func(type_func(value),
 
1279
                                                variant_level
 
1280
                                                =variant_level)
 
1281
                    self.PropertyChanged(dbus.String(dbus_name),
 
1282
                                         dbus_value)
1281
1283
            setattr(self, attrname, value)
1282
1284
        
1283
1285
        return property(lambda self: getattr(self, attrname), setter)
1303
1305
    approval_delay = notifychangeproperty(dbus.UInt64,
1304
1306
                                          "ApprovalDelay",
1305
1307
                                          type_func =
1306
 
                                          lambda td: td.total_seconds()
1307
 
                                          * 1000)
 
1308
                                          timedelta_to_milliseconds)
1308
1309
    approval_duration = notifychangeproperty(
1309
1310
        dbus.UInt64, "ApprovalDuration",
1310
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1311
        type_func = timedelta_to_milliseconds)
1311
1312
    host = notifychangeproperty(dbus.String, "Host")
1312
1313
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
 
                                   type_func = lambda td:
1314
 
                                       td.total_seconds() * 1000)
 
1314
                                   type_func =
 
1315
                                   timedelta_to_milliseconds)
1315
1316
    extended_timeout = notifychangeproperty(
1316
1317
        dbus.UInt64, "ExtendedTimeout",
1317
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1318
        type_func = timedelta_to_milliseconds)
1318
1319
    interval = notifychangeproperty(dbus.UInt64,
1319
1320
                                    "Interval",
1320
1321
                                    type_func =
1321
 
                                    lambda td: td.total_seconds()
1322
 
                                    * 1000)
 
1322
                                    timedelta_to_milliseconds)
1323
1323
    checker_command = notifychangeproperty(dbus.String, "Checker")
1324
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1325
 
                                  invalidate_only=True)
1326
1324
    
1327
1325
    del notifychangeproperty
1328
1326
    
1370
1368
    
1371
1369
    def approve(self, value=True):
1372
1370
        self.approved = value
1373
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1374
 
                                * 1000), self._reset_approved)
 
1371
        gobject.timeout_add(timedelta_to_milliseconds
 
1372
                            (self.approval_duration),
 
1373
                            self._reset_approved)
1375
1374
        self.send_changedstate()
1376
1375
    
1377
1376
    ## D-Bus methods, signals & properties
 
1377
    _interface = "se.recompile.Mandos.Client"
1378
1378
    
1379
1379
    ## Interfaces
1380
1380
    
 
1381
    @dbus_interface_annotations(_interface)
 
1382
    def _foo(self):
 
1383
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1384
                     "false"}
 
1385
    
1381
1386
    ## Signals
1382
1387
    
1383
1388
    # CheckerCompleted - signal
1393
1398
        pass
1394
1399
    
1395
1400
    # PropertyChanged - signal
1396
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
1401
    @dbus.service.signal(_interface, signature="sv")
1398
1402
    def PropertyChanged(self, property, value):
1399
1403
        "D-Bus signal"
1475
1479
                           access="readwrite")
1476
1480
    def ApprovalDelay_dbus_property(self, value=None):
1477
1481
        if value is None:       # get
1478
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1479
 
                               * 1000)
 
1482
            return dbus.UInt64(self.approval_delay_milliseconds())
1480
1483
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1481
1484
    
1482
1485
    # ApprovalDuration - property
1484
1487
                           access="readwrite")
1485
1488
    def ApprovalDuration_dbus_property(self, value=None):
1486
1489
        if value is None:       # get
1487
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1488
 
                               * 1000)
 
1490
            return dbus.UInt64(timedelta_to_milliseconds(
 
1491
                    self.approval_duration))
1489
1492
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1490
1493
    
1491
1494
    # Name - property
1504
1507
    def Host_dbus_property(self, value=None):
1505
1508
        if value is None:       # get
1506
1509
            return dbus.String(self.host)
1507
 
        self.host = str(value)
 
1510
        self.host = unicode(value)
1508
1511
    
1509
1512
    # Created - property
1510
1513
    @dbus_service_property(_interface, signature="s", access="read")
1557
1560
                           access="readwrite")
1558
1561
    def Timeout_dbus_property(self, value=None):
1559
1562
        if value is None:       # get
1560
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1563
            return dbus.UInt64(self.timeout_milliseconds())
1561
1564
        old_timeout = self.timeout
1562
1565
        self.timeout = datetime.timedelta(0, 0, 0, value)
1563
1566
        # Reschedule disabling
1574
1577
                gobject.source_remove(self.disable_initiator_tag)
1575
1578
                self.disable_initiator_tag = (
1576
1579
                    gobject.timeout_add(
1577
 
                        int((self.expires - now).total_seconds()
1578
 
                            * 1000), self.disable))
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
1581
                        self.disable))
1579
1582
    
1580
1583
    # ExtendedTimeout - property
1581
1584
    @dbus_service_property(_interface, signature="t",
1582
1585
                           access="readwrite")
1583
1586
    def ExtendedTimeout_dbus_property(self, value=None):
1584
1587
        if value is None:       # get
1585
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1586
 
                               * 1000)
 
1588
            return dbus.UInt64(self.extended_timeout_milliseconds())
1587
1589
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1588
1590
    
1589
1591
    # Interval - property
1591
1593
                           access="readwrite")
1592
1594
    def Interval_dbus_property(self, value=None):
1593
1595
        if value is None:       # get
1594
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1596
            return dbus.UInt64(self.interval_milliseconds())
1595
1597
        self.interval = datetime.timedelta(0, 0, 0, value)
1596
1598
        if getattr(self, "checker_initiator_tag", None) is None:
1597
1599
            return
1608
1610
    def Checker_dbus_property(self, value=None):
1609
1611
        if value is None:       # get
1610
1612
            return dbus.String(self.checker_command)
1611
 
        self.checker_command = str(value)
 
1613
        self.checker_command = unicode(value)
1612
1614
    
1613
1615
    # CheckerRunning - property
1614
1616
    @dbus_service_property(_interface, signature="b",
1630
1632
    @dbus_service_property(_interface, signature="ay",
1631
1633
                           access="write", byte_arrays=True)
1632
1634
    def Secret_dbus_property(self, value):
1633
 
        self.secret = bytes(value)
 
1635
        self.secret = str(value)
1634
1636
    
1635
1637
    del _interface
1636
1638
 
1670
1672
    def handle(self):
1671
1673
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1674
            logger.info("TCP connection from: %s",
1673
 
                        str(self.client_address))
 
1675
                        unicode(self.client_address))
1674
1676
            logger.debug("Pipe FD: %d",
1675
1677
                         self.server.child_pipe.fileno())
1676
1678
            
1757
1759
                        if self.server.use_dbus:
1758
1760
                            # Emit D-Bus signal
1759
1761
                            client.NeedApproval(
1760
 
                                client.approval_delay.total_seconds()
1761
 
                                * 1000, client.approved_by_default)
 
1762
                                client.approval_delay_milliseconds(),
 
1763
                                client.approved_by_default)
1762
1764
                    else:
1763
1765
                        logger.warning("Client %s was not approved",
1764
1766
                                       client.name)
1770
1772
                    #wait until timeout or approved
1771
1773
                    time = datetime.datetime.now()
1772
1774
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(delay.total_seconds())
 
1775
                    client.changedstate.wait(
 
1776
                        float(timedelta_to_milliseconds(delay)
 
1777
                              / 1000))
1774
1778
                    client.changedstate.release()
1775
1779
                    time2 = datetime.datetime.now()
1776
1780
                    if (time2 - time) >= delay:
1975
1979
                try:
1976
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
1977
1981
                                           SO_BINDTODEVICE,
1978
 
                                           (self.interface + "\0")
1979
 
                                           .encode("utf-8"))
 
1982
                                           str(self.interface + '\0'))
1980
1983
                except socket.error as error:
1981
1984
                    if error.errno == errno.EPERM:
1982
1985
                        logger.error("No permission to bind to"
2185
2188
    token_duration = Token(re.compile(r"P"), None,
2186
2189
                           frozenset((token_year, token_month,
2187
2190
                                      token_day, token_time,
2188
 
                                      token_week)))
 
2191
                                      token_week))),
2189
2192
    # Define starting values
2190
2193
    value = datetime.timedelta() # Value so far
2191
2194
    found_token = None
2192
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
2193
2196
    s = duration                # String left to parse
2194
2197
    # Loop until end token is found
2195
2198
    while found_token is not token_end:
2242
2245
    timevalue = datetime.timedelta(0)
2243
2246
    for s in interval.split():
2244
2247
        try:
2245
 
            suffix = s[-1]
 
2248
            suffix = unicode(s[-1])
2246
2249
            value = int(s[:-1])
2247
2250
            if suffix == "d":
2248
2251
                delta = datetime.timedelta(value)
2255
2258
            elif suffix == "w":
2256
2259
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2257
2260
            else:
2258
 
                raise ValueError("Unknown suffix {!r}"
 
2261
                raise ValueError("Unknown suffix {0!r}"
2259
2262
                                 .format(suffix))
2260
2263
        except IndexError as e:
2261
2264
            raise ValueError(*(e.args))
2278
2281
        # Close all standard open file descriptors
2279
2282
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2280
2283
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2281
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2284
            raise OSError(errno.ENODEV,
 
2285
                          "{0} not a character device"
2282
2286
                          .format(os.devnull))
2283
2287
        os.dup2(null, sys.stdin.fileno())
2284
2288
        os.dup2(null, sys.stdout.fileno())
2294
2298
    
2295
2299
    parser = argparse.ArgumentParser()
2296
2300
    parser.add_argument("-v", "--version", action="version",
2297
 
                        version = "%(prog)s {}".format(version),
 
2301
                        version = "%(prog)s {0}".format(version),
2298
2302
                        help="show version number and exit")
2299
2303
    parser.add_argument("-i", "--interface", metavar="IF",
2300
2304
                        help="Bind to interface IF")
2333
2337
                        help="Directory to save/restore state in")
2334
2338
    parser.add_argument("--foreground", action="store_true",
2335
2339
                        help="Run in foreground", default=None)
2336
 
    parser.add_argument("--no-zeroconf", action="store_false",
2337
 
                        dest="zeroconf", help="Do not use Zeroconf",
2338
 
                        default=None)
2339
2340
    
2340
2341
    options = parser.parse_args()
2341
2342
    
2359
2360
                        "socket": "",
2360
2361
                        "statedir": "/var/lib/mandos",
2361
2362
                        "foreground": "False",
2362
 
                        "zeroconf": "True",
2363
2363
                        }
2364
2364
    
2365
2365
    # Parse config file for server-global settings
2392
2392
    for option in ("interface", "address", "port", "debug",
2393
2393
                   "priority", "servicename", "configdir",
2394
2394
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2395
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2395
                   "statedir", "socket", "foreground"):
2396
2396
        value = getattr(options, option)
2397
2397
        if value is not None:
2398
2398
            server_settings[option] = value
2399
2399
    del options
2400
2400
    # Force all strings to be unicode
2401
2401
    for option in server_settings.keys():
2402
 
        if isinstance(server_settings[option], bytes):
2403
 
            server_settings[option] = (server_settings[option]
2404
 
                                       .decode("utf-8"))
 
2402
        if type(server_settings[option]) is str:
 
2403
            server_settings[option] = unicode(server_settings[option])
2405
2404
    # Force all boolean options to be boolean
2406
2405
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground", "zeroconf"):
 
2406
                   "foreground"):
2408
2407
        server_settings[option] = bool(server_settings[option])
2409
2408
    # Debug implies foreground
2410
2409
    if server_settings["debug"]:
2413
2412
    
2414
2413
    ##################################################################
2415
2414
    
2416
 
    if (not server_settings["zeroconf"] and
2417
 
        not (server_settings["port"]
2418
 
             or server_settings["socket"] != "")):
2419
 
            parser.error("Needs port or socket to work without"
2420
 
                         " Zeroconf")
2421
 
    
2422
2415
    # For convenience
2423
2416
    debug = server_settings["debug"]
2424
2417
    debuglevel = server_settings["debuglevel"]
2427
2420
    stored_state_path = os.path.join(server_settings["statedir"],
2428
2421
                                     stored_state_file)
2429
2422
    foreground = server_settings["foreground"]
2430
 
    zeroconf = server_settings["zeroconf"]
2431
2423
    
2432
2424
    if debug:
2433
2425
        initlogger(debug, logging.DEBUG)
2440
2432
    
2441
2433
    if server_settings["servicename"] != "Mandos":
2442
2434
        syslogger.setFormatter(logging.Formatter
2443
 
                               ('Mandos ({}) [%(process)d]:'
 
2435
                               ('Mandos ({0}) [%(process)d]:'
2444
2436
                                ' %(levelname)s: %(message)s'
2445
2437
                                .format(server_settings
2446
2438
                                        ["servicename"])))
2454
2446
    global mandos_dbus_service
2455
2447
    mandos_dbus_service = None
2456
2448
    
2457
 
    socketfd = None
2458
 
    if server_settings["socket"] != "":
2459
 
        socketfd = server_settings["socket"]
2460
2449
    tcp_server = MandosServer((server_settings["address"],
2461
2450
                               server_settings["port"]),
2462
2451
                              ClientHandler,
2466
2455
                              gnutls_priority=
2467
2456
                              server_settings["priority"],
2468
2457
                              use_dbus=use_dbus,
2469
 
                              socketfd=socketfd)
 
2458
                              socketfd=(server_settings["socket"]
 
2459
                                        or None))
2470
2460
    if not foreground:
2471
2461
        pidfilename = "/run/mandos.pid"
2472
2462
        if not os.path.isdir("/run/."):
2542
2532
            use_dbus = False
2543
2533
            server_settings["use_dbus"] = False
2544
2534
            tcp_server.use_dbus = False
2545
 
    if zeroconf:
2546
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2547
 
        service = AvahiServiceToSyslog(name =
2548
 
                                       server_settings["servicename"],
2549
 
                                       servicetype = "_mandos._tcp",
2550
 
                                       protocol = protocol, bus = bus)
2551
 
        if server_settings["interface"]:
2552
 
            service.interface = (if_nametoindex
2553
 
                                 (server_settings["interface"]
2554
 
                                  .encode("utf-8")))
 
2535
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2536
    service = AvahiServiceToSyslog(name =
 
2537
                                   server_settings["servicename"],
 
2538
                                   servicetype = "_mandos._tcp",
 
2539
                                   protocol = protocol, bus = bus)
 
2540
    if server_settings["interface"]:
 
2541
        service.interface = (if_nametoindex
 
2542
                             (str(server_settings["interface"])))
2555
2543
    
2556
2544
    global multiprocessing_manager
2557
2545
    multiprocessing_manager = multiprocessing.Manager()
2581
2569
            os.remove(stored_state_path)
2582
2570
        except IOError as e:
2583
2571
            if e.errno == errno.ENOENT:
2584
 
                logger.warning("Could not load persistent state: {}"
 
2572
                logger.warning("Could not load persistent state: {0}"
2585
2573
                                .format(os.strerror(e.errno)))
2586
2574
            else:
2587
2575
                logger.critical("Could not load persistent state:",
2592
2580
                           "EOFError:", exc_info=e)
2593
2581
    
2594
2582
    with PGPEngine() as pgp:
2595
 
        for client_name, client in clients_data.items():
 
2583
        for client_name, client in clients_data.iteritems():
2596
2584
            # Skip removed clients
2597
2585
            if client_name not in client_settings:
2598
2586
                continue
2623
2611
                if datetime.datetime.utcnow() >= client["expires"]:
2624
2612
                    if not client["last_checked_ok"]:
2625
2613
                        logger.warning(
2626
 
                            "disabling client {} - Client never "
 
2614
                            "disabling client {0} - Client never "
2627
2615
                            "performed a successful checker"
2628
2616
                            .format(client_name))
2629
2617
                        client["enabled"] = False
2630
2618
                    elif client["last_checker_status"] != 0:
2631
2619
                        logger.warning(
2632
 
                            "disabling client {} - Client last"
2633
 
                            " checker failed with error code {}"
 
2620
                            "disabling client {0} - Client "
 
2621
                            "last checker failed with error code {1}"
2634
2622
                            .format(client_name,
2635
2623
                                    client["last_checker_status"]))
2636
2624
                        client["enabled"] = False
2639
2627
                                             .utcnow()
2640
2628
                                             + client["timeout"])
2641
2629
                        logger.debug("Last checker succeeded,"
2642
 
                                     " keeping {} enabled"
 
2630
                                     " keeping {0} enabled"
2643
2631
                                     .format(client_name))
2644
2632
            try:
2645
2633
                client["secret"] = (
2648
2636
                                ["secret"]))
2649
2637
            except PGPError:
2650
2638
                # If decryption fails, we use secret from new settings
2651
 
                logger.debug("Failed to decrypt {} old secret"
 
2639
                logger.debug("Failed to decrypt {0} old secret"
2652
2640
                             .format(client_name))
2653
2641
                client["secret"] = (
2654
2642
                    client_settings[client_name]["secret"])
2662
2650
        clients_data[client_name] = client_settings[client_name]
2663
2651
    
2664
2652
    # Create all client objects
2665
 
    for client_name, client in clients_data.items():
 
2653
    for client_name, client in clients_data.iteritems():
2666
2654
        tcp_server.clients[client_name] = client_class(
2667
2655
            name = client_name, settings = client,
2668
2656
            server_settings = server_settings)
2675
2663
            try:
2676
2664
                with pidfile:
2677
2665
                    pid = os.getpid()
2678
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2666
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2679
2667
            except IOError:
2680
2668
                logger.error("Could not write to file %r with PID %d",
2681
2669
                             pidfilename, pid)
2727
2715
            def GetAllClientsWithProperties(self):
2728
2716
                "D-Bus method"
2729
2717
                return dbus.Dictionary(
2730
 
                    { c.dbus_object_path: c.GetAll("")
2731
 
                      for c in tcp_server.clients.itervalues() },
 
2718
                    ((c.dbus_object_path, c.GetAll(""))
 
2719
                     for c in tcp_server.clients.itervalues()),
2732
2720
                    signature="oa{sv}")
2733
2721
            
2734
2722
            @dbus.service.method(_interface, in_signature="o")
2751
2739
    
2752
2740
    def cleanup():
2753
2741
        "Cleanup function; run on exit"
2754
 
        if zeroconf:
2755
 
            service.cleanup()
 
2742
        service.cleanup()
2756
2743
        
2757
2744
        multiprocessing.active_children()
2758
2745
        wnull.close()
2772
2759
                
2773
2760
                # A list of attributes that can not be pickled
2774
2761
                # + secret.
2775
 
                exclude = { "bus", "changedstate", "secret",
2776
 
                            "checker", "server_settings" }
 
2762
                exclude = set(("bus", "changedstate", "secret",
 
2763
                               "checker", "server_settings"))
2777
2764
                for name, typ in (inspect.getmembers
2778
2765
                                  (dbus.service.Object)):
2779
2766
                    exclude.add(name)
2802
2789
                except NameError:
2803
2790
                    pass
2804
2791
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2805
 
                logger.warning("Could not save persistent state: {}"
 
2792
                logger.warning("Could not save persistent state: {0}"
2806
2793
                               .format(os.strerror(e.errno)))
2807
2794
            else:
2808
2795
                logger.warning("Could not save persistent state:",
2837
2824
    tcp_server.server_activate()
2838
2825
    
2839
2826
    # Find out what port we got
2840
 
    if zeroconf:
2841
 
        service.port = tcp_server.socket.getsockname()[1]
 
2827
    service.port = tcp_server.socket.getsockname()[1]
2842
2828
    if use_ipv6:
2843
2829
        logger.info("Now listening on address %r, port %d,"
2844
2830
                    " flowinfo %d, scope_id %d",
2850
2836
    #service.interface = tcp_server.socket.getsockname()[3]
2851
2837
    
2852
2838
    try:
2853
 
        if zeroconf:
2854
 
            # From the Avahi example code
2855
 
            try:
2856
 
                service.activate()
2857
 
            except dbus.exceptions.DBusException as error:
2858
 
                logger.critical("D-Bus Exception", exc_info=error)
2859
 
                cleanup()
2860
 
                sys.exit(1)
2861
 
            # End of Avahi example code
 
2839
        # From the Avahi example code
 
2840
        try:
 
2841
            service.activate()
 
2842
        except dbus.exceptions.DBusException as error:
 
2843
            logger.critical("D-Bus Exception", exc_info=error)
 
2844
            cleanup()
 
2845
            sys.exit(1)
 
2846
        # End of Avahi example code
2862
2847
        
2863
2848
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2864
2849
                             lambda *args, **kwargs: