/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-02-16 02:42:42 UTC
  • Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.

* debian/control (Build-Depends): Add Python dependencies to
                                  successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.9"
 
91
version = "1.6.3"
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'))
225
221
class AvahiError(Exception):
226
222
    def __init__(self, value, *args, **kwargs):
227
223
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
224
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
225
    def __unicode__(self):
 
226
        return unicode(repr(self.value))
230
227
 
231
228
class AvahiServiceError(AvahiError):
232
229
    pass
275
272
        self.bus = bus
276
273
        self.entry_group_state_changed_match = None
277
274
    
278
 
    def rename(self, remove=True):
 
275
    def rename(self):
279
276
        """Derived from the Avahi example code"""
280
277
        if self.rename_count >= self.max_renames:
281
278
            logger.critical("No suitable Zeroconf service name found"
282
279
                            " after %i retries, exiting.",
283
280
                            self.rename_count)
284
281
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
287
 
        self.rename_count += 1
 
282
        self.name = unicode(self.server
 
283
                            .GetAlternativeServiceName(self.name))
288
284
        logger.info("Changing Zeroconf service name to %r ...",
289
285
                    self.name)
290
 
        if remove:
291
 
            self.remove()
 
286
        self.remove()
292
287
        try:
293
288
            self.add()
294
289
        except dbus.exceptions.DBusException as error:
295
 
            if (error.get_dbus_name()
296
 
                == "org.freedesktop.Avahi.CollisionError"):
297
 
                logger.info("Local Zeroconf service name collision.")
298
 
                return self.rename(remove=False)
299
 
            else:
300
 
                logger.critical("D-Bus Exception", exc_info=error)
301
 
                self.cleanup()
302
 
                os._exit(1)
 
290
            logger.critical("D-Bus Exception", exc_info=error)
 
291
            self.cleanup()
 
292
            os._exit(1)
 
293
        self.rename_count += 1
303
294
    
304
295
    def remove(self):
305
296
        """Derived from the Avahi example code"""
343
334
            self.rename()
344
335
        elif state == avahi.ENTRY_GROUP_FAILURE:
345
336
            logger.critical("Avahi: Error in group state changed %s",
346
 
                            str(error))
347
 
            raise AvahiGroupError("State changed: {!s}"
 
337
                            unicode(error))
 
338
            raise AvahiGroupError("State changed: {0!s}"
348
339
                                  .format(error))
349
340
    
350
341
    def cleanup(self):
397
388
 
398
389
 
399
390
class AvahiServiceToSyslog(AvahiService):
400
 
    def rename(self, *args, **kwargs):
 
391
    def rename(self):
401
392
        """Add the new name to the syslog messages"""
402
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
393
        ret = AvahiService.rename(self)
403
394
        syslogger.setFormatter(logging.Formatter
404
 
                               ('Mandos ({}) [%(process)d]:'
 
395
                               ('Mandos ({0}) [%(process)d]:'
405
396
                                ' %(levelname)s: %(message)s'
406
397
                                .format(self.name)))
407
398
        return ret
408
399
 
409
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
 
410
408
class Client(object):
411
409
    """A representation of a client host served by this server.
412
410
    
467
465
                        "enabled": "True",
468
466
                        }
469
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
    
470
483
    @staticmethod
471
484
    def config_parser(config):
472
485
        """Construct a new dict of client settings of this form:
487
500
            client["enabled"] = config.getboolean(client_name,
488
501
                                                  "enabled")
489
502
            
490
 
            # Uppercase and remove spaces from fingerprint for later
491
 
            # comparison purposes with return value from the
492
 
            # fingerprint() function
493
503
            client["fingerprint"] = (section["fingerprint"].upper()
494
504
                                     .replace(" ", ""))
495
505
            if "secret" in section:
500
510
                          "rb") as secfile:
501
511
                    client["secret"] = secfile.read()
502
512
            else:
503
 
                raise TypeError("No secret or secfile for section {}"
 
513
                raise TypeError("No secret or secfile for section {0}"
504
514
                                .format(section))
505
515
            client["timeout"] = string_to_delta(section["timeout"])
506
516
            client["extended_timeout"] = string_to_delta(
523
533
            server_settings = {}
524
534
        self.server_settings = server_settings
525
535
        # adding all client settings
526
 
        for setting, value in settings.items():
 
536
        for setting, value in settings.iteritems():
527
537
            setattr(self, setting, value)
528
538
        
529
539
        if self.enabled:
537
547
            self.expires = None
538
548
        
539
549
        logger.debug("Creating client %r", self.name)
 
550
        # Uppercase and remove spaces from fingerprint for later
 
551
        # comparison purposes with return value from the fingerprint()
 
552
        # function
540
553
        logger.debug("  Fingerprint: %s", self.fingerprint)
541
554
        self.created = settings.get("created",
542
555
                                    datetime.datetime.utcnow())
609
622
        if self.checker_initiator_tag is not None:
610
623
            gobject.source_remove(self.checker_initiator_tag)
611
624
        self.checker_initiator_tag = (gobject.timeout_add
612
 
                                      (int(self.interval
613
 
                                           .total_seconds() * 1000),
 
625
                                      (self.interval_milliseconds(),
614
626
                                       self.start_checker))
615
627
        # Schedule a disable() when 'timeout' has passed
616
628
        if self.disable_initiator_tag is not None:
617
629
            gobject.source_remove(self.disable_initiator_tag)
618
630
        self.disable_initiator_tag = (gobject.timeout_add
619
 
                                      (int(self.timeout
620
 
                                           .total_seconds() * 1000),
621
 
                                       self.disable))
 
631
                                   (self.timeout_milliseconds(),
 
632
                                    self.disable))
622
633
        # Also start a new checker *right now*.
623
634
        self.start_checker()
624
635
    
655
666
            self.disable_initiator_tag = None
656
667
        if getattr(self, "enabled", False):
657
668
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (int(timeout.total_seconds()
659
 
                                               * 1000), self.disable))
 
669
                                          (timedelta_to_milliseconds
 
670
                                           (timeout), self.disable))
660
671
            self.expires = datetime.datetime.utcnow() + timeout
661
672
    
662
673
    def need_approval(self):
693
704
        # Start a new checker if needed
694
705
        if self.checker is None:
695
706
            # Escape attributes for the shell
696
 
            escaped_attrs = { attr:
697
 
                                  re.escape(str(getattr(self, attr)))
698
 
                              for attr in self.runtime_expansions }
 
707
            escaped_attrs = dict(
 
708
                (attr, re.escape(unicode(getattr(self, attr))))
 
709
                for attr in
 
710
                self.runtime_expansions)
699
711
            try:
700
712
                command = self.checker_command % escaped_attrs
701
713
            except TypeError as error:
782
794
    # "Set" method, so we fail early here:
783
795
    if byte_arrays and signature != "ay":
784
796
        raise ValueError("Byte arrays not supported for non-'ay'"
785
 
                         " signature {!r}".format(signature))
 
797
                         " signature {0!r}".format(signature))
786
798
    def decorator(func):
787
799
        func._dbus_is_property = True
788
800
        func._dbus_interface = dbus_interface
819
831
    """Decorator to annotate D-Bus methods, signals or properties
820
832
    Usage:
821
833
    
822
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
 
                       "org.freedesktop.DBus.Property."
824
 
                       "EmitsChangedSignal": "false"})
825
834
    @dbus_service_property("org.example.Interface", signature="b",
826
835
                           access="r")
 
836
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
837
                        "org.freedesktop.DBus.Property."
 
838
                        "EmitsChangedSignal": "false"})
827
839
    def Property_dbus_property(self):
828
840
        return dbus.Boolean(False)
829
841
    """
836
848
class DBusPropertyException(dbus.exceptions.DBusException):
837
849
    """A base class for D-Bus property-related exceptions
838
850
    """
839
 
    pass
 
851
    def __unicode__(self):
 
852
        return unicode(str(self))
 
853
 
840
854
 
841
855
class DBusPropertyAccessException(DBusPropertyException):
842
856
    """A property's access permissions disallows an operation.
865
879
        If called like _is_dbus_thing("method") it returns a function
866
880
        suitable for use as predicate to inspect.getmembers().
867
881
        """
868
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
882
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
869
883
                                   False)
870
884
    
871
885
    def _get_all_dbus_things(self, thing):
921
935
            # signatures other than "ay".
922
936
            if prop._dbus_signature != "ay":
923
937
                raise ValueError("Byte arrays not supported for non-"
924
 
                                 "'ay' signature {!r}"
 
938
                                 "'ay' signature {0!r}"
925
939
                                 .format(prop._dbus_signature))
926
940
            value = dbus.ByteArray(b''.join(chr(byte)
927
941
                                            for byte in value))
952
966
                                           value.variant_level+1)
953
967
        return dbus.Dictionary(properties, signature="sv")
954
968
    
955
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
956
 
    def PropertiesChanged(self, interface_name, changed_properties,
957
 
                          invalidated_properties):
958
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
959
 
        standard.
960
 
        """
961
 
        pass
962
 
    
963
969
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
970
                         out_signature="s",
965
971
                         path_keyword='object_path',
1000
1006
                                              (prop,
1001
1007
                                               "_dbus_annotations",
1002
1008
                                               {}))
1003
 
                        for name, value in annots.items():
 
1009
                        for name, value in annots.iteritems():
1004
1010
                            ann_tag = document.createElement(
1005
1011
                                "annotation")
1006
1012
                            ann_tag.setAttribute("name", name)
1009
1015
                # Add interface annotation tags
1010
1016
                for annotation, value in dict(
1011
1017
                    itertools.chain.from_iterable(
1012
 
                        annotations().items()
 
1018
                        annotations().iteritems()
1013
1019
                        for name, annotations in
1014
1020
                        self._get_all_dbus_things("interface")
1015
1021
                        if name == if_tag.getAttribute("name")
1016
 
                        )).items():
 
1022
                        )).iteritems():
1017
1023
                    ann_tag = document.createElement("annotation")
1018
1024
                    ann_tag.setAttribute("name", annotation)
1019
1025
                    ann_tag.setAttribute("value", value)
1075
1081
    """
1076
1082
    def wrapper(cls):
1077
1083
        for orig_interface_name, alt_interface_name in (
1078
 
            alt_interface_names.items()):
 
1084
            alt_interface_names.iteritems()):
1079
1085
            attr = {}
1080
1086
            interface_names = set()
1081
1087
            # Go though all attributes of the class
1198
1204
                                        attribute.func_closure)))
1199
1205
            if deprecate:
1200
1206
                # Deprecate all alternate interfaces
1201
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1207
                iname="_AlternateDBusNames_interface_annotation{0}"
1202
1208
                for interface_name in interface_names:
1203
1209
                    @dbus_interface_annotations(interface_name)
1204
1210
                    def func(self):
1213
1219
            if interface_names:
1214
1220
                # Replace the class with a new subclass of it with
1215
1221
                # methods, signals, etc. as created above.
1216
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1222
                cls = type(b"{0}Alternate".format(cls.__name__),
1217
1223
                           (cls,), attr)
1218
1224
        return cls
1219
1225
    return wrapper
1232
1238
    runtime_expansions = (Client.runtime_expansions
1233
1239
                          + ("dbus_object_path",))
1234
1240
    
1235
 
    _interface = "se.recompile.Mandos.Client"
1236
 
    
1237
1241
    # dbus.service.Object doesn't use super(), so we can't either.
1238
1242
    
1239
1243
    def __init__(self, bus = None, *args, **kwargs):
1241
1245
        Client.__init__(self, *args, **kwargs)
1242
1246
        # Only now, when this client is initialized, can it show up on
1243
1247
        # the D-Bus
1244
 
        client_object_name = str(self.name).translate(
 
1248
        client_object_name = unicode(self.name).translate(
1245
1249
            {ord("."): ord("_"),
1246
1250
             ord("-"): ord("_")})
1247
1251
        self.dbus_object_path = (dbus.ObjectPath
1251
1255
    
1252
1256
    def notifychangeproperty(transform_func,
1253
1257
                             dbus_name, type_func=lambda x: x,
1254
 
                             variant_level=1, invalidate_only=False,
1255
 
                             _interface=_interface):
 
1258
                             variant_level=1):
1256
1259
        """ Modify a variable so that it's a property which announces
1257
1260
        its changes to DBus.
1258
1261
        
1263
1266
                   to the D-Bus.  Default: no transform
1264
1267
        variant_level: D-Bus variant level.  Default: 1
1265
1268
        """
1266
 
        attrname = "_{}".format(dbus_name)
 
1269
        attrname = "_{0}".format(dbus_name)
1267
1270
        def setter(self, value):
1268
1271
            if hasattr(self, "dbus_object_path"):
1269
1272
                if (not hasattr(self, attrname) or
1270
1273
                    type_func(getattr(self, attrname, None))
1271
1274
                    != type_func(value)):
1272
 
                    if invalidate_only:
1273
 
                        self.PropertiesChanged(_interface,
1274
 
                                               dbus.Dictionary(),
1275
 
                                               dbus.Array
1276
 
                                               ((dbus_name,)))
1277
 
                    else:
1278
 
                        dbus_value = transform_func(type_func(value),
1279
 
                                                    variant_level
1280
 
                                                    =variant_level)
1281
 
                        self.PropertyChanged(dbus.String(dbus_name),
1282
 
                                             dbus_value)
1283
 
                        self.PropertiesChanged(_interface,
1284
 
                                               dbus.Dictionary({
1285
 
                                    dbus.String(dbus_name):
1286
 
                                        dbus_value }), dbus.Array())
 
1275
                    dbus_value = transform_func(type_func(value),
 
1276
                                                variant_level
 
1277
                                                =variant_level)
 
1278
                    self.PropertyChanged(dbus.String(dbus_name),
 
1279
                                         dbus_value)
1287
1280
            setattr(self, attrname, value)
1288
1281
        
1289
1282
        return property(lambda self: getattr(self, attrname), setter)
1309
1302
    approval_delay = notifychangeproperty(dbus.UInt64,
1310
1303
                                          "ApprovalDelay",
1311
1304
                                          type_func =
1312
 
                                          lambda td: td.total_seconds()
1313
 
                                          * 1000)
 
1305
                                          timedelta_to_milliseconds)
1314
1306
    approval_duration = notifychangeproperty(
1315
1307
        dbus.UInt64, "ApprovalDuration",
1316
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1308
        type_func = timedelta_to_milliseconds)
1317
1309
    host = notifychangeproperty(dbus.String, "Host")
1318
1310
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
 
                                   type_func = lambda td:
1320
 
                                       td.total_seconds() * 1000)
 
1311
                                   type_func =
 
1312
                                   timedelta_to_milliseconds)
1321
1313
    extended_timeout = notifychangeproperty(
1322
1314
        dbus.UInt64, "ExtendedTimeout",
1323
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1315
        type_func = timedelta_to_milliseconds)
1324
1316
    interval = notifychangeproperty(dbus.UInt64,
1325
1317
                                    "Interval",
1326
1318
                                    type_func =
1327
 
                                    lambda td: td.total_seconds()
1328
 
                                    * 1000)
 
1319
                                    timedelta_to_milliseconds)
1329
1320
    checker_command = notifychangeproperty(dbus.String, "Checker")
1330
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
 
                                  invalidate_only=True)
1332
1321
    
1333
1322
    del notifychangeproperty
1334
1323
    
1361
1350
                                       *args, **kwargs)
1362
1351
    
1363
1352
    def start_checker(self, *args, **kwargs):
1364
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1353
        old_checker = self.checker
 
1354
        if self.checker is not None:
 
1355
            old_checker_pid = self.checker.pid
 
1356
        else:
 
1357
            old_checker_pid = None
1365
1358
        r = Client.start_checker(self, *args, **kwargs)
1366
1359
        # Only if new checker process was started
1367
1360
        if (self.checker is not None
1376
1369
    
1377
1370
    def approve(self, value=True):
1378
1371
        self.approved = value
1379
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
 
                                * 1000), self._reset_approved)
 
1372
        gobject.timeout_add(timedelta_to_milliseconds
 
1373
                            (self.approval_duration),
 
1374
                            self._reset_approved)
1381
1375
        self.send_changedstate()
1382
1376
    
1383
1377
    ## D-Bus methods, signals & properties
 
1378
    _interface = "se.recompile.Mandos.Client"
1384
1379
    
1385
1380
    ## Interfaces
1386
1381
    
 
1382
    @dbus_interface_annotations(_interface)
 
1383
    def _foo(self):
 
1384
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1385
                     "false"}
 
1386
    
1387
1387
    ## Signals
1388
1388
    
1389
1389
    # CheckerCompleted - signal
1399
1399
        pass
1400
1400
    
1401
1401
    # PropertyChanged - signal
1402
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1403
1402
    @dbus.service.signal(_interface, signature="sv")
1404
1403
    def PropertyChanged(self, property, value):
1405
1404
        "D-Bus signal"
1481
1480
                           access="readwrite")
1482
1481
    def ApprovalDelay_dbus_property(self, value=None):
1483
1482
        if value is None:       # get
1484
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1485
 
                               * 1000)
 
1483
            return dbus.UInt64(self.approval_delay_milliseconds())
1486
1484
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1487
1485
    
1488
1486
    # ApprovalDuration - property
1490
1488
                           access="readwrite")
1491
1489
    def ApprovalDuration_dbus_property(self, value=None):
1492
1490
        if value is None:       # get
1493
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1494
 
                               * 1000)
 
1491
            return dbus.UInt64(timedelta_to_milliseconds(
 
1492
                    self.approval_duration))
1495
1493
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1496
1494
    
1497
1495
    # Name - property
1510
1508
    def Host_dbus_property(self, value=None):
1511
1509
        if value is None:       # get
1512
1510
            return dbus.String(self.host)
1513
 
        self.host = str(value)
 
1511
        self.host = unicode(value)
1514
1512
    
1515
1513
    # Created - property
1516
1514
    @dbus_service_property(_interface, signature="s", access="read")
1563
1561
                           access="readwrite")
1564
1562
    def Timeout_dbus_property(self, value=None):
1565
1563
        if value is None:       # get
1566
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1564
            return dbus.UInt64(self.timeout_milliseconds())
1567
1565
        old_timeout = self.timeout
1568
1566
        self.timeout = datetime.timedelta(0, 0, 0, value)
1569
1567
        # Reschedule disabling
1580
1578
                gobject.source_remove(self.disable_initiator_tag)
1581
1579
                self.disable_initiator_tag = (
1582
1580
                    gobject.timeout_add(
1583
 
                        int((self.expires - now).total_seconds()
1584
 
                            * 1000), self.disable))
 
1581
                        timedelta_to_milliseconds(self.expires - now),
 
1582
                        self.disable))
1585
1583
    
1586
1584
    # ExtendedTimeout - property
1587
1585
    @dbus_service_property(_interface, signature="t",
1588
1586
                           access="readwrite")
1589
1587
    def ExtendedTimeout_dbus_property(self, value=None):
1590
1588
        if value is None:       # get
1591
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1592
 
                               * 1000)
 
1589
            return dbus.UInt64(self.extended_timeout_milliseconds())
1593
1590
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
1591
    
1595
1592
    # Interval - property
1597
1594
                           access="readwrite")
1598
1595
    def Interval_dbus_property(self, value=None):
1599
1596
        if value is None:       # get
1600
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1597
            return dbus.UInt64(self.interval_milliseconds())
1601
1598
        self.interval = datetime.timedelta(0, 0, 0, value)
1602
1599
        if getattr(self, "checker_initiator_tag", None) is None:
1603
1600
            return
1614
1611
    def Checker_dbus_property(self, value=None):
1615
1612
        if value is None:       # get
1616
1613
            return dbus.String(self.checker_command)
1617
 
        self.checker_command = str(value)
 
1614
        self.checker_command = unicode(value)
1618
1615
    
1619
1616
    # CheckerRunning - property
1620
1617
    @dbus_service_property(_interface, signature="b",
1636
1633
    @dbus_service_property(_interface, signature="ay",
1637
1634
                           access="write", byte_arrays=True)
1638
1635
    def Secret_dbus_property(self, value):
1639
 
        self.secret = bytes(value)
 
1636
        self.secret = str(value)
1640
1637
    
1641
1638
    del _interface
1642
1639
 
1676
1673
    def handle(self):
1677
1674
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1678
1675
            logger.info("TCP connection from: %s",
1679
 
                        str(self.client_address))
 
1676
                        unicode(self.client_address))
1680
1677
            logger.debug("Pipe FD: %d",
1681
1678
                         self.server.child_pipe.fileno())
1682
1679
            
1763
1760
                        if self.server.use_dbus:
1764
1761
                            # Emit D-Bus signal
1765
1762
                            client.NeedApproval(
1766
 
                                client.approval_delay.total_seconds()
1767
 
                                * 1000, client.approved_by_default)
 
1763
                                client.approval_delay_milliseconds(),
 
1764
                                client.approved_by_default)
1768
1765
                    else:
1769
1766
                        logger.warning("Client %s was not approved",
1770
1767
                                       client.name)
1776
1773
                    #wait until timeout or approved
1777
1774
                    time = datetime.datetime.now()
1778
1775
                    client.changedstate.acquire()
1779
 
                    client.changedstate.wait(delay.total_seconds())
 
1776
                    client.changedstate.wait(
 
1777
                        float(timedelta_to_milliseconds(delay)
 
1778
                              / 1000))
1780
1779
                    client.changedstate.release()
1781
1780
                    time2 = datetime.datetime.now()
1782
1781
                    if (time2 - time) >= delay:
1981
1980
                try:
1982
1981
                    self.socket.setsockopt(socket.SOL_SOCKET,
1983
1982
                                           SO_BINDTODEVICE,
1984
 
                                           (self.interface + "\0")
1985
 
                                           .encode("utf-8"))
 
1983
                                           str(self.interface + '\0'))
1986
1984
                except socket.error as error:
1987
1985
                    if error.errno == errno.EPERM:
1988
1986
                        logger.error("No permission to bind to"
2191
2189
    token_duration = Token(re.compile(r"P"), None,
2192
2190
                           frozenset((token_year, token_month,
2193
2191
                                      token_day, token_time,
2194
 
                                      token_week)))
 
2192
                                      token_week))),
2195
2193
    # Define starting values
2196
2194
    value = datetime.timedelta() # Value so far
2197
2195
    found_token = None
2198
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2196
    followers = frozenset(token_duration,) # Following valid tokens
2199
2197
    s = duration                # String left to parse
2200
2198
    # Loop until end token is found
2201
2199
    while found_token is not token_end:
2248
2246
    timevalue = datetime.timedelta(0)
2249
2247
    for s in interval.split():
2250
2248
        try:
2251
 
            suffix = s[-1]
 
2249
            suffix = unicode(s[-1])
2252
2250
            value = int(s[:-1])
2253
2251
            if suffix == "d":
2254
2252
                delta = datetime.timedelta(value)
2261
2259
            elif suffix == "w":
2262
2260
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
2261
            else:
2264
 
                raise ValueError("Unknown suffix {!r}"
 
2262
                raise ValueError("Unknown suffix {0!r}"
2265
2263
                                 .format(suffix))
2266
2264
        except IndexError as e:
2267
2265
            raise ValueError(*(e.args))
2284
2282
        # Close all standard open file descriptors
2285
2283
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2284
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2285
            raise OSError(errno.ENODEV,
 
2286
                          "{0} not a character device"
2288
2287
                          .format(os.devnull))
2289
2288
        os.dup2(null, sys.stdin.fileno())
2290
2289
        os.dup2(null, sys.stdout.fileno())
2300
2299
    
2301
2300
    parser = argparse.ArgumentParser()
2302
2301
    parser.add_argument("-v", "--version", action="version",
2303
 
                        version = "%(prog)s {}".format(version),
 
2302
                        version = "%(prog)s {0}".format(version),
2304
2303
                        help="show version number and exit")
2305
2304
    parser.add_argument("-i", "--interface", metavar="IF",
2306
2305
                        help="Bind to interface IF")
2339
2338
                        help="Directory to save/restore state in")
2340
2339
    parser.add_argument("--foreground", action="store_true",
2341
2340
                        help="Run in foreground", default=None)
2342
 
    parser.add_argument("--no-zeroconf", action="store_false",
2343
 
                        dest="zeroconf", help="Do not use Zeroconf",
2344
 
                        default=None)
2345
2341
    
2346
2342
    options = parser.parse_args()
2347
2343
    
2356
2352
                        "port": "",
2357
2353
                        "debug": "False",
2358
2354
                        "priority":
2359
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2360
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2355
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2361
2356
                        "servicename": "Mandos",
2362
2357
                        "use_dbus": "True",
2363
2358
                        "use_ipv6": "True",
2366
2361
                        "socket": "",
2367
2362
                        "statedir": "/var/lib/mandos",
2368
2363
                        "foreground": "False",
2369
 
                        "zeroconf": "True",
2370
2364
                        }
2371
2365
    
2372
2366
    # Parse config file for server-global settings
2399
2393
    for option in ("interface", "address", "port", "debug",
2400
2394
                   "priority", "servicename", "configdir",
2401
2395
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2402
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2396
                   "statedir", "socket", "foreground"):
2403
2397
        value = getattr(options, option)
2404
2398
        if value is not None:
2405
2399
            server_settings[option] = value
2406
2400
    del options
2407
2401
    # Force all strings to be unicode
2408
2402
    for option in server_settings.keys():
2409
 
        if isinstance(server_settings[option], bytes):
2410
 
            server_settings[option] = (server_settings[option]
2411
 
                                       .decode("utf-8"))
 
2403
        if type(server_settings[option]) is str:
 
2404
            server_settings[option] = unicode(server_settings[option])
2412
2405
    # Force all boolean options to be boolean
2413
2406
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2414
 
                   "foreground", "zeroconf"):
 
2407
                   "foreground"):
2415
2408
        server_settings[option] = bool(server_settings[option])
2416
2409
    # Debug implies foreground
2417
2410
    if server_settings["debug"]:
2420
2413
    
2421
2414
    ##################################################################
2422
2415
    
2423
 
    if (not server_settings["zeroconf"] and
2424
 
        not (server_settings["port"]
2425
 
             or server_settings["socket"] != "")):
2426
 
            parser.error("Needs port or socket to work without"
2427
 
                         " Zeroconf")
2428
 
    
2429
2416
    # For convenience
2430
2417
    debug = server_settings["debug"]
2431
2418
    debuglevel = server_settings["debuglevel"]
2434
2421
    stored_state_path = os.path.join(server_settings["statedir"],
2435
2422
                                     stored_state_file)
2436
2423
    foreground = server_settings["foreground"]
2437
 
    zeroconf = server_settings["zeroconf"]
2438
2424
    
2439
2425
    if debug:
2440
2426
        initlogger(debug, logging.DEBUG)
2447
2433
    
2448
2434
    if server_settings["servicename"] != "Mandos":
2449
2435
        syslogger.setFormatter(logging.Formatter
2450
 
                               ('Mandos ({}) [%(process)d]:'
 
2436
                               ('Mandos ({0}) [%(process)d]:'
2451
2437
                                ' %(levelname)s: %(message)s'
2452
2438
                                .format(server_settings
2453
2439
                                        ["servicename"])))
2461
2447
    global mandos_dbus_service
2462
2448
    mandos_dbus_service = None
2463
2449
    
2464
 
    socketfd = None
2465
 
    if server_settings["socket"] != "":
2466
 
        socketfd = server_settings["socket"]
2467
2450
    tcp_server = MandosServer((server_settings["address"],
2468
2451
                               server_settings["port"]),
2469
2452
                              ClientHandler,
2473
2456
                              gnutls_priority=
2474
2457
                              server_settings["priority"],
2475
2458
                              use_dbus=use_dbus,
2476
 
                              socketfd=socketfd)
 
2459
                              socketfd=(server_settings["socket"]
 
2460
                                        or None))
2477
2461
    if not foreground:
2478
2462
        pidfilename = "/run/mandos.pid"
2479
2463
        if not os.path.isdir("/run/."):
2549
2533
            use_dbus = False
2550
2534
            server_settings["use_dbus"] = False
2551
2535
            tcp_server.use_dbus = False
2552
 
    if zeroconf:
2553
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2554
 
        service = AvahiServiceToSyslog(name =
2555
 
                                       server_settings["servicename"],
2556
 
                                       servicetype = "_mandos._tcp",
2557
 
                                       protocol = protocol, bus = bus)
2558
 
        if server_settings["interface"]:
2559
 
            service.interface = (if_nametoindex
2560
 
                                 (server_settings["interface"]
2561
 
                                  .encode("utf-8")))
 
2536
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2537
    service = AvahiServiceToSyslog(name =
 
2538
                                   server_settings["servicename"],
 
2539
                                   servicetype = "_mandos._tcp",
 
2540
                                   protocol = protocol, bus = bus)
 
2541
    if server_settings["interface"]:
 
2542
        service.interface = (if_nametoindex
 
2543
                             (str(server_settings["interface"])))
2562
2544
    
2563
2545
    global multiprocessing_manager
2564
2546
    multiprocessing_manager = multiprocessing.Manager()
2588
2570
            os.remove(stored_state_path)
2589
2571
        except IOError as e:
2590
2572
            if e.errno == errno.ENOENT:
2591
 
                logger.warning("Could not load persistent state: {}"
 
2573
                logger.warning("Could not load persistent state: {0}"
2592
2574
                                .format(os.strerror(e.errno)))
2593
2575
            else:
2594
2576
                logger.critical("Could not load persistent state:",
2599
2581
                           "EOFError:", exc_info=e)
2600
2582
    
2601
2583
    with PGPEngine() as pgp:
2602
 
        for client_name, client in clients_data.items():
 
2584
        for client_name, client in clients_data.iteritems():
2603
2585
            # Skip removed clients
2604
2586
            if client_name not in client_settings:
2605
2587
                continue
2630
2612
                if datetime.datetime.utcnow() >= client["expires"]:
2631
2613
                    if not client["last_checked_ok"]:
2632
2614
                        logger.warning(
2633
 
                            "disabling client {} - Client never "
 
2615
                            "disabling client {0} - Client never "
2634
2616
                            "performed a successful checker"
2635
2617
                            .format(client_name))
2636
2618
                        client["enabled"] = False
2637
2619
                    elif client["last_checker_status"] != 0:
2638
2620
                        logger.warning(
2639
 
                            "disabling client {} - Client last"
2640
 
                            " checker failed with error code {}"
 
2621
                            "disabling client {0} - Client "
 
2622
                            "last checker failed with error code {1}"
2641
2623
                            .format(client_name,
2642
2624
                                    client["last_checker_status"]))
2643
2625
                        client["enabled"] = False
2646
2628
                                             .utcnow()
2647
2629
                                             + client["timeout"])
2648
2630
                        logger.debug("Last checker succeeded,"
2649
 
                                     " keeping {} enabled"
 
2631
                                     " keeping {0} enabled"
2650
2632
                                     .format(client_name))
2651
2633
            try:
2652
2634
                client["secret"] = (
2655
2637
                                ["secret"]))
2656
2638
            except PGPError:
2657
2639
                # If decryption fails, we use secret from new settings
2658
 
                logger.debug("Failed to decrypt {} old secret"
 
2640
                logger.debug("Failed to decrypt {0} old secret"
2659
2641
                             .format(client_name))
2660
2642
                client["secret"] = (
2661
2643
                    client_settings[client_name]["secret"])
2669
2651
        clients_data[client_name] = client_settings[client_name]
2670
2652
    
2671
2653
    # Create all client objects
2672
 
    for client_name, client in clients_data.items():
 
2654
    for client_name, client in clients_data.iteritems():
2673
2655
        tcp_server.clients[client_name] = client_class(
2674
2656
            name = client_name, settings = client,
2675
2657
            server_settings = server_settings)
2682
2664
            try:
2683
2665
                with pidfile:
2684
2666
                    pid = os.getpid()
2685
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2667
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2686
2668
            except IOError:
2687
2669
                logger.error("Could not write to file %r with PID %d",
2688
2670
                             pidfilename, pid)
2734
2716
            def GetAllClientsWithProperties(self):
2735
2717
                "D-Bus method"
2736
2718
                return dbus.Dictionary(
2737
 
                    { c.dbus_object_path: c.GetAll("")
2738
 
                      for c in tcp_server.clients.itervalues() },
 
2719
                    ((c.dbus_object_path, c.GetAll(""))
 
2720
                     for c in tcp_server.clients.itervalues()),
2739
2721
                    signature="oa{sv}")
2740
2722
            
2741
2723
            @dbus.service.method(_interface, in_signature="o")
2758
2740
    
2759
2741
    def cleanup():
2760
2742
        "Cleanup function; run on exit"
2761
 
        if zeroconf:
2762
 
            service.cleanup()
 
2743
        service.cleanup()
2763
2744
        
2764
2745
        multiprocessing.active_children()
2765
2746
        wnull.close()
2779
2760
                
2780
2761
                # A list of attributes that can not be pickled
2781
2762
                # + secret.
2782
 
                exclude = { "bus", "changedstate", "secret",
2783
 
                            "checker", "server_settings" }
 
2763
                exclude = set(("bus", "changedstate", "secret",
 
2764
                               "checker", "server_settings"))
2784
2765
                for name, typ in (inspect.getmembers
2785
2766
                                  (dbus.service.Object)):
2786
2767
                    exclude.add(name)
2809
2790
                except NameError:
2810
2791
                    pass
2811
2792
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2812
 
                logger.warning("Could not save persistent state: {}"
 
2793
                logger.warning("Could not save persistent state: {0}"
2813
2794
                               .format(os.strerror(e.errno)))
2814
2795
            else:
2815
2796
                logger.warning("Could not save persistent state:",
2844
2825
    tcp_server.server_activate()
2845
2826
    
2846
2827
    # Find out what port we got
2847
 
    if zeroconf:
2848
 
        service.port = tcp_server.socket.getsockname()[1]
 
2828
    service.port = tcp_server.socket.getsockname()[1]
2849
2829
    if use_ipv6:
2850
2830
        logger.info("Now listening on address %r, port %d,"
2851
2831
                    " flowinfo %d, scope_id %d",
2857
2837
    #service.interface = tcp_server.socket.getsockname()[3]
2858
2838
    
2859
2839
    try:
2860
 
        if zeroconf:
2861
 
            # From the Avahi example code
2862
 
            try:
2863
 
                service.activate()
2864
 
            except dbus.exceptions.DBusException as error:
2865
 
                logger.critical("D-Bus Exception", exc_info=error)
2866
 
                cleanup()
2867
 
                sys.exit(1)
2868
 
            # End of Avahi example code
 
2840
        # From the Avahi example code
 
2841
        try:
 
2842
            service.activate()
 
2843
        except dbus.exceptions.DBusException as error:
 
2844
            logger.critical("D-Bus Exception", exc_info=error)
 
2845
            cleanup()
 
2846
            sys.exit(1)
 
2847
        # End of Avahi example code
2869
2848
        
2870
2849
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2871
2850
                             lambda *args, **kwargs: