/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-10-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
# 
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.9"
 
91
version = "1.6.1"
95
92
stored_state_file = "clients.pickle"
96
93
 
97
94
logger = logging.getLogger()
98
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
99
98
 
100
99
try:
101
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
107
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
107
        with contextlib.closing(socket.socket()) as s:
109
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
112
113
        return interface_index
113
114
 
114
115
 
115
116
def initlogger(debug, level=logging.WARNING):
116
117
    """init logger and add loglevel"""
117
118
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
119
    syslogger.setFormatter(logging.Formatter
124
120
                           ('Mandos [%(process)d]: %(levelname)s:'
125
121
                            ' %(message)s'))
176
172
    def password_encode(self, password):
177
173
        # Passphrase can not be empty and can not contain newlines or
178
174
        # NUL bytes.  So we prefix it and hex encode it.
179
 
        encoded = b"mandos" + binascii.hexlify(password)
180
 
        if len(encoded) > 2048:
181
 
            # GnuPG can't handle long passwords, so encode differently
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
 
                       .replace(b"\n", b"\\n")
184
 
                       .replace(b"\0", b"\\x00"))
185
 
        return encoded
 
175
        return b"mandos" + binascii.hexlify(password)
186
176
    
187
177
    def encrypt(self, data, password):
188
178
        passphrase = self.password_encode(password)
225
215
class AvahiError(Exception):
226
216
    def __init__(self, value, *args, **kwargs):
227
217
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
230
221
 
231
222
class AvahiServiceError(AvahiError):
232
223
    pass
275
266
        self.bus = bus
276
267
        self.entry_group_state_changed_match = None
277
268
    
278
 
    def rename(self, remove=True):
 
269
    def rename(self):
279
270
        """Derived from the Avahi example code"""
280
271
        if self.rename_count >= self.max_renames:
281
272
            logger.critical("No suitable Zeroconf service name found"
282
273
                            " after %i retries, exiting.",
283
274
                            self.rename_count)
284
275
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
287
 
        self.rename_count += 1
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
288
278
        logger.info("Changing Zeroconf service name to %r ...",
289
279
                    self.name)
290
 
        if remove:
291
 
            self.remove()
 
280
        self.remove()
292
281
        try:
293
282
            self.add()
294
283
        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)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
 
285
            self.cleanup()
 
286
            os._exit(1)
 
287
        self.rename_count += 1
303
288
    
304
289
    def remove(self):
305
290
        """Derived from the Avahi example code"""
343
328
            self.rename()
344
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
345
330
            logger.critical("Avahi: Error in group state changed %s",
346
 
                            str(error))
347
 
            raise AvahiGroupError("State changed: {!s}"
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
348
333
                                  .format(error))
349
334
    
350
335
    def cleanup(self):
397
382
 
398
383
 
399
384
class AvahiServiceToSyslog(AvahiService):
400
 
    def rename(self, *args, **kwargs):
 
385
    def rename(self):
401
386
        """Add the new name to the syslog messages"""
402
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
387
        ret = AvahiService.rename(self)
403
388
        syslogger.setFormatter(logging.Formatter
404
 
                               ('Mandos ({}) [%(process)d]:'
 
389
                               ('Mandos ({0}) [%(process)d]:'
405
390
                                ' %(levelname)s: %(message)s'
406
391
                                .format(self.name)))
407
392
        return ret
408
393
 
409
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
 
401
 
410
402
class Client(object):
411
403
    """A representation of a client host served by this server.
412
404
    
467
459
                        "enabled": "True",
468
460
                        }
469
461
    
 
462
    def timeout_milliseconds(self):
 
463
        "Return the 'timeout' attribute in milliseconds"
 
464
        return timedelta_to_milliseconds(self.timeout)
 
465
    
 
466
    def extended_timeout_milliseconds(self):
 
467
        "Return the 'extended_timeout' attribute in milliseconds"
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
 
469
    
 
470
    def interval_milliseconds(self):
 
471
        "Return the 'interval' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.interval)
 
473
    
 
474
    def approval_delay_milliseconds(self):
 
475
        return timedelta_to_milliseconds(self.approval_delay)
 
476
    
470
477
    @staticmethod
471
478
    def config_parser(config):
472
479
        """Construct a new dict of client settings of this form:
487
494
            client["enabled"] = config.getboolean(client_name,
488
495
                                                  "enabled")
489
496
            
490
 
            # Uppercase and remove spaces from fingerprint for later
491
 
            # comparison purposes with return value from the
492
 
            # fingerprint() function
493
497
            client["fingerprint"] = (section["fingerprint"].upper()
494
498
                                     .replace(" ", ""))
495
499
            if "secret" in section:
500
504
                          "rb") as secfile:
501
505
                    client["secret"] = secfile.read()
502
506
            else:
503
 
                raise TypeError("No secret or secfile for section {}"
 
507
                raise TypeError("No secret or secfile for section {0}"
504
508
                                .format(section))
505
509
            client["timeout"] = string_to_delta(section["timeout"])
506
510
            client["extended_timeout"] = string_to_delta(
523
527
            server_settings = {}
524
528
        self.server_settings = server_settings
525
529
        # adding all client settings
526
 
        for setting, value in settings.items():
 
530
        for setting, value in settings.iteritems():
527
531
            setattr(self, setting, value)
528
532
        
529
533
        if self.enabled:
537
541
            self.expires = None
538
542
        
539
543
        logger.debug("Creating client %r", self.name)
 
544
        # Uppercase and remove spaces from fingerprint for later
 
545
        # comparison purposes with return value from the fingerprint()
 
546
        # function
540
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
541
548
        self.created = settings.get("created",
542
549
                                    datetime.datetime.utcnow())
609
616
        if self.checker_initiator_tag is not None:
610
617
            gobject.source_remove(self.checker_initiator_tag)
611
618
        self.checker_initiator_tag = (gobject.timeout_add
612
 
                                      (int(self.interval
613
 
                                           .total_seconds() * 1000),
 
619
                                      (self.interval_milliseconds(),
614
620
                                       self.start_checker))
615
621
        # Schedule a disable() when 'timeout' has passed
616
622
        if self.disable_initiator_tag is not None:
617
623
            gobject.source_remove(self.disable_initiator_tag)
618
624
        self.disable_initiator_tag = (gobject.timeout_add
619
 
                                      (int(self.timeout
620
 
                                           .total_seconds() * 1000),
621
 
                                       self.disable))
 
625
                                   (self.timeout_milliseconds(),
 
626
                                    self.disable))
622
627
        # Also start a new checker *right now*.
623
628
        self.start_checker()
624
629
    
655
660
            self.disable_initiator_tag = None
656
661
        if getattr(self, "enabled", False):
657
662
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (int(timeout.total_seconds()
659
 
                                               * 1000), self.disable))
 
663
                                          (timedelta_to_milliseconds
 
664
                                           (timeout), self.disable))
660
665
            self.expires = datetime.datetime.utcnow() + timeout
661
666
    
662
667
    def need_approval(self):
679
684
        # If a checker exists, make sure it is not a zombie
680
685
        try:
681
686
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
 
        except AttributeError:
683
 
            pass
684
 
        except OSError as error:
685
 
            if error.errno != errno.ECHILD:
686
 
                raise
 
687
        except (AttributeError, OSError) as error:
 
688
            if (isinstance(error, OSError)
 
689
                and error.errno != errno.ECHILD):
 
690
                raise error
687
691
        else:
688
692
            if pid:
689
693
                logger.warning("Checker was a zombie")
693
697
        # Start a new checker if needed
694
698
        if self.checker is None:
695
699
            # Escape attributes for the shell
696
 
            escaped_attrs = { attr:
697
 
                                  re.escape(str(getattr(self, attr)))
698
 
                              for attr in self.runtime_expansions }
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
699
704
            try:
700
705
                command = self.checker_command % escaped_attrs
701
706
            except TypeError as error:
782
787
    # "Set" method, so we fail early here:
783
788
    if byte_arrays and signature != "ay":
784
789
        raise ValueError("Byte arrays not supported for non-'ay'"
785
 
                         " signature {!r}".format(signature))
 
790
                         " signature {0!r}".format(signature))
786
791
    def decorator(func):
787
792
        func._dbus_is_property = True
788
793
        func._dbus_interface = dbus_interface
819
824
    """Decorator to annotate D-Bus methods, signals or properties
820
825
    Usage:
821
826
    
822
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
 
                       "org.freedesktop.DBus.Property."
824
 
                       "EmitsChangedSignal": "false"})
825
827
    @dbus_service_property("org.example.Interface", signature="b",
826
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
827
832
    def Property_dbus_property(self):
828
833
        return dbus.Boolean(False)
829
834
    """
836
841
class DBusPropertyException(dbus.exceptions.DBusException):
837
842
    """A base class for D-Bus property-related exceptions
838
843
    """
839
 
    pass
 
844
    def __unicode__(self):
 
845
        return unicode(str(self))
 
846
 
840
847
 
841
848
class DBusPropertyAccessException(DBusPropertyException):
842
849
    """A property's access permissions disallows an operation.
865
872
        If called like _is_dbus_thing("method") it returns a function
866
873
        suitable for use as predicate to inspect.getmembers().
867
874
        """
868
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
869
876
                                   False)
870
877
    
871
878
    def _get_all_dbus_things(self, thing):
920
927
            # The byte_arrays option is not supported yet on
921
928
            # signatures other than "ay".
922
929
            if prop._dbus_signature != "ay":
923
 
                raise ValueError("Byte arrays not supported for non-"
924
 
                                 "'ay' signature {!r}"
925
 
                                 .format(prop._dbus_signature))
 
930
                raise ValueError
926
931
            value = dbus.ByteArray(b''.join(chr(byte)
927
932
                                            for byte in value))
928
933
        prop(value)
952
957
                                           value.variant_level+1)
953
958
        return dbus.Dictionary(properties, signature="sv")
954
959
    
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
960
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
961
                         out_signature="s",
965
962
                         path_keyword='object_path',
1000
997
                                              (prop,
1001
998
                                               "_dbus_annotations",
1002
999
                                               {}))
1003
 
                        for name, value in annots.items():
 
1000
                        for name, value in annots.iteritems():
1004
1001
                            ann_tag = document.createElement(
1005
1002
                                "annotation")
1006
1003
                            ann_tag.setAttribute("name", name)
1009
1006
                # Add interface annotation tags
1010
1007
                for annotation, value in dict(
1011
1008
                    itertools.chain.from_iterable(
1012
 
                        annotations().items()
 
1009
                        annotations().iteritems()
1013
1010
                        for name, annotations in
1014
1011
                        self._get_all_dbus_things("interface")
1015
1012
                        if name == if_tag.getAttribute("name")
1016
 
                        )).items():
 
1013
                        )).iteritems():
1017
1014
                    ann_tag = document.createElement("annotation")
1018
1015
                    ann_tag.setAttribute("name", annotation)
1019
1016
                    ann_tag.setAttribute("value", value)
1075
1072
    """
1076
1073
    def wrapper(cls):
1077
1074
        for orig_interface_name, alt_interface_name in (
1078
 
            alt_interface_names.items()):
 
1075
            alt_interface_names.iteritems()):
1079
1076
            attr = {}
1080
1077
            interface_names = set()
1081
1078
            # Go though all attributes of the class
1198
1195
                                        attribute.func_closure)))
1199
1196
            if deprecate:
1200
1197
                # Deprecate all alternate interfaces
1201
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
1202
1199
                for interface_name in interface_names:
1203
1200
                    @dbus_interface_annotations(interface_name)
1204
1201
                    def func(self):
1213
1210
            if interface_names:
1214
1211
                # Replace the class with a new subclass of it with
1215
1212
                # methods, signals, etc. as created above.
1216
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
1217
1214
                           (cls,), attr)
1218
1215
        return cls
1219
1216
    return wrapper
1232
1229
    runtime_expansions = (Client.runtime_expansions
1233
1230
                          + ("dbus_object_path",))
1234
1231
    
1235
 
    _interface = "se.recompile.Mandos.Client"
1236
 
    
1237
1232
    # dbus.service.Object doesn't use super(), so we can't either.
1238
1233
    
1239
1234
    def __init__(self, bus = None, *args, **kwargs):
1241
1236
        Client.__init__(self, *args, **kwargs)
1242
1237
        # Only now, when this client is initialized, can it show up on
1243
1238
        # the D-Bus
1244
 
        client_object_name = str(self.name).translate(
 
1239
        client_object_name = unicode(self.name).translate(
1245
1240
            {ord("."): ord("_"),
1246
1241
             ord("-"): ord("_")})
1247
1242
        self.dbus_object_path = (dbus.ObjectPath
1251
1246
    
1252
1247
    def notifychangeproperty(transform_func,
1253
1248
                             dbus_name, type_func=lambda x: x,
1254
 
                             variant_level=1, invalidate_only=False,
1255
 
                             _interface=_interface):
 
1249
                             variant_level=1):
1256
1250
        """ Modify a variable so that it's a property which announces
1257
1251
        its changes to DBus.
1258
1252
        
1263
1257
                   to the D-Bus.  Default: no transform
1264
1258
        variant_level: D-Bus variant level.  Default: 1
1265
1259
        """
1266
 
        attrname = "_{}".format(dbus_name)
 
1260
        attrname = "_{0}".format(dbus_name)
1267
1261
        def setter(self, value):
1268
1262
            if hasattr(self, "dbus_object_path"):
1269
1263
                if (not hasattr(self, attrname) or
1270
1264
                    type_func(getattr(self, attrname, None))
1271
1265
                    != 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())
 
1266
                    dbus_value = transform_func(type_func(value),
 
1267
                                                variant_level
 
1268
                                                =variant_level)
 
1269
                    self.PropertyChanged(dbus.String(dbus_name),
 
1270
                                         dbus_value)
1287
1271
            setattr(self, attrname, value)
1288
1272
        
1289
1273
        return property(lambda self: getattr(self, attrname), setter)
1309
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
1310
1294
                                          "ApprovalDelay",
1311
1295
                                          type_func =
1312
 
                                          lambda td: td.total_seconds()
1313
 
                                          * 1000)
 
1296
                                          timedelta_to_milliseconds)
1314
1297
    approval_duration = notifychangeproperty(
1315
1298
        dbus.UInt64, "ApprovalDuration",
1316
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1299
        type_func = timedelta_to_milliseconds)
1317
1300
    host = notifychangeproperty(dbus.String, "Host")
1318
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
 
                                   type_func = lambda td:
1320
 
                                       td.total_seconds() * 1000)
 
1302
                                   type_func =
 
1303
                                   timedelta_to_milliseconds)
1321
1304
    extended_timeout = notifychangeproperty(
1322
1305
        dbus.UInt64, "ExtendedTimeout",
1323
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1306
        type_func = timedelta_to_milliseconds)
1324
1307
    interval = notifychangeproperty(dbus.UInt64,
1325
1308
                                    "Interval",
1326
1309
                                    type_func =
1327
 
                                    lambda td: td.total_seconds()
1328
 
                                    * 1000)
 
1310
                                    timedelta_to_milliseconds)
1329
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
1330
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
 
                                  invalidate_only=True)
1332
1312
    
1333
1313
    del notifychangeproperty
1334
1314
    
1361
1341
                                       *args, **kwargs)
1362
1342
    
1363
1343
    def start_checker(self, *args, **kwargs):
1364
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1344
        old_checker = self.checker
 
1345
        if self.checker is not None:
 
1346
            old_checker_pid = self.checker.pid
 
1347
        else:
 
1348
            old_checker_pid = None
1365
1349
        r = Client.start_checker(self, *args, **kwargs)
1366
1350
        # Only if new checker process was started
1367
1351
        if (self.checker is not None
1376
1360
    
1377
1361
    def approve(self, value=True):
1378
1362
        self.approved = value
1379
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
 
                                * 1000), self._reset_approved)
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
 
1364
                            (self.approval_duration),
 
1365
                            self._reset_approved)
1381
1366
        self.send_changedstate()
1382
1367
    
1383
1368
    ## D-Bus methods, signals & properties
 
1369
    _interface = "se.recompile.Mandos.Client"
1384
1370
    
1385
1371
    ## Interfaces
1386
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1387
1378
    ## Signals
1388
1379
    
1389
1380
    # CheckerCompleted - signal
1399
1390
        pass
1400
1391
    
1401
1392
    # PropertyChanged - signal
1402
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1403
1393
    @dbus.service.signal(_interface, signature="sv")
1404
1394
    def PropertyChanged(self, property, value):
1405
1395
        "D-Bus signal"
1481
1471
                           access="readwrite")
1482
1472
    def ApprovalDelay_dbus_property(self, value=None):
1483
1473
        if value is None:       # get
1484
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1485
 
                               * 1000)
 
1474
            return dbus.UInt64(self.approval_delay_milliseconds())
1486
1475
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1487
1476
    
1488
1477
    # ApprovalDuration - property
1490
1479
                           access="readwrite")
1491
1480
    def ApprovalDuration_dbus_property(self, value=None):
1492
1481
        if value is None:       # get
1493
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1494
 
                               * 1000)
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
 
1483
                    self.approval_duration))
1495
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1496
1485
    
1497
1486
    # Name - property
1510
1499
    def Host_dbus_property(self, value=None):
1511
1500
        if value is None:       # get
1512
1501
            return dbus.String(self.host)
1513
 
        self.host = str(value)
 
1502
        self.host = unicode(value)
1514
1503
    
1515
1504
    # Created - property
1516
1505
    @dbus_service_property(_interface, signature="s", access="read")
1563
1552
                           access="readwrite")
1564
1553
    def Timeout_dbus_property(self, value=None):
1565
1554
        if value is None:       # get
1566
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1555
            return dbus.UInt64(self.timeout_milliseconds())
1567
1556
        old_timeout = self.timeout
1568
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1569
1558
        # Reschedule disabling
1580
1569
                gobject.source_remove(self.disable_initiator_tag)
1581
1570
                self.disable_initiator_tag = (
1582
1571
                    gobject.timeout_add(
1583
 
                        int((self.expires - now).total_seconds()
1584
 
                            * 1000), self.disable))
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1585
1574
    
1586
1575
    # ExtendedTimeout - property
1587
1576
    @dbus_service_property(_interface, signature="t",
1588
1577
                           access="readwrite")
1589
1578
    def ExtendedTimeout_dbus_property(self, value=None):
1590
1579
        if value is None:       # get
1591
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1592
 
                               * 1000)
 
1580
            return dbus.UInt64(self.extended_timeout_milliseconds())
1593
1581
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
1582
    
1595
1583
    # Interval - property
1597
1585
                           access="readwrite")
1598
1586
    def Interval_dbus_property(self, value=None):
1599
1587
        if value is None:       # get
1600
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1588
            return dbus.UInt64(self.interval_milliseconds())
1601
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
1602
1590
        if getattr(self, "checker_initiator_tag", None) is None:
1603
1591
            return
1614
1602
    def Checker_dbus_property(self, value=None):
1615
1603
        if value is None:       # get
1616
1604
            return dbus.String(self.checker_command)
1617
 
        self.checker_command = str(value)
 
1605
        self.checker_command = unicode(value)
1618
1606
    
1619
1607
    # CheckerRunning - property
1620
1608
    @dbus_service_property(_interface, signature="b",
1636
1624
    @dbus_service_property(_interface, signature="ay",
1637
1625
                           access="write", byte_arrays=True)
1638
1626
    def Secret_dbus_property(self, value):
1639
 
        self.secret = bytes(value)
 
1627
        self.secret = str(value)
1640
1628
    
1641
1629
    del _interface
1642
1630
 
1676
1664
    def handle(self):
1677
1665
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1678
1666
            logger.info("TCP connection from: %s",
1679
 
                        str(self.client_address))
 
1667
                        unicode(self.client_address))
1680
1668
            logger.debug("Pipe FD: %d",
1681
1669
                         self.server.child_pipe.fileno())
1682
1670
            
1708
1696
            logger.debug("Protocol version: %r", line)
1709
1697
            try:
1710
1698
                if int(line.strip().split()[0]) > 1:
1711
 
                    raise RuntimeError(line)
 
1699
                    raise RuntimeError
1712
1700
            except (ValueError, IndexError, RuntimeError) as error:
1713
1701
                logger.error("Unknown protocol version: %s", error)
1714
1702
                return
1763
1751
                        if self.server.use_dbus:
1764
1752
                            # Emit D-Bus signal
1765
1753
                            client.NeedApproval(
1766
 
                                client.approval_delay.total_seconds()
1767
 
                                * 1000, client.approved_by_default)
 
1754
                                client.approval_delay_milliseconds(),
 
1755
                                client.approved_by_default)
1768
1756
                    else:
1769
1757
                        logger.warning("Client %s was not approved",
1770
1758
                                       client.name)
1776
1764
                    #wait until timeout or approved
1777
1765
                    time = datetime.datetime.now()
1778
1766
                    client.changedstate.acquire()
1779
 
                    client.changedstate.wait(delay.total_seconds())
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1780
1770
                    client.changedstate.release()
1781
1771
                    time2 = datetime.datetime.now()
1782
1772
                    if (time2 - time) >= delay:
1919
1909
    
1920
1910
    def add_pipe(self, parent_pipe, proc):
1921
1911
        """Dummy function; override as necessary"""
1922
 
        raise NotImplementedError()
 
1912
        raise NotImplementedError
1923
1913
 
1924
1914
 
1925
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1981
1971
                try:
1982
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1983
1973
                                           SO_BINDTODEVICE,
1984
 
                                           (self.interface + "\0")
1985
 
                                           .encode("utf-8"))
 
1974
                                           str(self.interface + '\0'))
1986
1975
                except socket.error as error:
1987
1976
                    if error.errno == errno.EPERM:
1988
1977
                        logger.error("No permission to bind to"
2191
2180
    token_duration = Token(re.compile(r"P"), None,
2192
2181
                           frozenset((token_year, token_month,
2193
2182
                                      token_day, token_time,
2194
 
                                      token_week)))
 
2183
                                      token_week))),
2195
2184
    # Define starting values
2196
2185
    value = datetime.timedelta() # Value so far
2197
2186
    found_token = None
2198
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
2199
2188
    s = duration                # String left to parse
2200
2189
    # Loop until end token is found
2201
2190
    while found_token is not token_end:
2248
2237
    timevalue = datetime.timedelta(0)
2249
2238
    for s in interval.split():
2250
2239
        try:
2251
 
            suffix = s[-1]
 
2240
            suffix = unicode(s[-1])
2252
2241
            value = int(s[:-1])
2253
2242
            if suffix == "d":
2254
2243
                delta = datetime.timedelta(value)
2261
2250
            elif suffix == "w":
2262
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
2252
            else:
2264
 
                raise ValueError("Unknown suffix {!r}"
 
2253
                raise ValueError("Unknown suffix {0!r}"
2265
2254
                                 .format(suffix))
2266
 
        except IndexError as e:
 
2255
        except (ValueError, IndexError) as e:
2267
2256
            raise ValueError(*(e.args))
2268
2257
        timevalue += delta
2269
2258
    return timevalue
2284
2273
        # Close all standard open file descriptors
2285
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2276
            raise OSError(errno.ENODEV,
 
2277
                          "{0} not a character device"
2288
2278
                          .format(os.devnull))
2289
2279
        os.dup2(null, sys.stdin.fileno())
2290
2280
        os.dup2(null, sys.stdout.fileno())
2300
2290
    
2301
2291
    parser = argparse.ArgumentParser()
2302
2292
    parser.add_argument("-v", "--version", action="version",
2303
 
                        version = "%(prog)s {}".format(version),
 
2293
                        version = "%(prog)s {0}".format(version),
2304
2294
                        help="show version number and exit")
2305
2295
    parser.add_argument("-i", "--interface", metavar="IF",
2306
2296
                        help="Bind to interface IF")
2339
2329
                        help="Directory to save/restore state in")
2340
2330
    parser.add_argument("--foreground", action="store_true",
2341
2331
                        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
2332
    
2346
2333
    options = parser.parse_args()
2347
2334
    
2348
2335
    if options.check:
2349
2336
        import doctest
2350
 
        fail_count, test_count = doctest.testmod()
2351
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2337
        doctest.testmod()
 
2338
        sys.exit()
2352
2339
    
2353
2340
    # Default values for config file for server-global settings
2354
2341
    server_defaults = { "interface": "",
2356
2343
                        "port": "",
2357
2344
                        "debug": "False",
2358
2345
                        "priority":
2359
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2360
2347
                        "servicename": "Mandos",
2361
2348
                        "use_dbus": "True",
2362
2349
                        "use_ipv6": "True",
2365
2352
                        "socket": "",
2366
2353
                        "statedir": "/var/lib/mandos",
2367
2354
                        "foreground": "False",
2368
 
                        "zeroconf": "True",
2369
2355
                        }
2370
2356
    
2371
2357
    # Parse config file for server-global settings
2398
2384
    for option in ("interface", "address", "port", "debug",
2399
2385
                   "priority", "servicename", "configdir",
2400
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2401
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2387
                   "statedir", "socket", "foreground"):
2402
2388
        value = getattr(options, option)
2403
2389
        if value is not None:
2404
2390
            server_settings[option] = value
2405
2391
    del options
2406
2392
    # Force all strings to be unicode
2407
2393
    for option in server_settings.keys():
2408
 
        if isinstance(server_settings[option], bytes):
2409
 
            server_settings[option] = (server_settings[option]
2410
 
                                       .decode("utf-8"))
 
2394
        if type(server_settings[option]) is str:
 
2395
            server_settings[option] = unicode(server_settings[option])
2411
2396
    # Force all boolean options to be boolean
2412
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2413
 
                   "foreground", "zeroconf"):
 
2398
                   "foreground"):
2414
2399
        server_settings[option] = bool(server_settings[option])
2415
2400
    # Debug implies foreground
2416
2401
    if server_settings["debug"]:
2419
2404
    
2420
2405
    ##################################################################
2421
2406
    
2422
 
    if (not server_settings["zeroconf"] and
2423
 
        not (server_settings["port"]
2424
 
             or server_settings["socket"] != "")):
2425
 
            parser.error("Needs port or socket to work without"
2426
 
                         " Zeroconf")
2427
 
    
2428
2407
    # For convenience
2429
2408
    debug = server_settings["debug"]
2430
2409
    debuglevel = server_settings["debuglevel"]
2433
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2434
2413
                                     stored_state_file)
2435
2414
    foreground = server_settings["foreground"]
2436
 
    zeroconf = server_settings["zeroconf"]
2437
2415
    
2438
2416
    if debug:
2439
2417
        initlogger(debug, logging.DEBUG)
2446
2424
    
2447
2425
    if server_settings["servicename"] != "Mandos":
2448
2426
        syslogger.setFormatter(logging.Formatter
2449
 
                               ('Mandos ({}) [%(process)d]:'
 
2427
                               ('Mandos ({0}) [%(process)d]:'
2450
2428
                                ' %(levelname)s: %(message)s'
2451
2429
                                .format(server_settings
2452
2430
                                        ["servicename"])))
2460
2438
    global mandos_dbus_service
2461
2439
    mandos_dbus_service = None
2462
2440
    
2463
 
    socketfd = None
2464
 
    if server_settings["socket"] != "":
2465
 
        socketfd = server_settings["socket"]
2466
2441
    tcp_server = MandosServer((server_settings["address"],
2467
2442
                               server_settings["port"]),
2468
2443
                              ClientHandler,
2472
2447
                              gnutls_priority=
2473
2448
                              server_settings["priority"],
2474
2449
                              use_dbus=use_dbus,
2475
 
                              socketfd=socketfd)
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
2476
2452
    if not foreground:
2477
2453
        pidfilename = "/run/mandos.pid"
2478
 
        if not os.path.isdir("/run/."):
2479
 
            pidfilename = "/var/run/mandos.pid"
2480
2454
        pidfile = None
2481
2455
        try:
2482
2456
            pidfile = open(pidfilename, "w")
2499
2473
        os.setuid(uid)
2500
2474
    except OSError as error:
2501
2475
        if error.errno != errno.EPERM:
2502
 
            raise
 
2476
            raise error
2503
2477
    
2504
2478
    if debug:
2505
2479
        # Enable all possible GnuTLS debugging
2548
2522
            use_dbus = False
2549
2523
            server_settings["use_dbus"] = False
2550
2524
            tcp_server.use_dbus = False
2551
 
    if zeroconf:
2552
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2553
 
        service = AvahiServiceToSyslog(name =
2554
 
                                       server_settings["servicename"],
2555
 
                                       servicetype = "_mandos._tcp",
2556
 
                                       protocol = protocol, bus = bus)
2557
 
        if server_settings["interface"]:
2558
 
            service.interface = (if_nametoindex
2559
 
                                 (server_settings["interface"]
2560
 
                                  .encode("utf-8")))
 
2525
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2526
    service = AvahiServiceToSyslog(name =
 
2527
                                   server_settings["servicename"],
 
2528
                                   servicetype = "_mandos._tcp",
 
2529
                                   protocol = protocol, bus = bus)
 
2530
    if server_settings["interface"]:
 
2531
        service.interface = (if_nametoindex
 
2532
                             (str(server_settings["interface"])))
2561
2533
    
2562
2534
    global multiprocessing_manager
2563
2535
    multiprocessing_manager = multiprocessing.Manager()
2587
2559
            os.remove(stored_state_path)
2588
2560
        except IOError as e:
2589
2561
            if e.errno == errno.ENOENT:
2590
 
                logger.warning("Could not load persistent state: {}"
 
2562
                logger.warning("Could not load persistent state: {0}"
2591
2563
                                .format(os.strerror(e.errno)))
2592
2564
            else:
2593
2565
                logger.critical("Could not load persistent state:",
2598
2570
                           "EOFError:", exc_info=e)
2599
2571
    
2600
2572
    with PGPEngine() as pgp:
2601
 
        for client_name, client in clients_data.items():
 
2573
        for client_name, client in clients_data.iteritems():
2602
2574
            # Skip removed clients
2603
2575
            if client_name not in client_settings:
2604
2576
                continue
2629
2601
                if datetime.datetime.utcnow() >= client["expires"]:
2630
2602
                    if not client["last_checked_ok"]:
2631
2603
                        logger.warning(
2632
 
                            "disabling client {} - Client never "
 
2604
                            "disabling client {0} - Client never "
2633
2605
                            "performed a successful checker"
2634
2606
                            .format(client_name))
2635
2607
                        client["enabled"] = False
2636
2608
                    elif client["last_checker_status"] != 0:
2637
2609
                        logger.warning(
2638
 
                            "disabling client {} - Client last"
2639
 
                            " checker failed with error code {}"
 
2610
                            "disabling client {0} - Client "
 
2611
                            "last checker failed with error code {1}"
2640
2612
                            .format(client_name,
2641
2613
                                    client["last_checker_status"]))
2642
2614
                        client["enabled"] = False
2645
2617
                                             .utcnow()
2646
2618
                                             + client["timeout"])
2647
2619
                        logger.debug("Last checker succeeded,"
2648
 
                                     " keeping {} enabled"
 
2620
                                     " keeping {0} enabled"
2649
2621
                                     .format(client_name))
2650
2622
            try:
2651
2623
                client["secret"] = (
2654
2626
                                ["secret"]))
2655
2627
            except PGPError:
2656
2628
                # If decryption fails, we use secret from new settings
2657
 
                logger.debug("Failed to decrypt {} old secret"
 
2629
                logger.debug("Failed to decrypt {0} old secret"
2658
2630
                             .format(client_name))
2659
2631
                client["secret"] = (
2660
2632
                    client_settings[client_name]["secret"])
2668
2640
        clients_data[client_name] = client_settings[client_name]
2669
2641
    
2670
2642
    # Create all client objects
2671
 
    for client_name, client in clients_data.items():
 
2643
    for client_name, client in clients_data.iteritems():
2672
2644
        tcp_server.clients[client_name] = client_class(
2673
2645
            name = client_name, settings = client,
2674
2646
            server_settings = server_settings)
2681
2653
            try:
2682
2654
                with pidfile:
2683
2655
                    pid = os.getpid()
2684
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2685
2657
            except IOError:
2686
2658
                logger.error("Could not write to file %r with PID %d",
2687
2659
                             pidfilename, pid)
2733
2705
            def GetAllClientsWithProperties(self):
2734
2706
                "D-Bus method"
2735
2707
                return dbus.Dictionary(
2736
 
                    { c.dbus_object_path: c.GetAll("")
2737
 
                      for c in tcp_server.clients.itervalues() },
 
2708
                    ((c.dbus_object_path, c.GetAll(""))
 
2709
                     for c in tcp_server.clients.itervalues()),
2738
2710
                    signature="oa{sv}")
2739
2711
            
2740
2712
            @dbus.service.method(_interface, in_signature="o")
2757
2729
    
2758
2730
    def cleanup():
2759
2731
        "Cleanup function; run on exit"
2760
 
        if zeroconf:
2761
 
            service.cleanup()
 
2732
        service.cleanup()
2762
2733
        
2763
2734
        multiprocessing.active_children()
2764
2735
        wnull.close()
2778
2749
                
2779
2750
                # A list of attributes that can not be pickled
2780
2751
                # + secret.
2781
 
                exclude = { "bus", "changedstate", "secret",
2782
 
                            "checker", "server_settings" }
 
2752
                exclude = set(("bus", "changedstate", "secret",
 
2753
                               "checker", "server_settings"))
2783
2754
                for name, typ in (inspect.getmembers
2784
2755
                                  (dbus.service.Object)):
2785
2756
                    exclude.add(name)
2808
2779
                except NameError:
2809
2780
                    pass
2810
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2811
 
                logger.warning("Could not save persistent state: {}"
 
2782
                logger.warning("Could not save persistent state: {0}"
2812
2783
                               .format(os.strerror(e.errno)))
2813
2784
            else:
2814
2785
                logger.warning("Could not save persistent state:",
2815
2786
                               exc_info=e)
2816
 
                raise
 
2787
                raise e
2817
2788
        
2818
2789
        # Delete all clients, and settings from config
2819
2790
        while tcp_server.clients:
2843
2814
    tcp_server.server_activate()
2844
2815
    
2845
2816
    # Find out what port we got
2846
 
    if zeroconf:
2847
 
        service.port = tcp_server.socket.getsockname()[1]
 
2817
    service.port = tcp_server.socket.getsockname()[1]
2848
2818
    if use_ipv6:
2849
2819
        logger.info("Now listening on address %r, port %d,"
2850
2820
                    " flowinfo %d, scope_id %d",
2856
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2857
2827
    
2858
2828
    try:
2859
 
        if zeroconf:
2860
 
            # From the Avahi example code
2861
 
            try:
2862
 
                service.activate()
2863
 
            except dbus.exceptions.DBusException as error:
2864
 
                logger.critical("D-Bus Exception", exc_info=error)
2865
 
                cleanup()
2866
 
                sys.exit(1)
2867
 
            # End of Avahi example code
 
2829
        # From the Avahi example code
 
2830
        try:
 
2831
            service.activate()
 
2832
        except dbus.exceptions.DBusException as error:
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
 
2834
            cleanup()
 
2835
            sys.exit(1)
 
2836
        # End of Avahi example code
2868
2837
        
2869
2838
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2870
2839
                             lambda *args, **kwargs: