/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: 2014-08-10 14:13:02 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: teddy@recompile.se-20140810141302-8q1xaaxlh8ho5joz
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal.

This deprecates the "se.recompile.Mandos.Client.PropertyChanged"
signal.  The new signal also adds support for noticing changes to the
"se.recompile.Mandos.Client.Secret" write-only property.

* mandos (dbus_annotations): Fix usage example in doc string.
  (DBusObjectWithProperties.PropertiesChanged): New; from D-Bus
                                                standard.
  (ClientDBus._interface): Set early instead of later.
  (ClientDBus.notifychangeproperty): Take new "invalidate_only"
                                     parameter, and pass in _interface
                                     as a default keyword argument.
  (ClientDBus.notifychangeproperty/setter): Also emit
                                            PropertiesChanged signal;
                                            emit new value or
                                            invalidation depending on
                                            "invalidate_only".
  (ClientDBus.secret): Apply notifychangeproperty with
                       "invalidate_only=True".
  (ClientDBus._foo): Removed defunct interface annotation.
  (ClientDBus.PropertyChanged): Add annotation; this method is now
                                deprecated.
  (main/MandosDBusService.GetAllClientsWithProperties): Use dictionary
                                                        comprehension.
* DBUS-API (Mandos Client Interface/Signals/PropertyChanged): Removed.
* mandos-monitor: Use standard "PropertiesChanged" signal instead of
                  old signal "PropertyChanged".
  (MandosClientPropertyCache.__init__): Connect to signal
                                        PropertiesChanged instead of
                                        PropertyChanged.
  (MandosClientPropertyCache._property_changed): Removed.
  (MandosClientPropertyCache.property_changed): Renamed to
                                                "properties_changed"
                                                and adapted to new
                                                call signature.
  (MandosClientWidget.properties_changed): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.0"
 
91
if sys.version_info.major == 2:
 
92
    str = unicode
 
93
 
 
94
version = "1.6.8"
92
95
stored_state_file = "clients.pickle"
93
96
 
94
97
logger = logging.getLogger()
95
 
syslogger = (logging.handlers.SysLogHandler
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
 
              address = str("/dev/log")))
 
98
syslogger = None
98
99
 
99
100
try:
100
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
106
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
108
        with contextlib.closing(socket.socket()) as s:
108
109
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
 
110
                                struct.pack(b"16s16x", interface))
 
111
        interface_index = struct.unpack("I", ifreq[16:20])[0]
113
112
        return interface_index
114
113
 
115
114
 
116
115
def initlogger(debug, level=logging.WARNING):
117
116
    """init logger and add loglevel"""
118
117
    
 
118
    global syslogger
 
119
    syslogger = (logging.handlers.SysLogHandler
 
120
                 (facility =
 
121
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
122
                  address = "/dev/log"))
119
123
    syslogger.setFormatter(logging.Formatter
120
124
                           ('Mandos [%(process)d]: %(levelname)s:'
121
125
                            ' %(message)s'))
172
176
    def password_encode(self, password):
173
177
        # Passphrase can not be empty and can not contain newlines or
174
178
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
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
176
186
    
177
187
    def encrypt(self, data, password):
178
188
        passphrase = self.password_encode(password)
215
225
class AvahiError(Exception):
216
226
    def __init__(self, value, *args, **kwargs):
217
227
        self.value = value
218
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
219
 
    def __unicode__(self):
220
 
        return unicode(repr(self.value))
 
228
        return super(AvahiError, self).__init__(value, *args,
 
229
                                                **kwargs)
221
230
 
222
231
class AvahiServiceError(AvahiError):
223
232
    pass
273
282
                            " after %i retries, exiting.",
274
283
                            self.rename_count)
275
284
            raise AvahiServiceError("Too many renames")
276
 
        self.name = unicode(self.server
277
 
                            .GetAlternativeServiceName(self.name))
 
285
        self.name = str(self.server
 
286
                        .GetAlternativeServiceName(self.name))
278
287
        logger.info("Changing Zeroconf service name to %r ...",
279
288
                    self.name)
280
289
        self.remove()
328
337
            self.rename()
329
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
339
            logger.critical("Avahi: Error in group state changed %s",
331
 
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
 
340
                            str(error))
 
341
            raise AvahiGroupError("State changed: {!s}"
333
342
                                  .format(error))
334
343
    
335
344
    def cleanup(self):
386
395
        """Add the new name to the syslog messages"""
387
396
        ret = AvahiService.rename(self)
388
397
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
 
398
                               ('Mandos ({}) [%(process)d]:'
390
399
                                ' %(levelname)s: %(message)s'
391
400
                                .format(self.name)))
392
401
        return ret
393
402
 
394
403
 
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
 
 
402
404
class Client(object):
403
405
    """A representation of a client host served by this server.
404
406
    
459
461
                        "enabled": "True",
460
462
                        }
461
463
    
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
 
    
477
464
    @staticmethod
478
465
    def config_parser(config):
479
466
        """Construct a new dict of client settings of this form:
504
491
                          "rb") as secfile:
505
492
                    client["secret"] = secfile.read()
506
493
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
 
494
                raise TypeError("No secret or secfile for section {}"
508
495
                                .format(section))
509
496
            client["timeout"] = string_to_delta(section["timeout"])
510
497
            client["extended_timeout"] = string_to_delta(
527
514
            server_settings = {}
528
515
        self.server_settings = server_settings
529
516
        # adding all client settings
530
 
        for setting, value in settings.iteritems():
 
517
        for setting, value in settings.items():
531
518
            setattr(self, setting, value)
532
519
        
533
520
        if self.enabled:
616
603
        if self.checker_initiator_tag is not None:
617
604
            gobject.source_remove(self.checker_initiator_tag)
618
605
        self.checker_initiator_tag = (gobject.timeout_add
619
 
                                      (self.interval_milliseconds(),
 
606
                                      (int(self.interval
 
607
                                           .total_seconds() * 1000),
620
608
                                       self.start_checker))
621
609
        # Schedule a disable() when 'timeout' has passed
622
610
        if self.disable_initiator_tag is not None:
623
611
            gobject.source_remove(self.disable_initiator_tag)
624
612
        self.disable_initiator_tag = (gobject.timeout_add
625
 
                                   (self.timeout_milliseconds(),
626
 
                                    self.disable))
 
613
                                      (int(self.timeout
 
614
                                           .total_seconds() * 1000),
 
615
                                       self.disable))
627
616
        # Also start a new checker *right now*.
628
617
        self.start_checker()
629
618
    
660
649
            self.disable_initiator_tag = None
661
650
        if getattr(self, "enabled", False):
662
651
            self.disable_initiator_tag = (gobject.timeout_add
663
 
                                          (timedelta_to_milliseconds
664
 
                                           (timeout), self.disable))
 
652
                                          (int(timeout.total_seconds()
 
653
                                               * 1000), self.disable))
665
654
            self.expires = datetime.datetime.utcnow() + timeout
666
655
    
667
656
    def need_approval(self):
684
673
        # If a checker exists, make sure it is not a zombie
685
674
        try:
686
675
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
 
        except (AttributeError, OSError) as error:
688
 
            if (isinstance(error, OSError)
689
 
                and error.errno != errno.ECHILD):
690
 
                raise error
 
676
        except AttributeError:
 
677
            pass
 
678
        except OSError as error:
 
679
            if error.errno != errno.ECHILD:
 
680
                raise
691
681
        else:
692
682
            if pid:
693
683
                logger.warning("Checker was a zombie")
697
687
        # Start a new checker if needed
698
688
        if self.checker is None:
699
689
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
 
690
            escaped_attrs = { attr:
 
691
                                  re.escape(str(getattr(self, attr)))
 
692
                              for attr in self.runtime_expansions }
704
693
            try:
705
694
                command = self.checker_command % escaped_attrs
706
695
            except TypeError as error:
787
776
    # "Set" method, so we fail early here:
788
777
    if byte_arrays and signature != "ay":
789
778
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
779
                         " signature {!r}".format(signature))
791
780
    def decorator(func):
792
781
        func._dbus_is_property = True
793
782
        func._dbus_interface = dbus_interface
824
813
    """Decorator to annotate D-Bus methods, signals or properties
825
814
    Usage:
826
815
    
 
816
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
817
                       "org.freedesktop.DBus.Property."
 
818
                       "EmitsChangedSignal": "false"})
827
819
    @dbus_service_property("org.example.Interface", signature="b",
828
820
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
821
    def Property_dbus_property(self):
833
822
        return dbus.Boolean(False)
834
823
    """
841
830
class DBusPropertyException(dbus.exceptions.DBusException):
842
831
    """A base class for D-Bus property-related exceptions
843
832
    """
844
 
    def __unicode__(self):
845
 
        return unicode(str(self))
846
 
 
 
833
    pass
847
834
 
848
835
class DBusPropertyAccessException(DBusPropertyException):
849
836
    """A property's access permissions disallows an operation.
872
859
        If called like _is_dbus_thing("method") it returns a function
873
860
        suitable for use as predicate to inspect.getmembers().
874
861
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
862
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
876
863
                                   False)
877
864
    
878
865
    def _get_all_dbus_things(self, thing):
927
914
            # The byte_arrays option is not supported yet on
928
915
            # signatures other than "ay".
929
916
            if prop._dbus_signature != "ay":
930
 
                raise ValueError
 
917
                raise ValueError("Byte arrays not supported for non-"
 
918
                                 "'ay' signature {!r}"
 
919
                                 .format(prop._dbus_signature))
931
920
            value = dbus.ByteArray(b''.join(chr(byte)
932
921
                                            for byte in value))
933
922
        prop(value)
957
946
                                           value.variant_level+1)
958
947
        return dbus.Dictionary(properties, signature="sv")
959
948
    
 
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
    
960
957
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
958
                         out_signature="s",
962
959
                         path_keyword='object_path',
997
994
                                              (prop,
998
995
                                               "_dbus_annotations",
999
996
                                               {}))
1000
 
                        for name, value in annots.iteritems():
 
997
                        for name, value in annots.items():
1001
998
                            ann_tag = document.createElement(
1002
999
                                "annotation")
1003
1000
                            ann_tag.setAttribute("name", name)
1006
1003
                # Add interface annotation tags
1007
1004
                for annotation, value in dict(
1008
1005
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
 
1006
                        annotations().items()
1010
1007
                        for name, annotations in
1011
1008
                        self._get_all_dbus_things("interface")
1012
1009
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
 
1010
                        )).items():
1014
1011
                    ann_tag = document.createElement("annotation")
1015
1012
                    ann_tag.setAttribute("name", annotation)
1016
1013
                    ann_tag.setAttribute("value", value)
1072
1069
    """
1073
1070
    def wrapper(cls):
1074
1071
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
 
1072
            alt_interface_names.items()):
1076
1073
            attr = {}
1077
1074
            interface_names = set()
1078
1075
            # Go though all attributes of the class
1195
1192
                                        attribute.func_closure)))
1196
1193
            if deprecate:
1197
1194
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1195
                iname="_AlternateDBusNames_interface_annotation{}"
1199
1196
                for interface_name in interface_names:
1200
1197
                    @dbus_interface_annotations(interface_name)
1201
1198
                    def func(self):
1210
1207
            if interface_names:
1211
1208
                # Replace the class with a new subclass of it with
1212
1209
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1210
                cls = type(b"{}Alternate".format(cls.__name__),
1214
1211
                           (cls,), attr)
1215
1212
        return cls
1216
1213
    return wrapper
1229
1226
    runtime_expansions = (Client.runtime_expansions
1230
1227
                          + ("dbus_object_path",))
1231
1228
    
 
1229
    _interface = "se.recompile.Mandos.Client"
 
1230
    
1232
1231
    # dbus.service.Object doesn't use super(), so we can't either.
1233
1232
    
1234
1233
    def __init__(self, bus = None, *args, **kwargs):
1236
1235
        Client.__init__(self, *args, **kwargs)
1237
1236
        # Only now, when this client is initialized, can it show up on
1238
1237
        # the D-Bus
1239
 
        client_object_name = unicode(self.name).translate(
 
1238
        client_object_name = str(self.name).translate(
1240
1239
            {ord("."): ord("_"),
1241
1240
             ord("-"): ord("_")})
1242
1241
        self.dbus_object_path = (dbus.ObjectPath
1246
1245
    
1247
1246
    def notifychangeproperty(transform_func,
1248
1247
                             dbus_name, type_func=lambda x: x,
1249
 
                             variant_level=1):
 
1248
                             variant_level=1, invalidate_only=False,
 
1249
                             _interface=_interface):
1250
1250
        """ Modify a variable so that it's a property which announces
1251
1251
        its changes to DBus.
1252
1252
        
1257
1257
                   to the D-Bus.  Default: no transform
1258
1258
        variant_level: D-Bus variant level.  Default: 1
1259
1259
        """
1260
 
        attrname = "_{0}".format(dbus_name)
 
1260
        attrname = "_{}".format(dbus_name)
1261
1261
        def setter(self, value):
1262
1262
            if hasattr(self, "dbus_object_path"):
1263
1263
                if (not hasattr(self, attrname) or
1264
1264
                    type_func(getattr(self, attrname, None))
1265
1265
                    != type_func(value)):
1266
 
                    dbus_value = transform_func(type_func(value),
1267
 
                                                variant_level
1268
 
                                                =variant_level)
1269
 
                    self.PropertyChanged(dbus.String(dbus_name),
1270
 
                                         dbus_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())
1271
1281
            setattr(self, attrname, value)
1272
1282
        
1273
1283
        return property(lambda self: getattr(self, attrname), setter)
1293
1303
    approval_delay = notifychangeproperty(dbus.UInt64,
1294
1304
                                          "ApprovalDelay",
1295
1305
                                          type_func =
1296
 
                                          timedelta_to_milliseconds)
 
1306
                                          lambda td: td.total_seconds()
 
1307
                                          * 1000)
1297
1308
    approval_duration = notifychangeproperty(
1298
1309
        dbus.UInt64, "ApprovalDuration",
1299
 
        type_func = timedelta_to_milliseconds)
 
1310
        type_func = lambda td: td.total_seconds() * 1000)
1300
1311
    host = notifychangeproperty(dbus.String, "Host")
1301
1312
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1302
 
                                   type_func =
1303
 
                                   timedelta_to_milliseconds)
 
1313
                                   type_func = lambda td:
 
1314
                                       td.total_seconds() * 1000)
1304
1315
    extended_timeout = notifychangeproperty(
1305
1316
        dbus.UInt64, "ExtendedTimeout",
1306
 
        type_func = timedelta_to_milliseconds)
 
1317
        type_func = lambda td: td.total_seconds() * 1000)
1307
1318
    interval = notifychangeproperty(dbus.UInt64,
1308
1319
                                    "Interval",
1309
1320
                                    type_func =
1310
 
                                    timedelta_to_milliseconds)
 
1321
                                    lambda td: td.total_seconds()
 
1322
                                    * 1000)
1311
1323
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1324
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1325
                                  invalidate_only=True)
1312
1326
    
1313
1327
    del notifychangeproperty
1314
1328
    
1341
1355
                                       *args, **kwargs)
1342
1356
    
1343
1357
    def start_checker(self, *args, **kwargs):
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
 
1358
        old_checker_pid = getattr(self.checker, "pid", None)
1349
1359
        r = Client.start_checker(self, *args, **kwargs)
1350
1360
        # Only if new checker process was started
1351
1361
        if (self.checker is not None
1360
1370
    
1361
1371
    def approve(self, value=True):
1362
1372
        self.approved = value
1363
 
        gobject.timeout_add(timedelta_to_milliseconds
1364
 
                            (self.approval_duration),
1365
 
                            self._reset_approved)
 
1373
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1374
                                * 1000), self._reset_approved)
1366
1375
        self.send_changedstate()
1367
1376
    
1368
1377
    ## D-Bus methods, signals & properties
1369
 
    _interface = "se.recompile.Mandos.Client"
1370
1378
    
1371
1379
    ## Interfaces
1372
1380
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1381
    ## Signals
1379
1382
    
1380
1383
    # CheckerCompleted - signal
1390
1393
        pass
1391
1394
    
1392
1395
    # PropertyChanged - signal
 
1396
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1393
1397
    @dbus.service.signal(_interface, signature="sv")
1394
1398
    def PropertyChanged(self, property, value):
1395
1399
        "D-Bus signal"
1471
1475
                           access="readwrite")
1472
1476
    def ApprovalDelay_dbus_property(self, value=None):
1473
1477
        if value is None:       # get
1474
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1478
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1479
                               * 1000)
1475
1480
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1476
1481
    
1477
1482
    # ApprovalDuration - property
1479
1484
                           access="readwrite")
1480
1485
    def ApprovalDuration_dbus_property(self, value=None):
1481
1486
        if value is None:       # get
1482
 
            return dbus.UInt64(timedelta_to_milliseconds(
1483
 
                    self.approval_duration))
 
1487
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1488
                               * 1000)
1484
1489
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1485
1490
    
1486
1491
    # Name - property
1499
1504
    def Host_dbus_property(self, value=None):
1500
1505
        if value is None:       # get
1501
1506
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1507
        self.host = str(value)
1503
1508
    
1504
1509
    # Created - property
1505
1510
    @dbus_service_property(_interface, signature="s", access="read")
1552
1557
                           access="readwrite")
1553
1558
    def Timeout_dbus_property(self, value=None):
1554
1559
        if value is None:       # get
1555
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1560
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1556
1561
        old_timeout = self.timeout
1557
1562
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
1563
        # Reschedule disabling
1569
1574
                gobject.source_remove(self.disable_initiator_tag)
1570
1575
                self.disable_initiator_tag = (
1571
1576
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1577
                        int((self.expires - now).total_seconds()
 
1578
                            * 1000), self.disable))
1574
1579
    
1575
1580
    # ExtendedTimeout - property
1576
1581
    @dbus_service_property(_interface, signature="t",
1577
1582
                           access="readwrite")
1578
1583
    def ExtendedTimeout_dbus_property(self, value=None):
1579
1584
        if value is None:       # get
1580
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1585
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1586
                               * 1000)
1581
1587
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1582
1588
    
1583
1589
    # Interval - property
1585
1591
                           access="readwrite")
1586
1592
    def Interval_dbus_property(self, value=None):
1587
1593
        if value is None:       # get
1588
 
            return dbus.UInt64(self.interval_milliseconds())
 
1594
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
1595
        self.interval = datetime.timedelta(0, 0, 0, value)
1590
1596
        if getattr(self, "checker_initiator_tag", None) is None:
1591
1597
            return
1602
1608
    def Checker_dbus_property(self, value=None):
1603
1609
        if value is None:       # get
1604
1610
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1611
        self.checker_command = str(value)
1606
1612
    
1607
1613
    # CheckerRunning - property
1608
1614
    @dbus_service_property(_interface, signature="b",
1624
1630
    @dbus_service_property(_interface, signature="ay",
1625
1631
                           access="write", byte_arrays=True)
1626
1632
    def Secret_dbus_property(self, value):
1627
 
        self.secret = str(value)
 
1633
        self.secret = bytes(value)
1628
1634
    
1629
1635
    del _interface
1630
1636
 
1664
1670
    def handle(self):
1665
1671
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
1672
            logger.info("TCP connection from: %s",
1667
 
                        unicode(self.client_address))
 
1673
                        str(self.client_address))
1668
1674
            logger.debug("Pipe FD: %d",
1669
1675
                         self.server.child_pipe.fileno())
1670
1676
            
1696
1702
            logger.debug("Protocol version: %r", line)
1697
1703
            try:
1698
1704
                if int(line.strip().split()[0]) > 1:
1699
 
                    raise RuntimeError
 
1705
                    raise RuntimeError(line)
1700
1706
            except (ValueError, IndexError, RuntimeError) as error:
1701
1707
                logger.error("Unknown protocol version: %s", error)
1702
1708
                return
1751
1757
                        if self.server.use_dbus:
1752
1758
                            # Emit D-Bus signal
1753
1759
                            client.NeedApproval(
1754
 
                                client.approval_delay_milliseconds(),
1755
 
                                client.approved_by_default)
 
1760
                                client.approval_delay.total_seconds()
 
1761
                                * 1000, client.approved_by_default)
1756
1762
                    else:
1757
1763
                        logger.warning("Client %s was not approved",
1758
1764
                                       client.name)
1764
1770
                    #wait until timeout or approved
1765
1771
                    time = datetime.datetime.now()
1766
1772
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1773
                    client.changedstate.wait(delay.total_seconds())
1770
1774
                    client.changedstate.release()
1771
1775
                    time2 = datetime.datetime.now()
1772
1776
                    if (time2 - time) >= delay:
1909
1913
    
1910
1914
    def add_pipe(self, parent_pipe, proc):
1911
1915
        """Dummy function; override as necessary"""
1912
 
        raise NotImplementedError
 
1916
        raise NotImplementedError()
1913
1917
 
1914
1918
 
1915
1919
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1971
1975
                try:
1972
1976
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1977
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1978
                                           (self.interface + "\0")
 
1979
                                           .encode("utf-8"))
1975
1980
                except socket.error as error:
1976
1981
                    if error.errno == errno.EPERM:
1977
1982
                        logger.error("No permission to bind to"
2180
2185
    token_duration = Token(re.compile(r"P"), None,
2181
2186
                           frozenset((token_year, token_month,
2182
2187
                                      token_day, token_time,
2183
 
                                      token_week))),
 
2188
                                      token_week)))
2184
2189
    # Define starting values
2185
2190
    value = datetime.timedelta() # Value so far
2186
2191
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2192
    followers = frozenset((token_duration,)) # Following valid tokens
2188
2193
    s = duration                # String left to parse
2189
2194
    # Loop until end token is found
2190
2195
    while found_token is not token_end:
2237
2242
    timevalue = datetime.timedelta(0)
2238
2243
    for s in interval.split():
2239
2244
        try:
2240
 
            suffix = unicode(s[-1])
 
2245
            suffix = s[-1]
2241
2246
            value = int(s[:-1])
2242
2247
            if suffix == "d":
2243
2248
                delta = datetime.timedelta(value)
2250
2255
            elif suffix == "w":
2251
2256
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
2257
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
 
2258
                raise ValueError("Unknown suffix {!r}"
2254
2259
                                 .format(suffix))
2255
 
        except (ValueError, IndexError) as e:
 
2260
        except IndexError as e:
2256
2261
            raise ValueError(*(e.args))
2257
2262
        timevalue += delta
2258
2263
    return timevalue
2273
2278
        # Close all standard open file descriptors
2274
2279
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2275
2280
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
 
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
 
2281
            raise OSError(errno.ENODEV, "{} not a character device"
2278
2282
                          .format(os.devnull))
2279
2283
        os.dup2(null, sys.stdin.fileno())
2280
2284
        os.dup2(null, sys.stdout.fileno())
2290
2294
    
2291
2295
    parser = argparse.ArgumentParser()
2292
2296
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
2297
                        version = "%(prog)s {}".format(version),
2294
2298
                        help="show version number and exit")
2295
2299
    parser.add_argument("-i", "--interface", metavar="IF",
2296
2300
                        help="Bind to interface IF")
2329
2333
                        help="Directory to save/restore state in")
2330
2334
    parser.add_argument("--foreground", action="store_true",
2331
2335
                        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)
2332
2339
    
2333
2340
    options = parser.parse_args()
2334
2341
    
2335
2342
    if options.check:
2336
2343
        import doctest
2337
 
        doctest.testmod()
2338
 
        sys.exit()
 
2344
        fail_count, test_count = doctest.testmod()
 
2345
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2339
2346
    
2340
2347
    # Default values for config file for server-global settings
2341
2348
    server_defaults = { "interface": "",
2343
2350
                        "port": "",
2344
2351
                        "debug": "False",
2345
2352
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
2353
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2347
2354
                        "servicename": "Mandos",
2348
2355
                        "use_dbus": "True",
2349
2356
                        "use_ipv6": "True",
2352
2359
                        "socket": "",
2353
2360
                        "statedir": "/var/lib/mandos",
2354
2361
                        "foreground": "False",
 
2362
                        "zeroconf": "True",
2355
2363
                        }
2356
2364
    
2357
2365
    # Parse config file for server-global settings
2384
2392
    for option in ("interface", "address", "port", "debug",
2385
2393
                   "priority", "servicename", "configdir",
2386
2394
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
2395
                   "statedir", "socket", "foreground", "zeroconf"):
2388
2396
        value = getattr(options, option)
2389
2397
        if value is not None:
2390
2398
            server_settings[option] = value
2391
2399
    del options
2392
2400
    # Force all strings to be unicode
2393
2401
    for option in server_settings.keys():
2394
 
        if type(server_settings[option]) is str:
2395
 
            server_settings[option] = unicode(server_settings[option])
 
2402
        if isinstance(server_settings[option], bytes):
 
2403
            server_settings[option] = (server_settings[option]
 
2404
                                       .decode("utf-8"))
2396
2405
    # Force all boolean options to be boolean
2397
2406
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
 
2407
                   "foreground", "zeroconf"):
2399
2408
        server_settings[option] = bool(server_settings[option])
2400
2409
    # Debug implies foreground
2401
2410
    if server_settings["debug"]:
2404
2413
    
2405
2414
    ##################################################################
2406
2415
    
 
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
    
2407
2422
    # For convenience
2408
2423
    debug = server_settings["debug"]
2409
2424
    debuglevel = server_settings["debuglevel"]
2412
2427
    stored_state_path = os.path.join(server_settings["statedir"],
2413
2428
                                     stored_state_file)
2414
2429
    foreground = server_settings["foreground"]
 
2430
    zeroconf = server_settings["zeroconf"]
2415
2431
    
2416
2432
    if debug:
2417
2433
        initlogger(debug, logging.DEBUG)
2424
2440
    
2425
2441
    if server_settings["servicename"] != "Mandos":
2426
2442
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
 
2443
                               ('Mandos ({}) [%(process)d]:'
2428
2444
                                ' %(levelname)s: %(message)s'
2429
2445
                                .format(server_settings
2430
2446
                                        ["servicename"])))
2438
2454
    global mandos_dbus_service
2439
2455
    mandos_dbus_service = None
2440
2456
    
 
2457
    socketfd = None
 
2458
    if server_settings["socket"] != "":
 
2459
        socketfd = server_settings["socket"]
2441
2460
    tcp_server = MandosServer((server_settings["address"],
2442
2461
                               server_settings["port"]),
2443
2462
                              ClientHandler,
2447
2466
                              gnutls_priority=
2448
2467
                              server_settings["priority"],
2449
2468
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
 
2469
                              socketfd=socketfd)
2452
2470
    if not foreground:
2453
 
        pidfilename = "/var/run/mandos.pid"
 
2471
        pidfilename = "/run/mandos.pid"
 
2472
        if not os.path.isdir("/run/."):
 
2473
            pidfilename = "/var/run/mandos.pid"
2454
2474
        pidfile = None
2455
2475
        try:
2456
2476
            pidfile = open(pidfilename, "w")
2473
2493
        os.setuid(uid)
2474
2494
    except OSError as error:
2475
2495
        if error.errno != errno.EPERM:
2476
 
            raise error
 
2496
            raise
2477
2497
    
2478
2498
    if debug:
2479
2499
        # Enable all possible GnuTLS debugging
2522
2542
            use_dbus = False
2523
2543
            server_settings["use_dbus"] = False
2524
2544
            tcp_server.use_dbus = False
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"])))
 
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")))
2533
2555
    
2534
2556
    global multiprocessing_manager
2535
2557
    multiprocessing_manager = multiprocessing.Manager()
2559
2581
            os.remove(stored_state_path)
2560
2582
        except IOError as e:
2561
2583
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
 
2584
                logger.warning("Could not load persistent state: {}"
2563
2585
                                .format(os.strerror(e.errno)))
2564
2586
            else:
2565
2587
                logger.critical("Could not load persistent state:",
2570
2592
                           "EOFError:", exc_info=e)
2571
2593
    
2572
2594
    with PGPEngine() as pgp:
2573
 
        for client_name, client in clients_data.iteritems():
 
2595
        for client_name, client in clients_data.items():
2574
2596
            # Skip removed clients
2575
2597
            if client_name not in client_settings:
2576
2598
                continue
2601
2623
                if datetime.datetime.utcnow() >= client["expires"]:
2602
2624
                    if not client["last_checked_ok"]:
2603
2625
                        logger.warning(
2604
 
                            "disabling client {0} - Client never "
 
2626
                            "disabling client {} - Client never "
2605
2627
                            "performed a successful checker"
2606
2628
                            .format(client_name))
2607
2629
                        client["enabled"] = False
2608
2630
                    elif client["last_checker_status"] != 0:
2609
2631
                        logger.warning(
2610
 
                            "disabling client {0} - Client "
2611
 
                            "last checker failed with error code {1}"
 
2632
                            "disabling client {} - Client last"
 
2633
                            " checker failed with error code {}"
2612
2634
                            .format(client_name,
2613
2635
                                    client["last_checker_status"]))
2614
2636
                        client["enabled"] = False
2617
2639
                                             .utcnow()
2618
2640
                                             + client["timeout"])
2619
2641
                        logger.debug("Last checker succeeded,"
2620
 
                                     " keeping {0} enabled"
 
2642
                                     " keeping {} enabled"
2621
2643
                                     .format(client_name))
2622
2644
            try:
2623
2645
                client["secret"] = (
2626
2648
                                ["secret"]))
2627
2649
            except PGPError:
2628
2650
                # If decryption fails, we use secret from new settings
2629
 
                logger.debug("Failed to decrypt {0} old secret"
 
2651
                logger.debug("Failed to decrypt {} old secret"
2630
2652
                             .format(client_name))
2631
2653
                client["secret"] = (
2632
2654
                    client_settings[client_name]["secret"])
2640
2662
        clients_data[client_name] = client_settings[client_name]
2641
2663
    
2642
2664
    # Create all client objects
2643
 
    for client_name, client in clients_data.iteritems():
 
2665
    for client_name, client in clients_data.items():
2644
2666
        tcp_server.clients[client_name] = client_class(
2645
2667
            name = client_name, settings = client,
2646
2668
            server_settings = server_settings)
2653
2675
            try:
2654
2676
                with pidfile:
2655
2677
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2678
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2657
2679
            except IOError:
2658
2680
                logger.error("Could not write to file %r with PID %d",
2659
2681
                             pidfilename, pid)
2705
2727
            def GetAllClientsWithProperties(self):
2706
2728
                "D-Bus method"
2707
2729
                return dbus.Dictionary(
2708
 
                    ((c.dbus_object_path, c.GetAll(""))
2709
 
                     for c in tcp_server.clients.itervalues()),
 
2730
                    { c.dbus_object_path: c.GetAll("")
 
2731
                      for c in tcp_server.clients.itervalues() },
2710
2732
                    signature="oa{sv}")
2711
2733
            
2712
2734
            @dbus.service.method(_interface, in_signature="o")
2729
2751
    
2730
2752
    def cleanup():
2731
2753
        "Cleanup function; run on exit"
2732
 
        service.cleanup()
 
2754
        if zeroconf:
 
2755
            service.cleanup()
2733
2756
        
2734
2757
        multiprocessing.active_children()
2735
2758
        wnull.close()
2749
2772
                
2750
2773
                # A list of attributes that can not be pickled
2751
2774
                # + secret.
2752
 
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
 
2775
                exclude = { "bus", "changedstate", "secret",
 
2776
                            "checker", "server_settings" }
2754
2777
                for name, typ in (inspect.getmembers
2755
2778
                                  (dbus.service.Object)):
2756
2779
                    exclude.add(name)
2779
2802
                except NameError:
2780
2803
                    pass
2781
2804
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
 
2805
                logger.warning("Could not save persistent state: {}"
2783
2806
                               .format(os.strerror(e.errno)))
2784
2807
            else:
2785
2808
                logger.warning("Could not save persistent state:",
2786
2809
                               exc_info=e)
2787
 
                raise e
 
2810
                raise
2788
2811
        
2789
2812
        # Delete all clients, and settings from config
2790
2813
        while tcp_server.clients:
2814
2837
    tcp_server.server_activate()
2815
2838
    
2816
2839
    # Find out what port we got
2817
 
    service.port = tcp_server.socket.getsockname()[1]
 
2840
    if zeroconf:
 
2841
        service.port = tcp_server.socket.getsockname()[1]
2818
2842
    if use_ipv6:
2819
2843
        logger.info("Now listening on address %r, port %d,"
2820
2844
                    " flowinfo %d, scope_id %d",
2826
2850
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2851
    
2828
2852
    try:
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
 
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
2837
2862
        
2838
2863
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2839
2864
                             lambda *args, **kwargs: