/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-09 13:18:46 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: teddy@recompile.se-20140809131846-2emd272mf9c9wihe
mandos: Replace unicode() with str().

This is in preparation for the coming Python 3 conversion.

* mandos: Replace "str" with "unicode".  All callers changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
68
68
import binascii
69
69
import tempfile
70
70
import itertools
 
71
import collections
71
72
 
72
73
import dbus
73
74
import dbus.service
78
79
import ctypes.util
79
80
import xml.dom.minidom
80
81
import inspect
81
 
import GnuPGInterface
82
82
 
83
83
try:
84
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
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'))
139
143
class PGPEngine(object):
140
144
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
145
    def __init__(self):
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
146
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
 
        self.gnupg = GnuPGInterface.GnuPG()
145
 
        self.gnupg.options.meta_interactive = False
146
 
        self.gnupg.options.homedir = self.tempdir
147
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
147
        self.gnupgargs = ['--batch',
 
148
                          '--home', self.tempdir,
 
149
                          '--force-mdc',
 
150
                          '--quiet',
 
151
                          '--no-use-agent']
150
152
    
151
153
    def __enter__(self):
152
154
        return self
174
176
    def password_encode(self, password):
175
177
        # Passphrase can not be empty and can not contain newlines or
176
178
        # NUL bytes.  So we prefix it and hex encode it.
177
 
        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
178
186
    
179
187
    def encrypt(self, data, password):
180
 
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
182
 
            try:
183
 
                proc = self.gnupg.run(['--symmetric'],
184
 
                                      create_fhs=['stdin', 'stdout'],
185
 
                                      attach_fhs={'stderr': devnull})
186
 
                with contextlib.closing(proc.handles['stdin']) as f:
187
 
                    f.write(data)
188
 
                with contextlib.closing(proc.handles['stdout']) as f:
189
 
                    ciphertext = f.read()
190
 
                proc.wait()
191
 
            except IOError as e:
192
 
                raise PGPError(e)
193
 
        self.gnupg.passphrase = None
 
188
        passphrase = self.password_encode(password)
 
189
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
190
                                         ) as passfile:
 
191
            passfile.write(passphrase)
 
192
            passfile.flush()
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
 
194
                                     '--passphrase-file',
 
195
                                     passfile.name]
 
196
                                    + self.gnupgargs,
 
197
                                    stdin = subprocess.PIPE,
 
198
                                    stdout = subprocess.PIPE,
 
199
                                    stderr = subprocess.PIPE)
 
200
            ciphertext, err = proc.communicate(input = data)
 
201
        if proc.returncode != 0:
 
202
            raise PGPError(err)
194
203
        return ciphertext
195
204
    
196
205
    def decrypt(self, data, password):
197
 
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
199
 
            try:
200
 
                proc = self.gnupg.run(['--decrypt'],
201
 
                                      create_fhs=['stdin', 'stdout'],
202
 
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
204
 
                    f.write(data)
205
 
                with contextlib.closing(proc.handles['stdout']) as f:
206
 
                    decrypted_plaintext = f.read()
207
 
                proc.wait()
208
 
            except IOError as e:
209
 
                raise PGPError(e)
210
 
        self.gnupg.passphrase = None
 
206
        passphrase = self.password_encode(password)
 
207
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
208
                                         ) as passfile:
 
209
            passfile.write(passphrase)
 
210
            passfile.flush()
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
 
212
                                     '--passphrase-file',
 
213
                                     passfile.name]
 
214
                                    + self.gnupgargs,
 
215
                                    stdin = subprocess.PIPE,
 
216
                                    stdout = subprocess.PIPE,
 
217
                                    stderr = subprocess.PIPE)
 
218
            decrypted_plaintext, err = proc.communicate(input
 
219
                                                        = data)
 
220
        if proc.returncode != 0:
 
221
            raise PGPError(err)
211
222
        return decrypted_plaintext
212
223
 
213
224
 
214
225
class AvahiError(Exception):
215
226
    def __init__(self, value, *args, **kwargs):
216
227
        self.value = value
217
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
218
 
    def __unicode__(self):
219
 
        return unicode(repr(self.value))
 
228
        return super(AvahiError, self).__init__(value, *args,
 
229
                                                **kwargs)
220
230
 
221
231
class AvahiServiceError(AvahiError):
222
232
    pass
233
243
               Used to optionally bind to the specified interface.
234
244
    name: string; Example: 'Mandos'
235
245
    type: string; Example: '_mandos._tcp'.
236
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
237
247
    port: integer; what port to announce
238
248
    TXT: list of strings; TXT record for the service
239
249
    domain: string; Domain to publish on, default to .local if empty.
272
282
                            " after %i retries, exiting.",
273
283
                            self.rename_count)
274
284
            raise AvahiServiceError("Too many renames")
275
 
        self.name = unicode(self.server
276
 
                            .GetAlternativeServiceName(self.name))
 
285
        self.name = str(self.server
 
286
                        .GetAlternativeServiceName(self.name))
277
287
        logger.info("Changing Zeroconf service name to %r ...",
278
288
                    self.name)
279
289
        self.remove()
327
337
            self.rename()
328
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
339
            logger.critical("Avahi: Error in group state changed %s",
330
 
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
 
340
                            str(error))
 
341
            raise AvahiGroupError("State changed: {!s}"
332
342
                                  .format(error))
333
343
    
334
344
    def cleanup(self):
385
395
        """Add the new name to the syslog messages"""
386
396
        ret = AvahiService.rename(self)
387
397
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
 
398
                               ('Mandos ({}) [%(process)d]:'
389
399
                                ' %(levelname)s: %(message)s'
390
400
                                .format(self.name)))
391
401
        return ret
392
402
 
393
403
 
394
 
def timedelta_to_milliseconds(td):
395
 
    "Convert a datetime.timedelta() to milliseconds"
396
 
    return ((td.days * 24 * 60 * 60 * 1000)
397
 
            + (td.seconds * 1000)
398
 
            + (td.microseconds // 1000))
399
 
 
400
 
 
401
404
class Client(object):
402
405
    """A representation of a client host served by this server.
403
406
    
439
442
    runtime_expansions: Allowed attributes for runtime expansion.
440
443
    expires:    datetime.datetime(); time (UTC) when a client will be
441
444
                disabled, or None
 
445
    server_settings: The server_settings dict from main()
442
446
    """
443
447
    
444
448
    runtime_expansions = ("approval_delay", "approval_duration",
446
450
                          "fingerprint", "host", "interval",
447
451
                          "last_approval_request", "last_checked_ok",
448
452
                          "last_enabled", "name", "timeout")
449
 
    client_defaults = { "timeout": "5m",
450
 
                        "extended_timeout": "15m",
451
 
                        "interval": "2m",
 
453
    client_defaults = { "timeout": "PT5M",
 
454
                        "extended_timeout": "PT15M",
 
455
                        "interval": "PT2M",
452
456
                        "checker": "fping -q -- %%(host)s",
453
457
                        "host": "",
454
 
                        "approval_delay": "0s",
455
 
                        "approval_duration": "1s",
 
458
                        "approval_delay": "PT0S",
 
459
                        "approval_duration": "PT1S",
456
460
                        "approved_by_default": "True",
457
461
                        "enabled": "True",
458
462
                        }
459
463
    
460
 
    def timeout_milliseconds(self):
461
 
        "Return the 'timeout' attribute in milliseconds"
462
 
        return timedelta_to_milliseconds(self.timeout)
463
 
    
464
 
    def extended_timeout_milliseconds(self):
465
 
        "Return the 'extended_timeout' attribute in milliseconds"
466
 
        return timedelta_to_milliseconds(self.extended_timeout)
467
 
    
468
 
    def interval_milliseconds(self):
469
 
        "Return the 'interval' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.interval)
471
 
    
472
 
    def approval_delay_milliseconds(self):
473
 
        return timedelta_to_milliseconds(self.approval_delay)
474
 
    
475
464
    @staticmethod
476
465
    def config_parser(config):
477
466
        """Construct a new dict of client settings of this form:
502
491
                          "rb") as secfile:
503
492
                    client["secret"] = secfile.read()
504
493
            else:
505
 
                raise TypeError("No secret or secfile for section {0}"
 
494
                raise TypeError("No secret or secfile for section {}"
506
495
                                .format(section))
507
496
            client["timeout"] = string_to_delta(section["timeout"])
508
497
            client["extended_timeout"] = string_to_delta(
519
508
        
520
509
        return settings
521
510
    
522
 
    def __init__(self, settings, name = None):
 
511
    def __init__(self, settings, name = None, server_settings=None):
523
512
        self.name = name
 
513
        if server_settings is None:
 
514
            server_settings = {}
 
515
        self.server_settings = server_settings
524
516
        # adding all client settings
525
 
        for setting, value in settings.iteritems():
 
517
        for setting, value in settings.items():
526
518
            setattr(self, setting, value)
527
519
        
528
520
        if self.enabled:
611
603
        if self.checker_initiator_tag is not None:
612
604
            gobject.source_remove(self.checker_initiator_tag)
613
605
        self.checker_initiator_tag = (gobject.timeout_add
614
 
                                      (self.interval_milliseconds(),
 
606
                                      (int(self.interval
 
607
                                           .total_seconds() * 1000),
615
608
                                       self.start_checker))
616
609
        # Schedule a disable() when 'timeout' has passed
617
610
        if self.disable_initiator_tag is not None:
618
611
            gobject.source_remove(self.disable_initiator_tag)
619
612
        self.disable_initiator_tag = (gobject.timeout_add
620
 
                                   (self.timeout_milliseconds(),
621
 
                                    self.disable))
 
613
                                      (int(self.timeout
 
614
                                           .total_seconds() * 1000),
 
615
                                       self.disable))
622
616
        # Also start a new checker *right now*.
623
617
        self.start_checker()
624
618
    
655
649
            self.disable_initiator_tag = None
656
650
        if getattr(self, "enabled", False):
657
651
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (timedelta_to_milliseconds
659
 
                                           (timeout), self.disable))
 
652
                                          (int(timeout.total_seconds()
 
653
                                               * 1000), self.disable))
660
654
            self.expires = datetime.datetime.utcnow() + timeout
661
655
    
662
656
    def need_approval(self):
679
673
        # If a checker exists, make sure it is not a zombie
680
674
        try:
681
675
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
 
        except (AttributeError, OSError) as error:
683
 
            if (isinstance(error, OSError)
684
 
                and error.errno != errno.ECHILD):
685
 
                raise error
 
676
        except AttributeError:
 
677
            pass
 
678
        except OSError as error:
 
679
            if error.errno != errno.ECHILD:
 
680
                raise
686
681
        else:
687
682
            if pid:
688
683
                logger.warning("Checker was a zombie")
692
687
        # Start a new checker if needed
693
688
        if self.checker is None:
694
689
            # Escape attributes for the shell
695
 
            escaped_attrs = dict(
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
697
 
                for attr in
698
 
                self.runtime_expansions)
 
690
            escaped_attrs = { attr:
 
691
                                  re.escape(str(getattr(self, attr)))
 
692
                              for attr in self.runtime_expansions }
699
693
            try:
700
694
                command = self.checker_command % escaped_attrs
701
695
            except TypeError as error:
710
704
                # in normal mode, that is already done by daemon(),
711
705
                # and in debug mode we don't want to.  (Stdin is
712
706
                # always replaced by /dev/null.)
 
707
                # The exception is when not debugging but nevertheless
 
708
                # running in the foreground; use the previously
 
709
                # created wnull.
 
710
                popen_args = {}
 
711
                if (not self.server_settings["debug"]
 
712
                    and self.server_settings["foreground"]):
 
713
                    popen_args.update({"stdout": wnull,
 
714
                                       "stderr": wnull })
713
715
                self.checker = subprocess.Popen(command,
714
716
                                                close_fds=True,
715
 
                                                shell=True, cwd="/")
 
717
                                                shell=True, cwd="/",
 
718
                                                **popen_args)
716
719
            except OSError as error:
717
720
                logger.error("Failed to start subprocess",
718
721
                             exc_info=error)
 
722
                return True
719
723
            self.checker_callback_tag = (gobject.child_watch_add
720
724
                                         (self.checker.pid,
721
725
                                          self.checker_callback,
722
726
                                          data=command))
723
727
            # The checker may have completed before the gobject
724
728
            # watch was added.  Check for this.
725
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
729
            try:
 
730
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
731
            except OSError as error:
 
732
                if error.errno == errno.ECHILD:
 
733
                    # This should never happen
 
734
                    logger.error("Child process vanished",
 
735
                                 exc_info=error)
 
736
                    return True
 
737
                raise
726
738
            if pid:
727
739
                gobject.source_remove(self.checker_callback_tag)
728
740
                self.checker_callback(pid, status, command)
764
776
    # "Set" method, so we fail early here:
765
777
    if byte_arrays and signature != "ay":
766
778
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
779
                         " signature {!r}".format(signature))
768
780
    def decorator(func):
769
781
        func._dbus_is_property = True
770
782
        func._dbus_interface = dbus_interface
818
830
class DBusPropertyException(dbus.exceptions.DBusException):
819
831
    """A base class for D-Bus property-related exceptions
820
832
    """
821
 
    def __unicode__(self):
822
 
        return unicode(str(self))
823
 
 
 
833
    pass
824
834
 
825
835
class DBusPropertyAccessException(DBusPropertyException):
826
836
    """A property's access permissions disallows an operation.
849
859
        If called like _is_dbus_thing("method") it returns a function
850
860
        suitable for use as predicate to inspect.getmembers().
851
861
        """
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
862
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
853
863
                                   False)
854
864
    
855
865
    def _get_all_dbus_things(self, thing):
904
914
            # The byte_arrays option is not supported yet on
905
915
            # signatures other than "ay".
906
916
            if prop._dbus_signature != "ay":
907
 
                raise ValueError
 
917
                raise ValueError("Byte arrays not supported for non-"
 
918
                                 "'ay' signature {!r}"
 
919
                                 .format(prop._dbus_signature))
908
920
            value = dbus.ByteArray(b''.join(chr(byte)
909
921
                                            for byte in value))
910
922
        prop(value)
974
986
                                              (prop,
975
987
                                               "_dbus_annotations",
976
988
                                               {}))
977
 
                        for name, value in annots.iteritems():
 
989
                        for name, value in annots.items():
978
990
                            ann_tag = document.createElement(
979
991
                                "annotation")
980
992
                            ann_tag.setAttribute("name", name)
983
995
                # Add interface annotation tags
984
996
                for annotation, value in dict(
985
997
                    itertools.chain.from_iterable(
986
 
                        annotations().iteritems()
 
998
                        annotations().items()
987
999
                        for name, annotations in
988
1000
                        self._get_all_dbus_things("interface")
989
1001
                        if name == if_tag.getAttribute("name")
990
 
                        )).iteritems():
 
1002
                        )).items():
991
1003
                    ann_tag = document.createElement("annotation")
992
1004
                    ann_tag.setAttribute("name", annotation)
993
1005
                    ann_tag.setAttribute("value", value)
1049
1061
    """
1050
1062
    def wrapper(cls):
1051
1063
        for orig_interface_name, alt_interface_name in (
1052
 
            alt_interface_names.iteritems()):
 
1064
            alt_interface_names.items()):
1053
1065
            attr = {}
1054
1066
            interface_names = set()
1055
1067
            # Go though all attributes of the class
1068
1080
                interface_names.add(alt_interface)
1069
1081
                # Is this a D-Bus signal?
1070
1082
                if getattr(attribute, "_dbus_is_signal", False):
1071
 
                    # Extract the original non-method function by
1072
 
                    # black magic
 
1083
                    # Extract the original non-method undecorated
 
1084
                    # function by black magic
1073
1085
                    nonmethod_func = (dict(
1074
1086
                            zip(attribute.func_code.co_freevars,
1075
1087
                                attribute.__closure__))["func"]
1172
1184
                                        attribute.func_closure)))
1173
1185
            if deprecate:
1174
1186
                # Deprecate all alternate interfaces
1175
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1187
                iname="_AlternateDBusNames_interface_annotation{}"
1176
1188
                for interface_name in interface_names:
1177
1189
                    @dbus_interface_annotations(interface_name)
1178
1190
                    def func(self):
1187
1199
            if interface_names:
1188
1200
                # Replace the class with a new subclass of it with
1189
1201
                # methods, signals, etc. as created above.
1190
 
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1202
                cls = type(b"{}Alternate".format(cls.__name__),
1191
1203
                           (cls,), attr)
1192
1204
        return cls
1193
1205
    return wrapper
1213
1225
        Client.__init__(self, *args, **kwargs)
1214
1226
        # Only now, when this client is initialized, can it show up on
1215
1227
        # the D-Bus
1216
 
        client_object_name = unicode(self.name).translate(
 
1228
        client_object_name = str(self.name).translate(
1217
1229
            {ord("."): ord("_"),
1218
1230
             ord("-"): ord("_")})
1219
1231
        self.dbus_object_path = (dbus.ObjectPath
1234
1246
                   to the D-Bus.  Default: no transform
1235
1247
        variant_level: D-Bus variant level.  Default: 1
1236
1248
        """
1237
 
        attrname = "_{0}".format(dbus_name)
 
1249
        attrname = "_{}".format(dbus_name)
1238
1250
        def setter(self, value):
1239
1251
            if hasattr(self, "dbus_object_path"):
1240
1252
                if (not hasattr(self, attrname) or
1270
1282
    approval_delay = notifychangeproperty(dbus.UInt64,
1271
1283
                                          "ApprovalDelay",
1272
1284
                                          type_func =
1273
 
                                          timedelta_to_milliseconds)
 
1285
                                          lambda td: td.total_seconds()
 
1286
                                          * 1000)
1274
1287
    approval_duration = notifychangeproperty(
1275
1288
        dbus.UInt64, "ApprovalDuration",
1276
 
        type_func = timedelta_to_milliseconds)
 
1289
        type_func = lambda td: td.total_seconds() * 1000)
1277
1290
    host = notifychangeproperty(dbus.String, "Host")
1278
1291
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1279
 
                                   type_func =
1280
 
                                   timedelta_to_milliseconds)
 
1292
                                   type_func = lambda td:
 
1293
                                       td.total_seconds() * 1000)
1281
1294
    extended_timeout = notifychangeproperty(
1282
1295
        dbus.UInt64, "ExtendedTimeout",
1283
 
        type_func = timedelta_to_milliseconds)
 
1296
        type_func = lambda td: td.total_seconds() * 1000)
1284
1297
    interval = notifychangeproperty(dbus.UInt64,
1285
1298
                                    "Interval",
1286
1299
                                    type_func =
1287
 
                                    timedelta_to_milliseconds)
 
1300
                                    lambda td: td.total_seconds()
 
1301
                                    * 1000)
1288
1302
    checker_command = notifychangeproperty(dbus.String, "Checker")
1289
1303
    
1290
1304
    del notifychangeproperty
1318
1332
                                       *args, **kwargs)
1319
1333
    
1320
1334
    def start_checker(self, *args, **kwargs):
1321
 
        old_checker = self.checker
1322
 
        if self.checker is not None:
1323
 
            old_checker_pid = self.checker.pid
1324
 
        else:
1325
 
            old_checker_pid = None
 
1335
        old_checker_pid = getattr(self.checker, "pid", None)
1326
1336
        r = Client.start_checker(self, *args, **kwargs)
1327
1337
        # Only if new checker process was started
1328
1338
        if (self.checker is not None
1337
1347
    
1338
1348
    def approve(self, value=True):
1339
1349
        self.approved = value
1340
 
        gobject.timeout_add(timedelta_to_milliseconds
1341
 
                            (self.approval_duration),
1342
 
                            self._reset_approved)
 
1350
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1351
                                * 1000), self._reset_approved)
1343
1352
        self.send_changedstate()
1344
1353
    
1345
1354
    ## D-Bus methods, signals & properties
1448
1457
                           access="readwrite")
1449
1458
    def ApprovalDelay_dbus_property(self, value=None):
1450
1459
        if value is None:       # get
1451
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1460
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1461
                               * 1000)
1452
1462
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1453
1463
    
1454
1464
    # ApprovalDuration - property
1456
1466
                           access="readwrite")
1457
1467
    def ApprovalDuration_dbus_property(self, value=None):
1458
1468
        if value is None:       # get
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
1460
 
                    self.approval_duration))
 
1469
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1470
                               * 1000)
1461
1471
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1462
1472
    
1463
1473
    # Name - property
1476
1486
    def Host_dbus_property(self, value=None):
1477
1487
        if value is None:       # get
1478
1488
            return dbus.String(self.host)
1479
 
        self.host = unicode(value)
 
1489
        self.host = str(value)
1480
1490
    
1481
1491
    # Created - property
1482
1492
    @dbus_service_property(_interface, signature="s", access="read")
1529
1539
                           access="readwrite")
1530
1540
    def Timeout_dbus_property(self, value=None):
1531
1541
        if value is None:       # get
1532
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1542
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1533
1543
        old_timeout = self.timeout
1534
1544
        self.timeout = datetime.timedelta(0, 0, 0, value)
1535
1545
        # Reschedule disabling
1546
1556
                gobject.source_remove(self.disable_initiator_tag)
1547
1557
                self.disable_initiator_tag = (
1548
1558
                    gobject.timeout_add(
1549
 
                        timedelta_to_milliseconds(self.expires - now),
1550
 
                        self.disable))
 
1559
                        int((self.expires - now).total_seconds()
 
1560
                            * 1000), self.disable))
1551
1561
    
1552
1562
    # ExtendedTimeout - property
1553
1563
    @dbus_service_property(_interface, signature="t",
1554
1564
                           access="readwrite")
1555
1565
    def ExtendedTimeout_dbus_property(self, value=None):
1556
1566
        if value is None:       # get
1557
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1567
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1568
                               * 1000)
1558
1569
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1559
1570
    
1560
1571
    # Interval - property
1562
1573
                           access="readwrite")
1563
1574
    def Interval_dbus_property(self, value=None):
1564
1575
        if value is None:       # get
1565
 
            return dbus.UInt64(self.interval_milliseconds())
 
1576
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1566
1577
        self.interval = datetime.timedelta(0, 0, 0, value)
1567
1578
        if getattr(self, "checker_initiator_tag", None) is None:
1568
1579
            return
1579
1590
    def Checker_dbus_property(self, value=None):
1580
1591
        if value is None:       # get
1581
1592
            return dbus.String(self.checker_command)
1582
 
        self.checker_command = unicode(value)
 
1593
        self.checker_command = str(value)
1583
1594
    
1584
1595
    # CheckerRunning - property
1585
1596
    @dbus_service_property(_interface, signature="b",
1601
1612
    @dbus_service_property(_interface, signature="ay",
1602
1613
                           access="write", byte_arrays=True)
1603
1614
    def Secret_dbus_property(self, value):
1604
 
        self.secret = str(value)
 
1615
        self.secret = bytes(value)
1605
1616
    
1606
1617
    del _interface
1607
1618
 
1641
1652
    def handle(self):
1642
1653
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1643
1654
            logger.info("TCP connection from: %s",
1644
 
                        unicode(self.client_address))
 
1655
                        str(self.client_address))
1645
1656
            logger.debug("Pipe FD: %d",
1646
1657
                         self.server.child_pipe.fileno())
1647
1658
            
1673
1684
            logger.debug("Protocol version: %r", line)
1674
1685
            try:
1675
1686
                if int(line.strip().split()[0]) > 1:
1676
 
                    raise RuntimeError
 
1687
                    raise RuntimeError(line)
1677
1688
            except (ValueError, IndexError, RuntimeError) as error:
1678
1689
                logger.error("Unknown protocol version: %s", error)
1679
1690
                return
1728
1739
                        if self.server.use_dbus:
1729
1740
                            # Emit D-Bus signal
1730
1741
                            client.NeedApproval(
1731
 
                                client.approval_delay_milliseconds(),
1732
 
                                client.approved_by_default)
 
1742
                                client.approval_delay.total_seconds()
 
1743
                                * 1000, client.approved_by_default)
1733
1744
                    else:
1734
1745
                        logger.warning("Client %s was not approved",
1735
1746
                                       client.name)
1741
1752
                    #wait until timeout or approved
1742
1753
                    time = datetime.datetime.now()
1743
1754
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1755
                    client.changedstate.wait(delay.total_seconds())
1747
1756
                    client.changedstate.release()
1748
1757
                    time2 = datetime.datetime.now()
1749
1758
                    if (time2 - time) >= delay:
1886
1895
    
1887
1896
    def add_pipe(self, parent_pipe, proc):
1888
1897
        """Dummy function; override as necessary"""
1889
 
        raise NotImplementedError
 
1898
        raise NotImplementedError()
1890
1899
 
1891
1900
 
1892
1901
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1948
1957
                try:
1949
1958
                    self.socket.setsockopt(socket.SOL_SOCKET,
1950
1959
                                           SO_BINDTODEVICE,
1951
 
                                           str(self.interface + '\0'))
 
1960
                                           (self.interface + "\0")
 
1961
                                           .encode("utf-8"))
1952
1962
                except socket.error as error:
1953
1963
                    if error.errno == errno.EPERM:
1954
1964
                        logger.error("No permission to bind to"
1968
1978
                if self.address_family == socket.AF_INET6:
1969
1979
                    any_address = "::" # in6addr_any
1970
1980
                else:
1971
 
                    any_address = socket.INADDR_ANY
 
1981
                    any_address = "0.0.0.0" # INADDR_ANY
1972
1982
                self.server_address = (any_address,
1973
1983
                                       self.server_address[1])
1974
1984
            elif not self.server_address[1]:
2090
2100
        return True
2091
2101
 
2092
2102
 
 
2103
def rfc3339_duration_to_delta(duration):
 
2104
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2105
    
 
2106
    >>> rfc3339_duration_to_delta("P7D")
 
2107
    datetime.timedelta(7)
 
2108
    >>> rfc3339_duration_to_delta("PT60S")
 
2109
    datetime.timedelta(0, 60)
 
2110
    >>> rfc3339_duration_to_delta("PT60M")
 
2111
    datetime.timedelta(0, 3600)
 
2112
    >>> rfc3339_duration_to_delta("PT24H")
 
2113
    datetime.timedelta(1)
 
2114
    >>> rfc3339_duration_to_delta("P1W")
 
2115
    datetime.timedelta(7)
 
2116
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2117
    datetime.timedelta(0, 330)
 
2118
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2119
    datetime.timedelta(1, 200)
 
2120
    """
 
2121
    
 
2122
    # Parsing an RFC 3339 duration with regular expressions is not
 
2123
    # possible - there would have to be multiple places for the same
 
2124
    # values, like seconds.  The current code, while more esoteric, is
 
2125
    # cleaner without depending on a parsing library.  If Python had a
 
2126
    # built-in library for parsing we would use it, but we'd like to
 
2127
    # avoid excessive use of external libraries.
 
2128
    
 
2129
    # New type for defining tokens, syntax, and semantics all-in-one
 
2130
    Token = collections.namedtuple("Token",
 
2131
                                   ("regexp", # To match token; if
 
2132
                                              # "value" is not None,
 
2133
                                              # must have a "group"
 
2134
                                              # containing digits
 
2135
                                    "value",  # datetime.timedelta or
 
2136
                                              # None
 
2137
                                    "followers")) # Tokens valid after
 
2138
                                                  # this token
 
2139
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2140
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2141
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2142
    token_second = Token(re.compile(r"(\d+)S"),
 
2143
                         datetime.timedelta(seconds=1),
 
2144
                         frozenset((token_end,)))
 
2145
    token_minute = Token(re.compile(r"(\d+)M"),
 
2146
                         datetime.timedelta(minutes=1),
 
2147
                         frozenset((token_second, token_end)))
 
2148
    token_hour = Token(re.compile(r"(\d+)H"),
 
2149
                       datetime.timedelta(hours=1),
 
2150
                       frozenset((token_minute, token_end)))
 
2151
    token_time = Token(re.compile(r"T"),
 
2152
                       None,
 
2153
                       frozenset((token_hour, token_minute,
 
2154
                                  token_second)))
 
2155
    token_day = Token(re.compile(r"(\d+)D"),
 
2156
                      datetime.timedelta(days=1),
 
2157
                      frozenset((token_time, token_end)))
 
2158
    token_month = Token(re.compile(r"(\d+)M"),
 
2159
                        datetime.timedelta(weeks=4),
 
2160
                        frozenset((token_day, token_end)))
 
2161
    token_year = Token(re.compile(r"(\d+)Y"),
 
2162
                       datetime.timedelta(weeks=52),
 
2163
                       frozenset((token_month, token_end)))
 
2164
    token_week = Token(re.compile(r"(\d+)W"),
 
2165
                       datetime.timedelta(weeks=1),
 
2166
                       frozenset((token_end,)))
 
2167
    token_duration = Token(re.compile(r"P"), None,
 
2168
                           frozenset((token_year, token_month,
 
2169
                                      token_day, token_time,
 
2170
                                      token_week)))
 
2171
    # Define starting values
 
2172
    value = datetime.timedelta() # Value so far
 
2173
    found_token = None
 
2174
    followers = frozenset((token_duration,)) # Following valid tokens
 
2175
    s = duration                # String left to parse
 
2176
    # Loop until end token is found
 
2177
    while found_token is not token_end:
 
2178
        # Search for any currently valid tokens
 
2179
        for token in followers:
 
2180
            match = token.regexp.match(s)
 
2181
            if match is not None:
 
2182
                # Token found
 
2183
                if token.value is not None:
 
2184
                    # Value found, parse digits
 
2185
                    factor = int(match.group(1), 10)
 
2186
                    # Add to value so far
 
2187
                    value += factor * token.value
 
2188
                # Strip token from string
 
2189
                s = token.regexp.sub("", s, 1)
 
2190
                # Go to found token
 
2191
                found_token = token
 
2192
                # Set valid next tokens
 
2193
                followers = found_token.followers
 
2194
                break
 
2195
        else:
 
2196
            # No currently valid tokens were found
 
2197
            raise ValueError("Invalid RFC 3339 duration")
 
2198
    # End token found
 
2199
    return value
 
2200
 
 
2201
 
2093
2202
def string_to_delta(interval):
2094
2203
    """Parse a string and return a datetime.timedelta
2095
2204
    
2106
2215
    >>> string_to_delta('5m 30s')
2107
2216
    datetime.timedelta(0, 330)
2108
2217
    """
 
2218
    
 
2219
    try:
 
2220
        return rfc3339_duration_to_delta(interval)
 
2221
    except ValueError:
 
2222
        pass
 
2223
    
2109
2224
    timevalue = datetime.timedelta(0)
2110
2225
    for s in interval.split():
2111
2226
        try:
2112
 
            suffix = unicode(s[-1])
 
2227
            suffix = s[-1]
2113
2228
            value = int(s[:-1])
2114
2229
            if suffix == "d":
2115
2230
                delta = datetime.timedelta(value)
2122
2237
            elif suffix == "w":
2123
2238
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2124
2239
            else:
2125
 
                raise ValueError("Unknown suffix {0!r}"
 
2240
                raise ValueError("Unknown suffix {!r}"
2126
2241
                                 .format(suffix))
2127
 
        except (ValueError, IndexError) as e:
 
2242
        except IndexError as e:
2128
2243
            raise ValueError(*(e.args))
2129
2244
        timevalue += delta
2130
2245
    return timevalue
2145
2260
        # Close all standard open file descriptors
2146
2261
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2147
2262
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2148
 
            raise OSError(errno.ENODEV,
2149
 
                          "{0} not a character device"
 
2263
            raise OSError(errno.ENODEV, "{} not a character device"
2150
2264
                          .format(os.devnull))
2151
2265
        os.dup2(null, sys.stdin.fileno())
2152
2266
        os.dup2(null, sys.stdout.fileno())
2162
2276
    
2163
2277
    parser = argparse.ArgumentParser()
2164
2278
    parser.add_argument("-v", "--version", action="version",
2165
 
                        version = "%(prog)s {0}".format(version),
 
2279
                        version = "%(prog)s {}".format(version),
2166
2280
                        help="show version number and exit")
2167
2281
    parser.add_argument("-i", "--interface", metavar="IF",
2168
2282
                        help="Bind to interface IF")
2174
2288
                        help="Run self-test")
2175
2289
    parser.add_argument("--debug", action="store_true",
2176
2290
                        help="Debug mode; run in foreground and log"
2177
 
                        " to terminal")
 
2291
                        " to terminal", default=None)
2178
2292
    parser.add_argument("--debuglevel", metavar="LEVEL",
2179
2293
                        help="Debug level for stdout output")
2180
2294
    parser.add_argument("--priority", help="GnuTLS"
2187
2301
                        " files")
2188
2302
    parser.add_argument("--no-dbus", action="store_false",
2189
2303
                        dest="use_dbus", help="Do not provide D-Bus"
2190
 
                        " system bus interface")
 
2304
                        " system bus interface", default=None)
2191
2305
    parser.add_argument("--no-ipv6", action="store_false",
2192
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2306
                        dest="use_ipv6", help="Do not use IPv6",
 
2307
                        default=None)
2193
2308
    parser.add_argument("--no-restore", action="store_false",
2194
2309
                        dest="restore", help="Do not restore stored"
2195
 
                        " state")
 
2310
                        " state", default=None)
2196
2311
    parser.add_argument("--socket", type=int,
2197
2312
                        help="Specify a file descriptor to a network"
2198
2313
                        " socket to use instead of creating one")
2199
2314
    parser.add_argument("--statedir", metavar="DIR",
2200
2315
                        help="Directory to save/restore state in")
2201
2316
    parser.add_argument("--foreground", action="store_true",
2202
 
                        help="Run in foreground")
 
2317
                        help="Run in foreground", default=None)
 
2318
    parser.add_argument("--no-zeroconf", action="store_false",
 
2319
                        dest="zeroconf", help="Do not use Zeroconf",
 
2320
                        default=None)
2203
2321
    
2204
2322
    options = parser.parse_args()
2205
2323
    
2206
2324
    if options.check:
2207
2325
        import doctest
2208
 
        doctest.testmod()
2209
 
        sys.exit()
 
2326
        fail_count, test_count = doctest.testmod()
 
2327
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2210
2328
    
2211
2329
    # Default values for config file for server-global settings
2212
2330
    server_defaults = { "interface": "",
2214
2332
                        "port": "",
2215
2333
                        "debug": "False",
2216
2334
                        "priority":
2217
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2335
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2218
2336
                        "servicename": "Mandos",
2219
2337
                        "use_dbus": "True",
2220
2338
                        "use_ipv6": "True",
2223
2341
                        "socket": "",
2224
2342
                        "statedir": "/var/lib/mandos",
2225
2343
                        "foreground": "False",
 
2344
                        "zeroconf": "True",
2226
2345
                        }
2227
2346
    
2228
2347
    # Parse config file for server-global settings
2255
2374
    for option in ("interface", "address", "port", "debug",
2256
2375
                   "priority", "servicename", "configdir",
2257
2376
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2258
 
                   "statedir", "socket", "foreground"):
 
2377
                   "statedir", "socket", "foreground", "zeroconf"):
2259
2378
        value = getattr(options, option)
2260
2379
        if value is not None:
2261
2380
            server_settings[option] = value
2262
2381
    del options
2263
2382
    # Force all strings to be unicode
2264
2383
    for option in server_settings.keys():
2265
 
        if type(server_settings[option]) is str:
2266
 
            server_settings[option] = unicode(server_settings[option])
 
2384
        if isinstance(server_settings[option], bytes):
 
2385
            server_settings[option] = (server_settings[option]
 
2386
                                       .decode("utf-8"))
 
2387
    # Force all boolean options to be boolean
 
2388
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2389
                   "foreground", "zeroconf"):
 
2390
        server_settings[option] = bool(server_settings[option])
2267
2391
    # Debug implies foreground
2268
2392
    if server_settings["debug"]:
2269
2393
        server_settings["foreground"] = True
2271
2395
    
2272
2396
    ##################################################################
2273
2397
    
 
2398
    if (not server_settings["zeroconf"] and
 
2399
        not (server_settings["port"]
 
2400
             or server_settings["socket"] != "")):
 
2401
            parser.error("Needs port or socket to work without"
 
2402
                         " Zeroconf")
 
2403
    
2274
2404
    # For convenience
2275
2405
    debug = server_settings["debug"]
2276
2406
    debuglevel = server_settings["debuglevel"]
2279
2409
    stored_state_path = os.path.join(server_settings["statedir"],
2280
2410
                                     stored_state_file)
2281
2411
    foreground = server_settings["foreground"]
 
2412
    zeroconf = server_settings["zeroconf"]
2282
2413
    
2283
2414
    if debug:
2284
2415
        initlogger(debug, logging.DEBUG)
2291
2422
    
2292
2423
    if server_settings["servicename"] != "Mandos":
2293
2424
        syslogger.setFormatter(logging.Formatter
2294
 
                               ('Mandos ({0}) [%(process)d]:'
 
2425
                               ('Mandos ({}) [%(process)d]:'
2295
2426
                                ' %(levelname)s: %(message)s'
2296
2427
                                .format(server_settings
2297
2428
                                        ["servicename"])))
2305
2436
    global mandos_dbus_service
2306
2437
    mandos_dbus_service = None
2307
2438
    
 
2439
    socketfd = None
 
2440
    if server_settings["socket"] != "":
 
2441
        socketfd = server_settings["socket"]
2308
2442
    tcp_server = MandosServer((server_settings["address"],
2309
2443
                               server_settings["port"]),
2310
2444
                              ClientHandler,
2314
2448
                              gnutls_priority=
2315
2449
                              server_settings["priority"],
2316
2450
                              use_dbus=use_dbus,
2317
 
                              socketfd=(server_settings["socket"]
2318
 
                                        or None))
 
2451
                              socketfd=socketfd)
2319
2452
    if not foreground:
2320
 
        pidfilename = "/var/run/mandos.pid"
 
2453
        pidfilename = "/run/mandos.pid"
 
2454
        if not os.path.isdir("/run/."):
 
2455
            pidfilename = "/var/run/mandos.pid"
2321
2456
        pidfile = None
2322
2457
        try:
2323
2458
            pidfile = open(pidfilename, "w")
2340
2475
        os.setuid(uid)
2341
2476
    except OSError as error:
2342
2477
        if error.errno != errno.EPERM:
2343
 
            raise error
 
2478
            raise
2344
2479
    
2345
2480
    if debug:
2346
2481
        # Enable all possible GnuTLS debugging
2389
2524
            use_dbus = False
2390
2525
            server_settings["use_dbus"] = False
2391
2526
            tcp_server.use_dbus = False
2392
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2393
 
    service = AvahiServiceToSyslog(name =
2394
 
                                   server_settings["servicename"],
2395
 
                                   servicetype = "_mandos._tcp",
2396
 
                                   protocol = protocol, bus = bus)
2397
 
    if server_settings["interface"]:
2398
 
        service.interface = (if_nametoindex
2399
 
                             (str(server_settings["interface"])))
 
2527
    if zeroconf:
 
2528
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2529
        service = AvahiServiceToSyslog(name =
 
2530
                                       server_settings["servicename"],
 
2531
                                       servicetype = "_mandos._tcp",
 
2532
                                       protocol = protocol, bus = bus)
 
2533
        if server_settings["interface"]:
 
2534
            service.interface = (if_nametoindex
 
2535
                                 (server_settings["interface"]
 
2536
                                  .encode("utf-8")))
2400
2537
    
2401
2538
    global multiprocessing_manager
2402
2539
    multiprocessing_manager = multiprocessing.Manager()
2409
2546
    old_client_settings = {}
2410
2547
    clients_data = {}
2411
2548
    
 
2549
    # This is used to redirect stdout and stderr for checker processes
 
2550
    global wnull
 
2551
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2552
    # Only used if server is running in foreground but not in debug
 
2553
    # mode
 
2554
    if debug or not foreground:
 
2555
        wnull.close()
 
2556
    
2412
2557
    # Get client data and settings from last running state.
2413
2558
    if server_settings["restore"]:
2414
2559
        try:
2418
2563
            os.remove(stored_state_path)
2419
2564
        except IOError as e:
2420
2565
            if e.errno == errno.ENOENT:
2421
 
                logger.warning("Could not load persistent state: {0}"
 
2566
                logger.warning("Could not load persistent state: {}"
2422
2567
                                .format(os.strerror(e.errno)))
2423
2568
            else:
2424
2569
                logger.critical("Could not load persistent state:",
2429
2574
                           "EOFError:", exc_info=e)
2430
2575
    
2431
2576
    with PGPEngine() as pgp:
2432
 
        for client_name, client in clients_data.iteritems():
 
2577
        for client_name, client in clients_data.items():
 
2578
            # Skip removed clients
 
2579
            if client_name not in client_settings:
 
2580
                continue
 
2581
            
2433
2582
            # Decide which value to use after restoring saved state.
2434
2583
            # We have three different values: Old config file,
2435
2584
            # new config file, and saved state.
2456
2605
                if datetime.datetime.utcnow() >= client["expires"]:
2457
2606
                    if not client["last_checked_ok"]:
2458
2607
                        logger.warning(
2459
 
                            "disabling client {0} - Client never "
 
2608
                            "disabling client {} - Client never "
2460
2609
                            "performed a successful checker"
2461
2610
                            .format(client_name))
2462
2611
                        client["enabled"] = False
2463
2612
                    elif client["last_checker_status"] != 0:
2464
2613
                        logger.warning(
2465
 
                            "disabling client {0} - Client "
2466
 
                            "last checker failed with error code {1}"
 
2614
                            "disabling client {} - Client last"
 
2615
                            " checker failed with error code {}"
2467
2616
                            .format(client_name,
2468
2617
                                    client["last_checker_status"]))
2469
2618
                        client["enabled"] = False
2472
2621
                                             .utcnow()
2473
2622
                                             + client["timeout"])
2474
2623
                        logger.debug("Last checker succeeded,"
2475
 
                                     " keeping {0} enabled"
 
2624
                                     " keeping {} enabled"
2476
2625
                                     .format(client_name))
2477
2626
            try:
2478
2627
                client["secret"] = (
2481
2630
                                ["secret"]))
2482
2631
            except PGPError:
2483
2632
                # If decryption fails, we use secret from new settings
2484
 
                logger.debug("Failed to decrypt {0} old secret"
 
2633
                logger.debug("Failed to decrypt {} old secret"
2485
2634
                             .format(client_name))
2486
2635
                client["secret"] = (
2487
2636
                    client_settings[client_name]["secret"])
2495
2644
        clients_data[client_name] = client_settings[client_name]
2496
2645
    
2497
2646
    # Create all client objects
2498
 
    for client_name, client in clients_data.iteritems():
 
2647
    for client_name, client in clients_data.items():
2499
2648
        tcp_server.clients[client_name] = client_class(
2500
 
            name = client_name, settings = client)
 
2649
            name = client_name, settings = client,
 
2650
            server_settings = server_settings)
2501
2651
    
2502
2652
    if not tcp_server.clients:
2503
2653
        logger.warning("No clients defined")
2507
2657
            try:
2508
2658
                with pidfile:
2509
2659
                    pid = os.getpid()
2510
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2660
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2511
2661
            except IOError:
2512
2662
                logger.error("Could not write to file %r with PID %d",
2513
2663
                             pidfilename, pid)
2583
2733
    
2584
2734
    def cleanup():
2585
2735
        "Cleanup function; run on exit"
2586
 
        service.cleanup()
 
2736
        if zeroconf:
 
2737
            service.cleanup()
2587
2738
        
2588
2739
        multiprocessing.active_children()
 
2740
        wnull.close()
2589
2741
        if not (tcp_server.clients or client_settings):
2590
2742
            return
2591
2743
        
2602
2754
                
2603
2755
                # A list of attributes that can not be pickled
2604
2756
                # + secret.
2605
 
                exclude = set(("bus", "changedstate", "secret",
2606
 
                               "checker"))
 
2757
                exclude = { "bus", "changedstate", "secret",
 
2758
                            "checker", "server_settings" }
2607
2759
                for name, typ in (inspect.getmembers
2608
2760
                                  (dbus.service.Object)):
2609
2761
                    exclude.add(name)
2632
2784
                except NameError:
2633
2785
                    pass
2634
2786
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2635
 
                logger.warning("Could not save persistent state: {0}"
 
2787
                logger.warning("Could not save persistent state: {}"
2636
2788
                               .format(os.strerror(e.errno)))
2637
2789
            else:
2638
2790
                logger.warning("Could not save persistent state:",
2639
2791
                               exc_info=e)
2640
 
                raise e
 
2792
                raise
2641
2793
        
2642
2794
        # Delete all clients, and settings from config
2643
2795
        while tcp_server.clients:
2667
2819
    tcp_server.server_activate()
2668
2820
    
2669
2821
    # Find out what port we got
2670
 
    service.port = tcp_server.socket.getsockname()[1]
 
2822
    if zeroconf:
 
2823
        service.port = tcp_server.socket.getsockname()[1]
2671
2824
    if use_ipv6:
2672
2825
        logger.info("Now listening on address %r, port %d,"
2673
2826
                    " flowinfo %d, scope_id %d",
2679
2832
    #service.interface = tcp_server.socket.getsockname()[3]
2680
2833
    
2681
2834
    try:
2682
 
        # From the Avahi example code
2683
 
        try:
2684
 
            service.activate()
2685
 
        except dbus.exceptions.DBusException as error:
2686
 
            logger.critical("D-Bus Exception", exc_info=error)
2687
 
            cleanup()
2688
 
            sys.exit(1)
2689
 
        # End of Avahi example code
 
2835
        if zeroconf:
 
2836
            # From the Avahi example code
 
2837
            try:
 
2838
                service.activate()
 
2839
            except dbus.exceptions.DBusException as error:
 
2840
                logger.critical("D-Bus Exception", exc_info=error)
 
2841
                cleanup()
 
2842
                sys.exit(1)
 
2843
            # End of Avahi example code
2690
2844
        
2691
2845
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2692
2846
                             lambda *args, **kwargs: