/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-06-07 21:00:57 UTC
  • mto: This revision was merged to the branch mainline in revision 596.
  • Revision ID: teddy@recompile.se-20120607210057-9k4mou58uht7sj2m
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
                                                  errno code.  Don't
                                                  modify errno.

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
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.8"
 
91
version = "1.5.5"
95
92
stored_state_file = "clients.pickle"
96
93
 
97
94
logger = logging.getLogger()
98
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
99
98
 
100
99
try:
101
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
107
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
107
        with contextlib.closing(socket.socket()) as s:
109
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
112
113
        return interface_index
113
114
 
114
115
 
115
116
def initlogger(debug, level=logging.WARNING):
116
117
    """init logger and add loglevel"""
117
118
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
119
    syslogger.setFormatter(logging.Formatter
124
120
                           ('Mandos [%(process)d]: %(levelname)s:'
125
121
                            ' %(message)s'))
143
139
class PGPEngine(object):
144
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
145
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
146
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
 
        self.gnupgargs = ['--batch',
148
 
                          '--home', self.tempdir,
149
 
                          '--force-mdc',
150
 
                          '--quiet',
151
 
                          '--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'])
152
150
    
153
151
    def __enter__(self):
154
152
        return self
176
174
    def password_encode(self, password):
177
175
        # Passphrase can not be empty and can not contain newlines or
178
176
        # NUL bytes.  So we prefix it and hex encode it.
179
 
        encoded = b"mandos" + binascii.hexlify(password)
180
 
        if len(encoded) > 2048:
181
 
            # GnuPG can't handle long passwords, so encode differently
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
 
                       .replace(b"\n", b"\\n")
184
 
                       .replace(b"\0", b"\\x00"))
185
 
        return encoded
 
177
        return b"mandos" + binascii.hexlify(password)
186
178
    
187
179
    def encrypt(self, data, password):
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)
 
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
203
194
        return ciphertext
204
195
    
205
196
    def decrypt(self, data, password):
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)
 
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
222
211
        return decrypted_plaintext
223
212
 
224
213
 
225
214
class AvahiError(Exception):
226
215
    def __init__(self, value, *args, **kwargs):
227
216
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
217
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
218
    def __unicode__(self):
 
219
        return unicode(repr(self.value))
230
220
 
231
221
class AvahiServiceError(AvahiError):
232
222
    pass
243
233
               Used to optionally bind to the specified interface.
244
234
    name: string; Example: 'Mandos'
245
235
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
237
    port: integer; what port to announce
248
238
    TXT: list of strings; TXT record for the service
249
239
    domain: string; Domain to publish on, default to .local if empty.
282
272
                            " after %i retries, exiting.",
283
273
                            self.rename_count)
284
274
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
275
        self.name = unicode(self.server
 
276
                            .GetAlternativeServiceName(self.name))
287
277
        logger.info("Changing Zeroconf service name to %r ...",
288
278
                    self.name)
289
279
        self.remove()
337
327
            self.rename()
338
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
329
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
330
                            unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
342
332
                                  .format(error))
343
333
    
344
334
    def cleanup(self):
395
385
        """Add the new name to the syslog messages"""
396
386
        ret = AvahiService.rename(self)
397
387
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
388
                               ('Mandos ({0}) [%(process)d]:'
399
389
                                ' %(levelname)s: %(message)s'
400
390
                                .format(self.name)))
401
391
        return ret
402
392
 
403
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
 
404
401
class Client(object):
405
402
    """A representation of a client host served by this server.
406
403
    
442
439
    runtime_expansions: Allowed attributes for runtime expansion.
443
440
    expires:    datetime.datetime(); time (UTC) when a client will be
444
441
                disabled, or None
445
 
    server_settings: The server_settings dict from main()
446
442
    """
447
443
    
448
444
    runtime_expansions = ("approval_delay", "approval_duration",
450
446
                          "fingerprint", "host", "interval",
451
447
                          "last_approval_request", "last_checked_ok",
452
448
                          "last_enabled", "name", "timeout")
453
 
    client_defaults = { "timeout": "PT5M",
454
 
                        "extended_timeout": "PT15M",
455
 
                        "interval": "PT2M",
 
449
    client_defaults = { "timeout": "5m",
 
450
                        "extended_timeout": "15m",
 
451
                        "interval": "2m",
456
452
                        "checker": "fping -q -- %%(host)s",
457
453
                        "host": "",
458
 
                        "approval_delay": "PT0S",
459
 
                        "approval_duration": "PT1S",
 
454
                        "approval_delay": "0s",
 
455
                        "approval_duration": "1s",
460
456
                        "approved_by_default": "True",
461
457
                        "enabled": "True",
462
458
                        }
463
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
    
464
475
    @staticmethod
465
476
    def config_parser(config):
466
477
        """Construct a new dict of client settings of this form:
491
502
                          "rb") as secfile:
492
503
                    client["secret"] = secfile.read()
493
504
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
505
                raise TypeError("No secret or secfile for section {0}"
495
506
                                .format(section))
496
507
            client["timeout"] = string_to_delta(section["timeout"])
497
508
            client["extended_timeout"] = string_to_delta(
508
519
        
509
520
        return settings
510
521
    
511
 
    def __init__(self, settings, name = None, server_settings=None):
 
522
    def __init__(self, settings, name = None):
512
523
        self.name = name
513
 
        if server_settings is None:
514
 
            server_settings = {}
515
 
        self.server_settings = server_settings
516
524
        # adding all client settings
517
 
        for setting, value in settings.items():
 
525
        for setting, value in settings.iteritems():
518
526
            setattr(self, setting, value)
519
527
        
520
528
        if self.enabled:
603
611
        if self.checker_initiator_tag is not None:
604
612
            gobject.source_remove(self.checker_initiator_tag)
605
613
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
614
                                      (self.interval_milliseconds(),
608
615
                                       self.start_checker))
609
616
        # Schedule a disable() when 'timeout' has passed
610
617
        if self.disable_initiator_tag is not None:
611
618
            gobject.source_remove(self.disable_initiator_tag)
612
619
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
620
                                   (self.timeout_milliseconds(),
 
621
                                    self.disable))
616
622
        # Also start a new checker *right now*.
617
623
        self.start_checker()
618
624
    
649
655
            self.disable_initiator_tag = None
650
656
        if getattr(self, "enabled", False):
651
657
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
658
                                          (timedelta_to_milliseconds
 
659
                                           (timeout), self.disable))
654
660
            self.expires = datetime.datetime.utcnow() + timeout
655
661
    
656
662
    def need_approval(self):
673
679
        # If a checker exists, make sure it is not a zombie
674
680
        try:
675
681
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
 
682
        except (AttributeError, OSError) as error:
 
683
            if (isinstance(error, OSError)
 
684
                and error.errno != errno.ECHILD):
 
685
                raise error
681
686
        else:
682
687
            if pid:
683
688
                logger.warning("Checker was a zombie")
687
692
        # Start a new checker if needed
688
693
        if self.checker is None:
689
694
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              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)
693
699
            try:
694
700
                command = self.checker_command % escaped_attrs
695
701
            except TypeError as error:
704
710
                # in normal mode, that is already done by daemon(),
705
711
                # and in debug mode we don't want to.  (Stdin is
706
712
                # 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 })
715
713
                self.checker = subprocess.Popen(command,
716
714
                                                close_fds=True,
717
 
                                                shell=True, cwd="/",
718
 
                                                **popen_args)
 
715
                                                shell=True, cwd="/")
719
716
            except OSError as error:
720
717
                logger.error("Failed to start subprocess",
721
718
                             exc_info=error)
722
 
                return True
723
719
            self.checker_callback_tag = (gobject.child_watch_add
724
720
                                         (self.checker.pid,
725
721
                                          self.checker_callback,
726
722
                                          data=command))
727
723
            # The checker may have completed before the gobject
728
724
            # watch was added.  Check for this.
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
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
738
726
            if pid:
739
727
                gobject.source_remove(self.checker_callback_tag)
740
728
                self.checker_callback(pid, status, command)
776
764
    # "Set" method, so we fail early here:
777
765
    if byte_arrays and signature != "ay":
778
766
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
767
                         " signature {0!r}".format(signature))
780
768
    def decorator(func):
781
769
        func._dbus_is_property = True
782
770
        func._dbus_interface = dbus_interface
830
818
class DBusPropertyException(dbus.exceptions.DBusException):
831
819
    """A base class for D-Bus property-related exceptions
832
820
    """
833
 
    pass
 
821
    def __unicode__(self):
 
822
        return unicode(str(self))
 
823
 
834
824
 
835
825
class DBusPropertyAccessException(DBusPropertyException):
836
826
    """A property's access permissions disallows an operation.
859
849
        If called like _is_dbus_thing("method") it returns a function
860
850
        suitable for use as predicate to inspect.getmembers().
861
851
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
852
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
853
                                   False)
864
854
    
865
855
    def _get_all_dbus_things(self, thing):
914
904
            # The byte_arrays option is not supported yet on
915
905
            # signatures other than "ay".
916
906
            if prop._dbus_signature != "ay":
917
 
                raise ValueError("Byte arrays not supported for non-"
918
 
                                 "'ay' signature {!r}"
919
 
                                 .format(prop._dbus_signature))
 
907
                raise ValueError
920
908
            value = dbus.ByteArray(b''.join(chr(byte)
921
909
                                            for byte in value))
922
910
        prop(value)
986
974
                                              (prop,
987
975
                                               "_dbus_annotations",
988
976
                                               {}))
989
 
                        for name, value in annots.items():
 
977
                        for name, value in annots.iteritems():
990
978
                            ann_tag = document.createElement(
991
979
                                "annotation")
992
980
                            ann_tag.setAttribute("name", name)
995
983
                # Add interface annotation tags
996
984
                for annotation, value in dict(
997
985
                    itertools.chain.from_iterable(
998
 
                        annotations().items()
 
986
                        annotations().iteritems()
999
987
                        for name, annotations in
1000
988
                        self._get_all_dbus_things("interface")
1001
989
                        if name == if_tag.getAttribute("name")
1002
 
                        )).items():
 
990
                        )).iteritems():
1003
991
                    ann_tag = document.createElement("annotation")
1004
992
                    ann_tag.setAttribute("name", annotation)
1005
993
                    ann_tag.setAttribute("value", value)
1061
1049
    """
1062
1050
    def wrapper(cls):
1063
1051
        for orig_interface_name, alt_interface_name in (
1064
 
            alt_interface_names.items()):
 
1052
            alt_interface_names.iteritems()):
1065
1053
            attr = {}
1066
1054
            interface_names = set()
1067
1055
            # Go though all attributes of the class
1080
1068
                interface_names.add(alt_interface)
1081
1069
                # Is this a D-Bus signal?
1082
1070
                if getattr(attribute, "_dbus_is_signal", False):
1083
 
                    # Extract the original non-method undecorated
1084
 
                    # function by black magic
 
1071
                    # Extract the original non-method function by
 
1072
                    # black magic
1085
1073
                    nonmethod_func = (dict(
1086
1074
                            zip(attribute.func_code.co_freevars,
1087
1075
                                attribute.__closure__))["func"]
1184
1172
                                        attribute.func_closure)))
1185
1173
            if deprecate:
1186
1174
                # Deprecate all alternate interfaces
1187
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1175
                iname="_AlternateDBusNames_interface_annotation{0}"
1188
1176
                for interface_name in interface_names:
1189
1177
                    @dbus_interface_annotations(interface_name)
1190
1178
                    def func(self):
1199
1187
            if interface_names:
1200
1188
                # Replace the class with a new subclass of it with
1201
1189
                # methods, signals, etc. as created above.
1202
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1190
                cls = type(b"{0}Alternate".format(cls.__name__),
1203
1191
                           (cls,), attr)
1204
1192
        return cls
1205
1193
    return wrapper
1225
1213
        Client.__init__(self, *args, **kwargs)
1226
1214
        # Only now, when this client is initialized, can it show up on
1227
1215
        # the D-Bus
1228
 
        client_object_name = str(self.name).translate(
 
1216
        client_object_name = unicode(self.name).translate(
1229
1217
            {ord("."): ord("_"),
1230
1218
             ord("-"): ord("_")})
1231
1219
        self.dbus_object_path = (dbus.ObjectPath
1246
1234
                   to the D-Bus.  Default: no transform
1247
1235
        variant_level: D-Bus variant level.  Default: 1
1248
1236
        """
1249
 
        attrname = "_{}".format(dbus_name)
 
1237
        attrname = "_{0}".format(dbus_name)
1250
1238
        def setter(self, value):
1251
1239
            if hasattr(self, "dbus_object_path"):
1252
1240
                if (not hasattr(self, attrname) or
1282
1270
    approval_delay = notifychangeproperty(dbus.UInt64,
1283
1271
                                          "ApprovalDelay",
1284
1272
                                          type_func =
1285
 
                                          lambda td: td.total_seconds()
1286
 
                                          * 1000)
 
1273
                                          timedelta_to_milliseconds)
1287
1274
    approval_duration = notifychangeproperty(
1288
1275
        dbus.UInt64, "ApprovalDuration",
1289
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1276
        type_func = timedelta_to_milliseconds)
1290
1277
    host = notifychangeproperty(dbus.String, "Host")
1291
1278
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1292
 
                                   type_func = lambda td:
1293
 
                                       td.total_seconds() * 1000)
 
1279
                                   type_func =
 
1280
                                   timedelta_to_milliseconds)
1294
1281
    extended_timeout = notifychangeproperty(
1295
1282
        dbus.UInt64, "ExtendedTimeout",
1296
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1283
        type_func = timedelta_to_milliseconds)
1297
1284
    interval = notifychangeproperty(dbus.UInt64,
1298
1285
                                    "Interval",
1299
1286
                                    type_func =
1300
 
                                    lambda td: td.total_seconds()
1301
 
                                    * 1000)
 
1287
                                    timedelta_to_milliseconds)
1302
1288
    checker_command = notifychangeproperty(dbus.String, "Checker")
1303
1289
    
1304
1290
    del notifychangeproperty
1332
1318
                                       *args, **kwargs)
1333
1319
    
1334
1320
    def start_checker(self, *args, **kwargs):
1335
 
        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
1336
1326
        r = Client.start_checker(self, *args, **kwargs)
1337
1327
        # Only if new checker process was started
1338
1328
        if (self.checker is not None
1347
1337
    
1348
1338
    def approve(self, value=True):
1349
1339
        self.approved = value
1350
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1351
 
                                * 1000), self._reset_approved)
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
 
1341
                            (self.approval_duration),
 
1342
                            self._reset_approved)
1352
1343
        self.send_changedstate()
1353
1344
    
1354
1345
    ## D-Bus methods, signals & properties
1457
1448
                           access="readwrite")
1458
1449
    def ApprovalDelay_dbus_property(self, value=None):
1459
1450
        if value is None:       # get
1460
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1461
 
                               * 1000)
 
1451
            return dbus.UInt64(self.approval_delay_milliseconds())
1462
1452
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1463
1453
    
1464
1454
    # ApprovalDuration - property
1466
1456
                           access="readwrite")
1467
1457
    def ApprovalDuration_dbus_property(self, value=None):
1468
1458
        if value is None:       # get
1469
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1470
 
                               * 1000)
 
1459
            return dbus.UInt64(timedelta_to_milliseconds(
 
1460
                    self.approval_duration))
1471
1461
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1472
1462
    
1473
1463
    # Name - property
1486
1476
    def Host_dbus_property(self, value=None):
1487
1477
        if value is None:       # get
1488
1478
            return dbus.String(self.host)
1489
 
        self.host = str(value)
 
1479
        self.host = unicode(value)
1490
1480
    
1491
1481
    # Created - property
1492
1482
    @dbus_service_property(_interface, signature="s", access="read")
1539
1529
                           access="readwrite")
1540
1530
    def Timeout_dbus_property(self, value=None):
1541
1531
        if value is None:       # get
1542
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1532
            return dbus.UInt64(self.timeout_milliseconds())
1543
1533
        old_timeout = self.timeout
1544
1534
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
1535
        # Reschedule disabling
1556
1546
                gobject.source_remove(self.disable_initiator_tag)
1557
1547
                self.disable_initiator_tag = (
1558
1548
                    gobject.timeout_add(
1559
 
                        int((self.expires - now).total_seconds()
1560
 
                            * 1000), self.disable))
 
1549
                        timedelta_to_milliseconds(self.expires - now),
 
1550
                        self.disable))
1561
1551
    
1562
1552
    # ExtendedTimeout - property
1563
1553
    @dbus_service_property(_interface, signature="t",
1564
1554
                           access="readwrite")
1565
1555
    def ExtendedTimeout_dbus_property(self, value=None):
1566
1556
        if value is None:       # get
1567
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1568
 
                               * 1000)
 
1557
            return dbus.UInt64(self.extended_timeout_milliseconds())
1569
1558
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1570
1559
    
1571
1560
    # Interval - property
1573
1562
                           access="readwrite")
1574
1563
    def Interval_dbus_property(self, value=None):
1575
1564
        if value is None:       # get
1576
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1565
            return dbus.UInt64(self.interval_milliseconds())
1577
1566
        self.interval = datetime.timedelta(0, 0, 0, value)
1578
1567
        if getattr(self, "checker_initiator_tag", None) is None:
1579
1568
            return
1590
1579
    def Checker_dbus_property(self, value=None):
1591
1580
        if value is None:       # get
1592
1581
            return dbus.String(self.checker_command)
1593
 
        self.checker_command = str(value)
 
1582
        self.checker_command = unicode(value)
1594
1583
    
1595
1584
    # CheckerRunning - property
1596
1585
    @dbus_service_property(_interface, signature="b",
1612
1601
    @dbus_service_property(_interface, signature="ay",
1613
1602
                           access="write", byte_arrays=True)
1614
1603
    def Secret_dbus_property(self, value):
1615
 
        self.secret = bytes(value)
 
1604
        self.secret = str(value)
1616
1605
    
1617
1606
    del _interface
1618
1607
 
1652
1641
    def handle(self):
1653
1642
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1654
1643
            logger.info("TCP connection from: %s",
1655
 
                        str(self.client_address))
 
1644
                        unicode(self.client_address))
1656
1645
            logger.debug("Pipe FD: %d",
1657
1646
                         self.server.child_pipe.fileno())
1658
1647
            
1684
1673
            logger.debug("Protocol version: %r", line)
1685
1674
            try:
1686
1675
                if int(line.strip().split()[0]) > 1:
1687
 
                    raise RuntimeError(line)
 
1676
                    raise RuntimeError
1688
1677
            except (ValueError, IndexError, RuntimeError) as error:
1689
1678
                logger.error("Unknown protocol version: %s", error)
1690
1679
                return
1739
1728
                        if self.server.use_dbus:
1740
1729
                            # Emit D-Bus signal
1741
1730
                            client.NeedApproval(
1742
 
                                client.approval_delay.total_seconds()
1743
 
                                * 1000, client.approved_by_default)
 
1731
                                client.approval_delay_milliseconds(),
 
1732
                                client.approved_by_default)
1744
1733
                    else:
1745
1734
                        logger.warning("Client %s was not approved",
1746
1735
                                       client.name)
1752
1741
                    #wait until timeout or approved
1753
1742
                    time = datetime.datetime.now()
1754
1743
                    client.changedstate.acquire()
1755
 
                    client.changedstate.wait(delay.total_seconds())
 
1744
                    client.changedstate.wait(
 
1745
                        float(timedelta_to_milliseconds(delay)
 
1746
                              / 1000))
1756
1747
                    client.changedstate.release()
1757
1748
                    time2 = datetime.datetime.now()
1758
1749
                    if (time2 - time) >= delay:
1895
1886
    
1896
1887
    def add_pipe(self, parent_pipe, proc):
1897
1888
        """Dummy function; override as necessary"""
1898
 
        raise NotImplementedError()
 
1889
        raise NotImplementedError
1899
1890
 
1900
1891
 
1901
1892
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1957
1948
                try:
1958
1949
                    self.socket.setsockopt(socket.SOL_SOCKET,
1959
1950
                                           SO_BINDTODEVICE,
1960
 
                                           (self.interface + "\0")
1961
 
                                           .encode("utf-8"))
 
1951
                                           str(self.interface
 
1952
                                               + '\0'))
1962
1953
                except socket.error as error:
1963
1954
                    if error.errno == errno.EPERM:
1964
 
                        logger.error("No permission to bind to"
1965
 
                                     " interface %s", self.interface)
 
1955
                        logger.error("No permission to"
 
1956
                                     " bind to interface %s",
 
1957
                                     self.interface)
1966
1958
                    elif error.errno == errno.ENOPROTOOPT:
1967
1959
                        logger.error("SO_BINDTODEVICE not available;"
1968
1960
                                     " cannot bind to interface %s",
1969
1961
                                     self.interface)
1970
1962
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
 
1963
                        logger.error("Interface %s does not"
 
1964
                                     " exist, cannot bind",
 
1965
                                     self.interface)
1973
1966
                    else:
1974
1967
                        raise
1975
1968
        # Only bind(2) the socket if we really need to.
1978
1971
                if self.address_family == socket.AF_INET6:
1979
1972
                    any_address = "::" # in6addr_any
1980
1973
                else:
1981
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1974
                    any_address = socket.INADDR_ANY
1982
1975
                self.server_address = (any_address,
1983
1976
                                       self.server_address[1])
1984
1977
            elif not self.server_address[1]:
2100
2093
        return True
2101
2094
 
2102
2095
 
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
 
 
2202
2096
def string_to_delta(interval):
2203
2097
    """Parse a string and return a datetime.timedelta
2204
2098
    
2215
2109
    >>> string_to_delta('5m 30s')
2216
2110
    datetime.timedelta(0, 330)
2217
2111
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
2112
    timevalue = datetime.timedelta(0)
2225
2113
    for s in interval.split():
2226
2114
        try:
2227
 
            suffix = s[-1]
 
2115
            suffix = unicode(s[-1])
2228
2116
            value = int(s[:-1])
2229
2117
            if suffix == "d":
2230
2118
                delta = datetime.timedelta(value)
2237
2125
            elif suffix == "w":
2238
2126
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
2127
            else:
2240
 
                raise ValueError("Unknown suffix {!r}"
 
2128
                raise ValueError("Unknown suffix {0!r}"
2241
2129
                                 .format(suffix))
2242
 
        except IndexError as e:
 
2130
        except (ValueError, IndexError) as e:
2243
2131
            raise ValueError(*(e.args))
2244
2132
        timevalue += delta
2245
2133
    return timevalue
2260
2148
        # Close all standard open file descriptors
2261
2149
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2262
2150
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2151
            raise OSError(errno.ENODEV,
 
2152
                          "{0} not a character device"
2264
2153
                          .format(os.devnull))
2265
2154
        os.dup2(null, sys.stdin.fileno())
2266
2155
        os.dup2(null, sys.stdout.fileno())
2276
2165
    
2277
2166
    parser = argparse.ArgumentParser()
2278
2167
    parser.add_argument("-v", "--version", action="version",
2279
 
                        version = "%(prog)s {}".format(version),
 
2168
                        version = "%(prog)s {0}".format(version),
2280
2169
                        help="show version number and exit")
2281
2170
    parser.add_argument("-i", "--interface", metavar="IF",
2282
2171
                        help="Bind to interface IF")
2288
2177
                        help="Run self-test")
2289
2178
    parser.add_argument("--debug", action="store_true",
2290
2179
                        help="Debug mode; run in foreground and log"
2291
 
                        " to terminal", default=None)
 
2180
                        " to terminal")
2292
2181
    parser.add_argument("--debuglevel", metavar="LEVEL",
2293
2182
                        help="Debug level for stdout output")
2294
2183
    parser.add_argument("--priority", help="GnuTLS"
2301
2190
                        " files")
2302
2191
    parser.add_argument("--no-dbus", action="store_false",
2303
2192
                        dest="use_dbus", help="Do not provide D-Bus"
2304
 
                        " system bus interface", default=None)
 
2193
                        " system bus interface")
2305
2194
    parser.add_argument("--no-ipv6", action="store_false",
2306
 
                        dest="use_ipv6", help="Do not use IPv6",
2307
 
                        default=None)
 
2195
                        dest="use_ipv6", help="Do not use IPv6")
2308
2196
    parser.add_argument("--no-restore", action="store_false",
2309
2197
                        dest="restore", help="Do not restore stored"
2310
 
                        " state", default=None)
 
2198
                        " state")
2311
2199
    parser.add_argument("--socket", type=int,
2312
2200
                        help="Specify a file descriptor to a network"
2313
2201
                        " socket to use instead of creating one")
2314
2202
    parser.add_argument("--statedir", metavar="DIR",
2315
2203
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
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)
2321
2204
    
2322
2205
    options = parser.parse_args()
2323
2206
    
2324
2207
    if options.check:
2325
2208
        import doctest
2326
 
        fail_count, test_count = doctest.testmod()
2327
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2209
        doctest.testmod()
 
2210
        sys.exit()
2328
2211
    
2329
2212
    # Default values for config file for server-global settings
2330
2213
    server_defaults = { "interface": "",
2332
2215
                        "port": "",
2333
2216
                        "debug": "False",
2334
2217
                        "priority":
2335
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2218
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2336
2219
                        "servicename": "Mandos",
2337
2220
                        "use_dbus": "True",
2338
2221
                        "use_ipv6": "True",
2339
2222
                        "debuglevel": "",
2340
2223
                        "restore": "True",
2341
2224
                        "socket": "",
2342
 
                        "statedir": "/var/lib/mandos",
2343
 
                        "foreground": "False",
2344
 
                        "zeroconf": "True",
 
2225
                        "statedir": "/var/lib/mandos"
2345
2226
                        }
2346
2227
    
2347
2228
    # Parse config file for server-global settings
2352
2233
    # Convert the SafeConfigParser object to a dict
2353
2234
    server_settings = server_config.defaults()
2354
2235
    # Use the appropriate methods on the non-string config options
2355
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2236
    for option in ("debug", "use_dbus", "use_ipv6"):
2356
2237
        server_settings[option] = server_config.getboolean("DEFAULT",
2357
2238
                                                           option)
2358
2239
    if server_settings["port"]:
2374
2255
    for option in ("interface", "address", "port", "debug",
2375
2256
                   "priority", "servicename", "configdir",
2376
2257
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2377
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2258
                   "statedir", "socket"):
2378
2259
        value = getattr(options, option)
2379
2260
        if value is not None:
2380
2261
            server_settings[option] = value
2381
2262
    del options
2382
2263
    # Force all strings to be unicode
2383
2264
    for option in server_settings.keys():
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])
2391
 
    # Debug implies foreground
2392
 
    if server_settings["debug"]:
2393
 
        server_settings["foreground"] = True
 
2265
        if type(server_settings[option]) is str:
 
2266
            server_settings[option] = unicode(server_settings[option])
2394
2267
    # Now we have our good server settings in "server_settings"
2395
2268
    
2396
2269
    ##################################################################
2397
2270
    
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
 
    
2404
2271
    # For convenience
2405
2272
    debug = server_settings["debug"]
2406
2273
    debuglevel = server_settings["debuglevel"]
2408
2275
    use_ipv6 = server_settings["use_ipv6"]
2409
2276
    stored_state_path = os.path.join(server_settings["statedir"],
2410
2277
                                     stored_state_file)
2411
 
    foreground = server_settings["foreground"]
2412
 
    zeroconf = server_settings["zeroconf"]
2413
2278
    
2414
2279
    if debug:
2415
2280
        initlogger(debug, logging.DEBUG)
2422
2287
    
2423
2288
    if server_settings["servicename"] != "Mandos":
2424
2289
        syslogger.setFormatter(logging.Formatter
2425
 
                               ('Mandos ({}) [%(process)d]:'
 
2290
                               ('Mandos ({0}) [%(process)d]:'
2426
2291
                                ' %(levelname)s: %(message)s'
2427
2292
                                .format(server_settings
2428
2293
                                        ["servicename"])))
2436
2301
    global mandos_dbus_service
2437
2302
    mandos_dbus_service = None
2438
2303
    
2439
 
    socketfd = None
2440
 
    if server_settings["socket"] != "":
2441
 
        socketfd = server_settings["socket"]
2442
2304
    tcp_server = MandosServer((server_settings["address"],
2443
2305
                               server_settings["port"]),
2444
2306
                              ClientHandler,
2448
2310
                              gnutls_priority=
2449
2311
                              server_settings["priority"],
2450
2312
                              use_dbus=use_dbus,
2451
 
                              socketfd=socketfd)
2452
 
    if not foreground:
2453
 
        pidfilename = "/run/mandos.pid"
2454
 
        if not os.path.isdir("/run/."):
2455
 
            pidfilename = "/var/run/mandos.pid"
2456
 
        pidfile = None
 
2313
                              socketfd=(server_settings["socket"]
 
2314
                                        or None))
 
2315
    if not debug:
 
2316
        pidfilename = "/var/run/mandos.pid"
2457
2317
        try:
2458
2318
            pidfile = open(pidfilename, "w")
2459
2319
        except IOError as e:
2475
2335
        os.setuid(uid)
2476
2336
    except OSError as error:
2477
2337
        if error.errno != errno.EPERM:
2478
 
            raise
 
2338
            raise error
2479
2339
    
2480
2340
    if debug:
2481
2341
        # Enable all possible GnuTLS debugging
2498
2358
            os.close(null)
2499
2359
    
2500
2360
    # Need to fork before connecting to D-Bus
2501
 
    if not foreground:
 
2361
    if not debug:
2502
2362
        # Close all input and output, do double fork, etc.
2503
2363
        daemon()
2504
2364
    
2524
2384
            use_dbus = False
2525
2385
            server_settings["use_dbus"] = False
2526
2386
            tcp_server.use_dbus = False
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")))
 
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"])))
2537
2395
    
2538
2396
    global multiprocessing_manager
2539
2397
    multiprocessing_manager = multiprocessing.Manager()
2546
2404
    old_client_settings = {}
2547
2405
    clients_data = {}
2548
2406
    
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
 
    
2557
2407
    # Get client data and settings from last running state.
2558
2408
    if server_settings["restore"]:
2559
2409
        try:
2563
2413
            os.remove(stored_state_path)
2564
2414
        except IOError as e:
2565
2415
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
 
2416
                logger.warning("Could not load persistent state: {0}"
2567
2417
                                .format(os.strerror(e.errno)))
2568
2418
            else:
2569
2419
                logger.critical("Could not load persistent state:",
2574
2424
                           "EOFError:", exc_info=e)
2575
2425
    
2576
2426
    with PGPEngine() as pgp:
2577
 
        for client_name, client in clients_data.items():
2578
 
            # Skip removed clients
2579
 
            if client_name not in client_settings:
2580
 
                continue
2581
 
            
 
2427
        for client_name, client in clients_data.iteritems():
2582
2428
            # Decide which value to use after restoring saved state.
2583
2429
            # We have three different values: Old config file,
2584
2430
            # new config file, and saved state.
2605
2451
                if datetime.datetime.utcnow() >= client["expires"]:
2606
2452
                    if not client["last_checked_ok"]:
2607
2453
                        logger.warning(
2608
 
                            "disabling client {} - Client never "
 
2454
                            "disabling client {0} - Client never "
2609
2455
                            "performed a successful checker"
2610
2456
                            .format(client_name))
2611
2457
                        client["enabled"] = False
2612
2458
                    elif client["last_checker_status"] != 0:
2613
2459
                        logger.warning(
2614
 
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
 
2460
                            "disabling client {0} - Client "
 
2461
                            "last checker failed with error code {1}"
2616
2462
                            .format(client_name,
2617
2463
                                    client["last_checker_status"]))
2618
2464
                        client["enabled"] = False
2621
2467
                                             .utcnow()
2622
2468
                                             + client["timeout"])
2623
2469
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
 
2470
                                     " keeping {0} enabled"
2625
2471
                                     .format(client_name))
2626
2472
            try:
2627
2473
                client["secret"] = (
2630
2476
                                ["secret"]))
2631
2477
            except PGPError:
2632
2478
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
 
2479
                logger.debug("Failed to decrypt {0} old secret"
2634
2480
                             .format(client_name))
2635
2481
                client["secret"] = (
2636
2482
                    client_settings[client_name]["secret"])
2644
2490
        clients_data[client_name] = client_settings[client_name]
2645
2491
    
2646
2492
    # Create all client objects
2647
 
    for client_name, client in clients_data.items():
 
2493
    for client_name, client in clients_data.iteritems():
2648
2494
        tcp_server.clients[client_name] = client_class(
2649
 
            name = client_name, settings = client,
2650
 
            server_settings = server_settings)
 
2495
            name = client_name, settings = client)
2651
2496
    
2652
2497
    if not tcp_server.clients:
2653
2498
        logger.warning("No clients defined")
2654
2499
    
2655
 
    if not foreground:
2656
 
        if pidfile is not None:
2657
 
            try:
2658
 
                with pidfile:
2659
 
                    pid = os.getpid()
2660
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2661
 
            except IOError:
2662
 
                logger.error("Could not write to file %r with PID %d",
2663
 
                             pidfilename, pid)
2664
 
        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
2665
2512
        del pidfilename
2666
2513
    
2667
2514
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2733
2580
    
2734
2581
    def cleanup():
2735
2582
        "Cleanup function; run on exit"
2736
 
        if zeroconf:
2737
 
            service.cleanup()
 
2583
        service.cleanup()
2738
2584
        
2739
2585
        multiprocessing.active_children()
2740
 
        wnull.close()
2741
2586
        if not (tcp_server.clients or client_settings):
2742
2587
            return
2743
2588
        
2754
2599
                
2755
2600
                # A list of attributes that can not be pickled
2756
2601
                # + secret.
2757
 
                exclude = { "bus", "changedstate", "secret",
2758
 
                            "checker", "server_settings" }
 
2602
                exclude = set(("bus", "changedstate", "secret",
 
2603
                               "checker"))
2759
2604
                for name, typ in (inspect.getmembers
2760
2605
                                  (dbus.service.Object)):
2761
2606
                    exclude.add(name)
2784
2629
                except NameError:
2785
2630
                    pass
2786
2631
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
 
                logger.warning("Could not save persistent state: {}"
 
2632
                logger.warning("Could not save persistent state: {0}"
2788
2633
                               .format(os.strerror(e.errno)))
2789
2634
            else:
2790
2635
                logger.warning("Could not save persistent state:",
2791
2636
                               exc_info=e)
2792
 
                raise
 
2637
                raise e
2793
2638
        
2794
2639
        # Delete all clients, and settings from config
2795
2640
        while tcp_server.clients:
2819
2664
    tcp_server.server_activate()
2820
2665
    
2821
2666
    # Find out what port we got
2822
 
    if zeroconf:
2823
 
        service.port = tcp_server.socket.getsockname()[1]
 
2667
    service.port = tcp_server.socket.getsockname()[1]
2824
2668
    if use_ipv6:
2825
2669
        logger.info("Now listening on address %r, port %d,"
2826
2670
                    " flowinfo %d, scope_id %d",
2832
2676
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2677
    
2834
2678
    try:
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
 
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
2844
2687
        
2845
2688
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2689
                             lambda *args, **kwargs: