/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:56:38 UTC
  • mfrom: (589.1.1 socket-option)
  • Revision ID: teddy@recompile.se-20120526225638-4hvqyrvmj0036lfn
Merge "--socket" option for server.

This is suggested by the GNU Coding Standards' Table of Long Options,
and will probably also allow socket activation (e.g. by systemd(8)).

Show diffs side-by-side

added added

removed removed

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