/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-23 00:58:49 UTC
  • Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
          duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
  (EXAMPLE): Update to new interval format.
  (SEE ALSO): Reference RFC 3339.

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
79
79
import ctypes.util
80
80
import xml.dom.minidom
81
81
import inspect
 
82
import GnuPGInterface
82
83
 
83
84
try:
84
85
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
89
    except ImportError:
89
90
        SO_BINDTODEVICE = None
90
91
 
91
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.9"
 
92
version = "1.6.0"
95
93
stored_state_file = "clients.pickle"
96
94
 
97
95
logger = logging.getLogger()
98
 
syslogger = None
 
96
syslogger = (logging.handlers.SysLogHandler
 
97
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
98
              address = str("/dev/log")))
99
99
 
100
100
try:
101
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
107
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
108
        with contextlib.closing(socket.socket()) as s:
109
109
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
110
                                struct.pack(str("16s16x"),
 
111
                                            interface))
 
112
        interface_index = struct.unpack(str("I"),
 
113
                                        ifreq[16:20])[0]
112
114
        return interface_index
113
115
 
114
116
 
115
117
def initlogger(debug, level=logging.WARNING):
116
118
    """init logger and add loglevel"""
117
119
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
120
    syslogger.setFormatter(logging.Formatter
124
121
                           ('Mandos [%(process)d]: %(levelname)s:'
125
122
                            ' %(message)s'))
143
140
class PGPEngine(object):
144
141
    """A simple class for OpenPGP symmetric encryption & decryption"""
145
142
    def __init__(self):
 
143
        self.gnupg = GnuPGInterface.GnuPG()
146
144
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
 
        self.gnupgargs = ['--batch',
148
 
                          '--home', self.tempdir,
149
 
                          '--force-mdc',
150
 
                          '--quiet',
151
 
                          '--no-use-agent']
 
145
        self.gnupg = GnuPGInterface.GnuPG()
 
146
        self.gnupg.options.meta_interactive = False
 
147
        self.gnupg.options.homedir = self.tempdir
 
148
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
149
                                              '--quiet',
 
150
                                              '--no-use-agent'])
152
151
    
153
152
    def __enter__(self):
154
153
        return self
176
175
    def password_encode(self, password):
177
176
        # Passphrase can not be empty and can not contain newlines or
178
177
        # 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
 
178
        return b"mandos" + binascii.hexlify(password)
186
179
    
187
180
    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)
 
181
        self.gnupg.passphrase = self.password_encode(password)
 
182
        with open(os.devnull, "w") as devnull:
 
183
            try:
 
184
                proc = self.gnupg.run(['--symmetric'],
 
185
                                      create_fhs=['stdin', 'stdout'],
 
186
                                      attach_fhs={'stderr': devnull})
 
187
                with contextlib.closing(proc.handles['stdin']) as f:
 
188
                    f.write(data)
 
189
                with contextlib.closing(proc.handles['stdout']) as f:
 
190
                    ciphertext = f.read()
 
191
                proc.wait()
 
192
            except IOError as e:
 
193
                raise PGPError(e)
 
194
        self.gnupg.passphrase = None
203
195
        return ciphertext
204
196
    
205
197
    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)
 
198
        self.gnupg.passphrase = self.password_encode(password)
 
199
        with open(os.devnull, "w") as devnull:
 
200
            try:
 
201
                proc = self.gnupg.run(['--decrypt'],
 
202
                                      create_fhs=['stdin', 'stdout'],
 
203
                                      attach_fhs={'stderr': devnull})
 
204
                with contextlib.closing(proc.handles['stdin']) as f:
 
205
                    f.write(data)
 
206
                with contextlib.closing(proc.handles['stdout']) as f:
 
207
                    decrypted_plaintext = f.read()
 
208
                proc.wait()
 
209
            except IOError as e:
 
210
                raise PGPError(e)
 
211
        self.gnupg.passphrase = None
222
212
        return decrypted_plaintext
223
213
 
224
214
 
225
215
class AvahiError(Exception):
226
216
    def __init__(self, value, *args, **kwargs):
227
217
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
230
221
 
231
222
class AvahiServiceError(AvahiError):
232
223
    pass
243
234
               Used to optionally bind to the specified interface.
244
235
    name: string; Example: 'Mandos'
245
236
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
237
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
238
    port: integer; what port to announce
248
239
    TXT: list of strings; TXT record for the service
249
240
    domain: string; Domain to publish on, default to .local if empty.
282
273
                            " after %i retries, exiting.",
283
274
                            self.rename_count)
284
275
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
287
278
        logger.info("Changing Zeroconf service name to %r ...",
288
279
                    self.name)
289
280
        self.remove()
337
328
            self.rename()
338
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
330
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
342
333
                                  .format(error))
343
334
    
344
335
    def cleanup(self):
395
386
        """Add the new name to the syslog messages"""
396
387
        ret = AvahiService.rename(self)
397
388
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
389
                               ('Mandos ({0}) [%(process)d]:'
399
390
                                ' %(levelname)s: %(message)s'
400
391
                                .format(self.name)))
401
392
        return ret
402
393
 
403
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
 
401
 
404
402
class Client(object):
405
403
    """A representation of a client host served by this server.
406
404
    
442
440
    runtime_expansions: Allowed attributes for runtime expansion.
443
441
    expires:    datetime.datetime(); time (UTC) when a client will be
444
442
                disabled, or None
445
 
    server_settings: The server_settings dict from main()
446
443
    """
447
444
    
448
445
    runtime_expansions = ("approval_delay", "approval_duration",
461
458
                        "enabled": "True",
462
459
                        }
463
460
    
 
461
    def timeout_milliseconds(self):
 
462
        "Return the 'timeout' attribute in milliseconds"
 
463
        return timedelta_to_milliseconds(self.timeout)
 
464
    
 
465
    def extended_timeout_milliseconds(self):
 
466
        "Return the 'extended_timeout' attribute in milliseconds"
 
467
        return timedelta_to_milliseconds(self.extended_timeout)
 
468
    
 
469
    def interval_milliseconds(self):
 
470
        "Return the 'interval' attribute in milliseconds"
 
471
        return timedelta_to_milliseconds(self.interval)
 
472
    
 
473
    def approval_delay_milliseconds(self):
 
474
        return timedelta_to_milliseconds(self.approval_delay)
 
475
    
464
476
    @staticmethod
465
477
    def config_parser(config):
466
478
        """Construct a new dict of client settings of this form:
491
503
                          "rb") as secfile:
492
504
                    client["secret"] = secfile.read()
493
505
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
506
                raise TypeError("No secret or secfile for section {0}"
495
507
                                .format(section))
496
508
            client["timeout"] = string_to_delta(section["timeout"])
497
509
            client["extended_timeout"] = string_to_delta(
508
520
        
509
521
        return settings
510
522
    
511
 
    def __init__(self, settings, name = None, server_settings=None):
 
523
    def __init__(self, settings, name = None):
512
524
        self.name = name
513
 
        if server_settings is None:
514
 
            server_settings = {}
515
 
        self.server_settings = server_settings
516
525
        # adding all client settings
517
 
        for setting, value in settings.items():
 
526
        for setting, value in settings.iteritems():
518
527
            setattr(self, setting, value)
519
528
        
520
529
        if self.enabled:
603
612
        if self.checker_initiator_tag is not None:
604
613
            gobject.source_remove(self.checker_initiator_tag)
605
614
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
615
                                      (self.interval_milliseconds(),
608
616
                                       self.start_checker))
609
617
        # Schedule a disable() when 'timeout' has passed
610
618
        if self.disable_initiator_tag is not None:
611
619
            gobject.source_remove(self.disable_initiator_tag)
612
620
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
621
                                   (self.timeout_milliseconds(),
 
622
                                    self.disable))
616
623
        # Also start a new checker *right now*.
617
624
        self.start_checker()
618
625
    
649
656
            self.disable_initiator_tag = None
650
657
        if getattr(self, "enabled", False):
651
658
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
659
                                          (timedelta_to_milliseconds
 
660
                                           (timeout), self.disable))
654
661
            self.expires = datetime.datetime.utcnow() + timeout
655
662
    
656
663
    def need_approval(self):
673
680
        # If a checker exists, make sure it is not a zombie
674
681
        try:
675
682
            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
 
683
        except (AttributeError, OSError) as error:
 
684
            if (isinstance(error, OSError)
 
685
                and error.errno != errno.ECHILD):
 
686
                raise error
681
687
        else:
682
688
            if pid:
683
689
                logger.warning("Checker was a zombie")
687
693
        # Start a new checker if needed
688
694
        if self.checker is None:
689
695
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              for attr in self.runtime_expansions }
 
696
            escaped_attrs = dict(
 
697
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
                for attr in
 
699
                self.runtime_expansions)
693
700
            try:
694
701
                command = self.checker_command % escaped_attrs
695
702
            except TypeError as error:
704
711
                # in normal mode, that is already done by daemon(),
705
712
                # and in debug mode we don't want to.  (Stdin is
706
713
                # 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
714
                self.checker = subprocess.Popen(command,
716
715
                                                close_fds=True,
717
 
                                                shell=True, cwd="/",
718
 
                                                **popen_args)
 
716
                                                shell=True, cwd="/")
719
717
            except OSError as error:
720
718
                logger.error("Failed to start subprocess",
721
719
                             exc_info=error)
722
 
                return True
723
720
            self.checker_callback_tag = (gobject.child_watch_add
724
721
                                         (self.checker.pid,
725
722
                                          self.checker_callback,
726
723
                                          data=command))
727
724
            # The checker may have completed before the gobject
728
725
            # 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
 
726
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
738
727
            if pid:
739
728
                gobject.source_remove(self.checker_callback_tag)
740
729
                self.checker_callback(pid, status, command)
776
765
    # "Set" method, so we fail early here:
777
766
    if byte_arrays and signature != "ay":
778
767
        raise ValueError("Byte arrays not supported for non-'ay'"
779
 
                         " signature {!r}".format(signature))
 
768
                         " signature {0!r}".format(signature))
780
769
    def decorator(func):
781
770
        func._dbus_is_property = True
782
771
        func._dbus_interface = dbus_interface
813
802
    """Decorator to annotate D-Bus methods, signals or properties
814
803
    Usage:
815
804
    
816
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
817
 
                       "org.freedesktop.DBus.Property."
818
 
                       "EmitsChangedSignal": "false"})
819
805
    @dbus_service_property("org.example.Interface", signature="b",
820
806
                           access="r")
 
807
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
808
                        "org.freedesktop.DBus.Property."
 
809
                        "EmitsChangedSignal": "false"})
821
810
    def Property_dbus_property(self):
822
811
        return dbus.Boolean(False)
823
812
    """
830
819
class DBusPropertyException(dbus.exceptions.DBusException):
831
820
    """A base class for D-Bus property-related exceptions
832
821
    """
833
 
    pass
 
822
    def __unicode__(self):
 
823
        return unicode(str(self))
 
824
 
834
825
 
835
826
class DBusPropertyAccessException(DBusPropertyException):
836
827
    """A property's access permissions disallows an operation.
859
850
        If called like _is_dbus_thing("method") it returns a function
860
851
        suitable for use as predicate to inspect.getmembers().
861
852
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
853
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
854
                                   False)
864
855
    
865
856
    def _get_all_dbus_things(self, thing):
914
905
            # The byte_arrays option is not supported yet on
915
906
            # signatures other than "ay".
916
907
            if prop._dbus_signature != "ay":
917
 
                raise ValueError("Byte arrays not supported for non-"
918
 
                                 "'ay' signature {!r}"
919
 
                                 .format(prop._dbus_signature))
 
908
                raise ValueError
920
909
            value = dbus.ByteArray(b''.join(chr(byte)
921
910
                                            for byte in value))
922
911
        prop(value)
946
935
                                           value.variant_level+1)
947
936
        return dbus.Dictionary(properties, signature="sv")
948
937
    
949
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
950
 
    def PropertiesChanged(self, interface_name, changed_properties,
951
 
                          invalidated_properties):
952
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
953
 
        standard.
954
 
        """
955
 
        pass
956
 
    
957
938
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
958
939
                         out_signature="s",
959
940
                         path_keyword='object_path',
994
975
                                              (prop,
995
976
                                               "_dbus_annotations",
996
977
                                               {}))
997
 
                        for name, value in annots.items():
 
978
                        for name, value in annots.iteritems():
998
979
                            ann_tag = document.createElement(
999
980
                                "annotation")
1000
981
                            ann_tag.setAttribute("name", name)
1003
984
                # Add interface annotation tags
1004
985
                for annotation, value in dict(
1005
986
                    itertools.chain.from_iterable(
1006
 
                        annotations().items()
 
987
                        annotations().iteritems()
1007
988
                        for name, annotations in
1008
989
                        self._get_all_dbus_things("interface")
1009
990
                        if name == if_tag.getAttribute("name")
1010
 
                        )).items():
 
991
                        )).iteritems():
1011
992
                    ann_tag = document.createElement("annotation")
1012
993
                    ann_tag.setAttribute("name", annotation)
1013
994
                    ann_tag.setAttribute("value", value)
1069
1050
    """
1070
1051
    def wrapper(cls):
1071
1052
        for orig_interface_name, alt_interface_name in (
1072
 
            alt_interface_names.items()):
 
1053
            alt_interface_names.iteritems()):
1073
1054
            attr = {}
1074
1055
            interface_names = set()
1075
1056
            # Go though all attributes of the class
1088
1069
                interface_names.add(alt_interface)
1089
1070
                # Is this a D-Bus signal?
1090
1071
                if getattr(attribute, "_dbus_is_signal", False):
1091
 
                    # Extract the original non-method undecorated
1092
 
                    # function by black magic
 
1072
                    # Extract the original non-method function by
 
1073
                    # black magic
1093
1074
                    nonmethod_func = (dict(
1094
1075
                            zip(attribute.func_code.co_freevars,
1095
1076
                                attribute.__closure__))["func"]
1192
1173
                                        attribute.func_closure)))
1193
1174
            if deprecate:
1194
1175
                # Deprecate all alternate interfaces
1195
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1176
                iname="_AlternateDBusNames_interface_annotation{0}"
1196
1177
                for interface_name in interface_names:
1197
1178
                    @dbus_interface_annotations(interface_name)
1198
1179
                    def func(self):
1207
1188
            if interface_names:
1208
1189
                # Replace the class with a new subclass of it with
1209
1190
                # methods, signals, etc. as created above.
1210
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1191
                cls = type(b"{0}Alternate".format(cls.__name__),
1211
1192
                           (cls,), attr)
1212
1193
        return cls
1213
1194
    return wrapper
1226
1207
    runtime_expansions = (Client.runtime_expansions
1227
1208
                          + ("dbus_object_path",))
1228
1209
    
1229
 
    _interface = "se.recompile.Mandos.Client"
1230
 
    
1231
1210
    # dbus.service.Object doesn't use super(), so we can't either.
1232
1211
    
1233
1212
    def __init__(self, bus = None, *args, **kwargs):
1235
1214
        Client.__init__(self, *args, **kwargs)
1236
1215
        # Only now, when this client is initialized, can it show up on
1237
1216
        # the D-Bus
1238
 
        client_object_name = str(self.name).translate(
 
1217
        client_object_name = unicode(self.name).translate(
1239
1218
            {ord("."): ord("_"),
1240
1219
             ord("-"): ord("_")})
1241
1220
        self.dbus_object_path = (dbus.ObjectPath
1245
1224
    
1246
1225
    def notifychangeproperty(transform_func,
1247
1226
                             dbus_name, type_func=lambda x: x,
1248
 
                             variant_level=1, invalidate_only=False,
1249
 
                             _interface=_interface):
 
1227
                             variant_level=1):
1250
1228
        """ Modify a variable so that it's a property which announces
1251
1229
        its changes to DBus.
1252
1230
        
1257
1235
                   to the D-Bus.  Default: no transform
1258
1236
        variant_level: D-Bus variant level.  Default: 1
1259
1237
        """
1260
 
        attrname = "_{}".format(dbus_name)
 
1238
        attrname = "_{0}".format(dbus_name)
1261
1239
        def setter(self, value):
1262
1240
            if hasattr(self, "dbus_object_path"):
1263
1241
                if (not hasattr(self, attrname) or
1264
1242
                    type_func(getattr(self, attrname, None))
1265
1243
                    != type_func(value)):
1266
 
                    if invalidate_only:
1267
 
                        self.PropertiesChanged(_interface,
1268
 
                                               dbus.Dictionary(),
1269
 
                                               dbus.Array
1270
 
                                               ((dbus_name,)))
1271
 
                    else:
1272
 
                        dbus_value = transform_func(type_func(value),
1273
 
                                                    variant_level
1274
 
                                                    =variant_level)
1275
 
                        self.PropertyChanged(dbus.String(dbus_name),
1276
 
                                             dbus_value)
1277
 
                        self.PropertiesChanged(_interface,
1278
 
                                               dbus.Dictionary({
1279
 
                                    dbus.String(dbus_name):
1280
 
                                        dbus_value }), dbus.Array())
 
1244
                    dbus_value = transform_func(type_func(value),
 
1245
                                                variant_level
 
1246
                                                =variant_level)
 
1247
                    self.PropertyChanged(dbus.String(dbus_name),
 
1248
                                         dbus_value)
1281
1249
            setattr(self, attrname, value)
1282
1250
        
1283
1251
        return property(lambda self: getattr(self, attrname), setter)
1303
1271
    approval_delay = notifychangeproperty(dbus.UInt64,
1304
1272
                                          "ApprovalDelay",
1305
1273
                                          type_func =
1306
 
                                          lambda td: td.total_seconds()
1307
 
                                          * 1000)
 
1274
                                          timedelta_to_milliseconds)
1308
1275
    approval_duration = notifychangeproperty(
1309
1276
        dbus.UInt64, "ApprovalDuration",
1310
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1277
        type_func = timedelta_to_milliseconds)
1311
1278
    host = notifychangeproperty(dbus.String, "Host")
1312
1279
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
 
                                   type_func = lambda td:
1314
 
                                       td.total_seconds() * 1000)
 
1280
                                   type_func =
 
1281
                                   timedelta_to_milliseconds)
1315
1282
    extended_timeout = notifychangeproperty(
1316
1283
        dbus.UInt64, "ExtendedTimeout",
1317
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1284
        type_func = timedelta_to_milliseconds)
1318
1285
    interval = notifychangeproperty(dbus.UInt64,
1319
1286
                                    "Interval",
1320
1287
                                    type_func =
1321
 
                                    lambda td: td.total_seconds()
1322
 
                                    * 1000)
 
1288
                                    timedelta_to_milliseconds)
1323
1289
    checker_command = notifychangeproperty(dbus.String, "Checker")
1324
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1325
 
                                  invalidate_only=True)
1326
1290
    
1327
1291
    del notifychangeproperty
1328
1292
    
1355
1319
                                       *args, **kwargs)
1356
1320
    
1357
1321
    def start_checker(self, *args, **kwargs):
1358
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1322
        old_checker = self.checker
 
1323
        if self.checker is not None:
 
1324
            old_checker_pid = self.checker.pid
 
1325
        else:
 
1326
            old_checker_pid = None
1359
1327
        r = Client.start_checker(self, *args, **kwargs)
1360
1328
        # Only if new checker process was started
1361
1329
        if (self.checker is not None
1370
1338
    
1371
1339
    def approve(self, value=True):
1372
1340
        self.approved = value
1373
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1374
 
                                * 1000), self._reset_approved)
 
1341
        gobject.timeout_add(timedelta_to_milliseconds
 
1342
                            (self.approval_duration),
 
1343
                            self._reset_approved)
1375
1344
        self.send_changedstate()
1376
1345
    
1377
1346
    ## D-Bus methods, signals & properties
 
1347
    _interface = "se.recompile.Mandos.Client"
1378
1348
    
1379
1349
    ## Interfaces
1380
1350
    
 
1351
    @dbus_interface_annotations(_interface)
 
1352
    def _foo(self):
 
1353
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1354
                     "false"}
 
1355
    
1381
1356
    ## Signals
1382
1357
    
1383
1358
    # CheckerCompleted - signal
1393
1368
        pass
1394
1369
    
1395
1370
    # PropertyChanged - signal
1396
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
1371
    @dbus.service.signal(_interface, signature="sv")
1398
1372
    def PropertyChanged(self, property, value):
1399
1373
        "D-Bus signal"
1475
1449
                           access="readwrite")
1476
1450
    def ApprovalDelay_dbus_property(self, value=None):
1477
1451
        if value is None:       # get
1478
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1479
 
                               * 1000)
 
1452
            return dbus.UInt64(self.approval_delay_milliseconds())
1480
1453
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1481
1454
    
1482
1455
    # ApprovalDuration - property
1484
1457
                           access="readwrite")
1485
1458
    def ApprovalDuration_dbus_property(self, value=None):
1486
1459
        if value is None:       # get
1487
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1488
 
                               * 1000)
 
1460
            return dbus.UInt64(timedelta_to_milliseconds(
 
1461
                    self.approval_duration))
1489
1462
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1490
1463
    
1491
1464
    # Name - property
1504
1477
    def Host_dbus_property(self, value=None):
1505
1478
        if value is None:       # get
1506
1479
            return dbus.String(self.host)
1507
 
        self.host = str(value)
 
1480
        self.host = unicode(value)
1508
1481
    
1509
1482
    # Created - property
1510
1483
    @dbus_service_property(_interface, signature="s", access="read")
1557
1530
                           access="readwrite")
1558
1531
    def Timeout_dbus_property(self, value=None):
1559
1532
        if value is None:       # get
1560
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1533
            return dbus.UInt64(self.timeout_milliseconds())
1561
1534
        old_timeout = self.timeout
1562
1535
        self.timeout = datetime.timedelta(0, 0, 0, value)
1563
1536
        # Reschedule disabling
1574
1547
                gobject.source_remove(self.disable_initiator_tag)
1575
1548
                self.disable_initiator_tag = (
1576
1549
                    gobject.timeout_add(
1577
 
                        int((self.expires - now).total_seconds()
1578
 
                            * 1000), self.disable))
 
1550
                        timedelta_to_milliseconds(self.expires - now),
 
1551
                        self.disable))
1579
1552
    
1580
1553
    # ExtendedTimeout - property
1581
1554
    @dbus_service_property(_interface, signature="t",
1582
1555
                           access="readwrite")
1583
1556
    def ExtendedTimeout_dbus_property(self, value=None):
1584
1557
        if value is None:       # get
1585
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1586
 
                               * 1000)
 
1558
            return dbus.UInt64(self.extended_timeout_milliseconds())
1587
1559
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1588
1560
    
1589
1561
    # Interval - property
1591
1563
                           access="readwrite")
1592
1564
    def Interval_dbus_property(self, value=None):
1593
1565
        if value is None:       # get
1594
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1566
            return dbus.UInt64(self.interval_milliseconds())
1595
1567
        self.interval = datetime.timedelta(0, 0, 0, value)
1596
1568
        if getattr(self, "checker_initiator_tag", None) is None:
1597
1569
            return
1608
1580
    def Checker_dbus_property(self, value=None):
1609
1581
        if value is None:       # get
1610
1582
            return dbus.String(self.checker_command)
1611
 
        self.checker_command = str(value)
 
1583
        self.checker_command = unicode(value)
1612
1584
    
1613
1585
    # CheckerRunning - property
1614
1586
    @dbus_service_property(_interface, signature="b",
1630
1602
    @dbus_service_property(_interface, signature="ay",
1631
1603
                           access="write", byte_arrays=True)
1632
1604
    def Secret_dbus_property(self, value):
1633
 
        self.secret = bytes(value)
 
1605
        self.secret = str(value)
1634
1606
    
1635
1607
    del _interface
1636
1608
 
1670
1642
    def handle(self):
1671
1643
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1644
            logger.info("TCP connection from: %s",
1673
 
                        str(self.client_address))
 
1645
                        unicode(self.client_address))
1674
1646
            logger.debug("Pipe FD: %d",
1675
1647
                         self.server.child_pipe.fileno())
1676
1648
            
1702
1674
            logger.debug("Protocol version: %r", line)
1703
1675
            try:
1704
1676
                if int(line.strip().split()[0]) > 1:
1705
 
                    raise RuntimeError(line)
 
1677
                    raise RuntimeError
1706
1678
            except (ValueError, IndexError, RuntimeError) as error:
1707
1679
                logger.error("Unknown protocol version: %s", error)
1708
1680
                return
1757
1729
                        if self.server.use_dbus:
1758
1730
                            # Emit D-Bus signal
1759
1731
                            client.NeedApproval(
1760
 
                                client.approval_delay.total_seconds()
1761
 
                                * 1000, client.approved_by_default)
 
1732
                                client.approval_delay_milliseconds(),
 
1733
                                client.approved_by_default)
1762
1734
                    else:
1763
1735
                        logger.warning("Client %s was not approved",
1764
1736
                                       client.name)
1770
1742
                    #wait until timeout or approved
1771
1743
                    time = datetime.datetime.now()
1772
1744
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(delay.total_seconds())
 
1745
                    client.changedstate.wait(
 
1746
                        float(timedelta_to_milliseconds(delay)
 
1747
                              / 1000))
1774
1748
                    client.changedstate.release()
1775
1749
                    time2 = datetime.datetime.now()
1776
1750
                    if (time2 - time) >= delay:
1913
1887
    
1914
1888
    def add_pipe(self, parent_pipe, proc):
1915
1889
        """Dummy function; override as necessary"""
1916
 
        raise NotImplementedError()
 
1890
        raise NotImplementedError
1917
1891
 
1918
1892
 
1919
1893
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1975
1949
                try:
1976
1950
                    self.socket.setsockopt(socket.SOL_SOCKET,
1977
1951
                                           SO_BINDTODEVICE,
1978
 
                                           (self.interface + "\0")
1979
 
                                           .encode("utf-8"))
 
1952
                                           str(self.interface + '\0'))
1980
1953
                except socket.error as error:
1981
1954
                    if error.errno == errno.EPERM:
1982
1955
                        logger.error("No permission to bind to"
1996
1969
                if self.address_family == socket.AF_INET6:
1997
1970
                    any_address = "::" # in6addr_any
1998
1971
                else:
1999
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1972
                    any_address = socket.INADDR_ANY
2000
1973
                self.server_address = (any_address,
2001
1974
                                       self.server_address[1])
2002
1975
            elif not self.server_address[1]:
2185
2158
    token_duration = Token(re.compile(r"P"), None,
2186
2159
                           frozenset((token_year, token_month,
2187
2160
                                      token_day, token_time,
2188
 
                                      token_week)))
 
2161
                                      token_week))),
2189
2162
    # Define starting values
2190
2163
    value = datetime.timedelta() # Value so far
2191
2164
    found_token = None
2192
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2165
    followers = frozenset(token_duration,) # Following valid tokens
2193
2166
    s = duration                # String left to parse
2194
2167
    # Loop until end token is found
2195
2168
    while found_token is not token_end:
2242
2215
    timevalue = datetime.timedelta(0)
2243
2216
    for s in interval.split():
2244
2217
        try:
2245
 
            suffix = s[-1]
 
2218
            suffix = unicode(s[-1])
2246
2219
            value = int(s[:-1])
2247
2220
            if suffix == "d":
2248
2221
                delta = datetime.timedelta(value)
2255
2228
            elif suffix == "w":
2256
2229
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2257
2230
            else:
2258
 
                raise ValueError("Unknown suffix {!r}"
 
2231
                raise ValueError("Unknown suffix {0!r}"
2259
2232
                                 .format(suffix))
2260
 
        except IndexError as e:
 
2233
        except (ValueError, IndexError) as e:
2261
2234
            raise ValueError(*(e.args))
2262
2235
        timevalue += delta
2263
2236
    return timevalue
2278
2251
        # Close all standard open file descriptors
2279
2252
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2280
2253
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2281
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2254
            raise OSError(errno.ENODEV,
 
2255
                          "{0} not a character device"
2282
2256
                          .format(os.devnull))
2283
2257
        os.dup2(null, sys.stdin.fileno())
2284
2258
        os.dup2(null, sys.stdout.fileno())
2294
2268
    
2295
2269
    parser = argparse.ArgumentParser()
2296
2270
    parser.add_argument("-v", "--version", action="version",
2297
 
                        version = "%(prog)s {}".format(version),
 
2271
                        version = "%(prog)s {0}".format(version),
2298
2272
                        help="show version number and exit")
2299
2273
    parser.add_argument("-i", "--interface", metavar="IF",
2300
2274
                        help="Bind to interface IF")
2306
2280
                        help="Run self-test")
2307
2281
    parser.add_argument("--debug", action="store_true",
2308
2282
                        help="Debug mode; run in foreground and log"
2309
 
                        " to terminal", default=None)
 
2283
                        " to terminal")
2310
2284
    parser.add_argument("--debuglevel", metavar="LEVEL",
2311
2285
                        help="Debug level for stdout output")
2312
2286
    parser.add_argument("--priority", help="GnuTLS"
2319
2293
                        " files")
2320
2294
    parser.add_argument("--no-dbus", action="store_false",
2321
2295
                        dest="use_dbus", help="Do not provide D-Bus"
2322
 
                        " system bus interface", default=None)
 
2296
                        " system bus interface")
2323
2297
    parser.add_argument("--no-ipv6", action="store_false",
2324
 
                        dest="use_ipv6", help="Do not use IPv6",
2325
 
                        default=None)
 
2298
                        dest="use_ipv6", help="Do not use IPv6")
2326
2299
    parser.add_argument("--no-restore", action="store_false",
2327
2300
                        dest="restore", help="Do not restore stored"
2328
 
                        " state", default=None)
 
2301
                        " state")
2329
2302
    parser.add_argument("--socket", type=int,
2330
2303
                        help="Specify a file descriptor to a network"
2331
2304
                        " socket to use instead of creating one")
2332
2305
    parser.add_argument("--statedir", metavar="DIR",
2333
2306
                        help="Directory to save/restore state in")
2334
2307
    parser.add_argument("--foreground", action="store_true",
2335
 
                        help="Run in foreground", default=None)
2336
 
    parser.add_argument("--no-zeroconf", action="store_false",
2337
 
                        dest="zeroconf", help="Do not use Zeroconf",
2338
 
                        default=None)
 
2308
                        help="Run in foreground")
2339
2309
    
2340
2310
    options = parser.parse_args()
2341
2311
    
2342
2312
    if options.check:
2343
2313
        import doctest
2344
 
        fail_count, test_count = doctest.testmod()
2345
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2314
        doctest.testmod()
 
2315
        sys.exit()
2346
2316
    
2347
2317
    # Default values for config file for server-global settings
2348
2318
    server_defaults = { "interface": "",
2350
2320
                        "port": "",
2351
2321
                        "debug": "False",
2352
2322
                        "priority":
2353
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2323
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2354
2324
                        "servicename": "Mandos",
2355
2325
                        "use_dbus": "True",
2356
2326
                        "use_ipv6": "True",
2359
2329
                        "socket": "",
2360
2330
                        "statedir": "/var/lib/mandos",
2361
2331
                        "foreground": "False",
2362
 
                        "zeroconf": "True",
2363
2332
                        }
2364
2333
    
2365
2334
    # Parse config file for server-global settings
2392
2361
    for option in ("interface", "address", "port", "debug",
2393
2362
                   "priority", "servicename", "configdir",
2394
2363
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2395
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2364
                   "statedir", "socket", "foreground"):
2396
2365
        value = getattr(options, option)
2397
2366
        if value is not None:
2398
2367
            server_settings[option] = value
2399
2368
    del options
2400
2369
    # Force all strings to be unicode
2401
2370
    for option in server_settings.keys():
2402
 
        if isinstance(server_settings[option], bytes):
2403
 
            server_settings[option] = (server_settings[option]
2404
 
                                       .decode("utf-8"))
2405
 
    # Force all boolean options to be boolean
2406
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground", "zeroconf"):
2408
 
        server_settings[option] = bool(server_settings[option])
 
2371
        if type(server_settings[option]) is str:
 
2372
            server_settings[option] = unicode(server_settings[option])
2409
2373
    # Debug implies foreground
2410
2374
    if server_settings["debug"]:
2411
2375
        server_settings["foreground"] = True
2413
2377
    
2414
2378
    ##################################################################
2415
2379
    
2416
 
    if (not server_settings["zeroconf"] and
2417
 
        not (server_settings["port"]
2418
 
             or server_settings["socket"] != "")):
2419
 
            parser.error("Needs port or socket to work without"
2420
 
                         " Zeroconf")
2421
 
    
2422
2380
    # For convenience
2423
2381
    debug = server_settings["debug"]
2424
2382
    debuglevel = server_settings["debuglevel"]
2427
2385
    stored_state_path = os.path.join(server_settings["statedir"],
2428
2386
                                     stored_state_file)
2429
2387
    foreground = server_settings["foreground"]
2430
 
    zeroconf = server_settings["zeroconf"]
2431
2388
    
2432
2389
    if debug:
2433
2390
        initlogger(debug, logging.DEBUG)
2440
2397
    
2441
2398
    if server_settings["servicename"] != "Mandos":
2442
2399
        syslogger.setFormatter(logging.Formatter
2443
 
                               ('Mandos ({}) [%(process)d]:'
 
2400
                               ('Mandos ({0}) [%(process)d]:'
2444
2401
                                ' %(levelname)s: %(message)s'
2445
2402
                                .format(server_settings
2446
2403
                                        ["servicename"])))
2454
2411
    global mandos_dbus_service
2455
2412
    mandos_dbus_service = None
2456
2413
    
2457
 
    socketfd = None
2458
 
    if server_settings["socket"] != "":
2459
 
        socketfd = server_settings["socket"]
2460
2414
    tcp_server = MandosServer((server_settings["address"],
2461
2415
                               server_settings["port"]),
2462
2416
                              ClientHandler,
2466
2420
                              gnutls_priority=
2467
2421
                              server_settings["priority"],
2468
2422
                              use_dbus=use_dbus,
2469
 
                              socketfd=socketfd)
 
2423
                              socketfd=(server_settings["socket"]
 
2424
                                        or None))
2470
2425
    if not foreground:
2471
 
        pidfilename = "/run/mandos.pid"
2472
 
        if not os.path.isdir("/run/."):
2473
 
            pidfilename = "/var/run/mandos.pid"
 
2426
        pidfilename = "/var/run/mandos.pid"
2474
2427
        pidfile = None
2475
2428
        try:
2476
2429
            pidfile = open(pidfilename, "w")
2493
2446
        os.setuid(uid)
2494
2447
    except OSError as error:
2495
2448
        if error.errno != errno.EPERM:
2496
 
            raise
 
2449
            raise error
2497
2450
    
2498
2451
    if debug:
2499
2452
        # Enable all possible GnuTLS debugging
2542
2495
            use_dbus = False
2543
2496
            server_settings["use_dbus"] = False
2544
2497
            tcp_server.use_dbus = False
2545
 
    if zeroconf:
2546
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2547
 
        service = AvahiServiceToSyslog(name =
2548
 
                                       server_settings["servicename"],
2549
 
                                       servicetype = "_mandos._tcp",
2550
 
                                       protocol = protocol, bus = bus)
2551
 
        if server_settings["interface"]:
2552
 
            service.interface = (if_nametoindex
2553
 
                                 (server_settings["interface"]
2554
 
                                  .encode("utf-8")))
 
2498
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2499
    service = AvahiServiceToSyslog(name =
 
2500
                                   server_settings["servicename"],
 
2501
                                   servicetype = "_mandos._tcp",
 
2502
                                   protocol = protocol, bus = bus)
 
2503
    if server_settings["interface"]:
 
2504
        service.interface = (if_nametoindex
 
2505
                             (str(server_settings["interface"])))
2555
2506
    
2556
2507
    global multiprocessing_manager
2557
2508
    multiprocessing_manager = multiprocessing.Manager()
2564
2515
    old_client_settings = {}
2565
2516
    clients_data = {}
2566
2517
    
2567
 
    # This is used to redirect stdout and stderr for checker processes
2568
 
    global wnull
2569
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2570
 
    # Only used if server is running in foreground but not in debug
2571
 
    # mode
2572
 
    if debug or not foreground:
2573
 
        wnull.close()
2574
 
    
2575
2518
    # Get client data and settings from last running state.
2576
2519
    if server_settings["restore"]:
2577
2520
        try:
2581
2524
            os.remove(stored_state_path)
2582
2525
        except IOError as e:
2583
2526
            if e.errno == errno.ENOENT:
2584
 
                logger.warning("Could not load persistent state: {}"
 
2527
                logger.warning("Could not load persistent state: {0}"
2585
2528
                                .format(os.strerror(e.errno)))
2586
2529
            else:
2587
2530
                logger.critical("Could not load persistent state:",
2592
2535
                           "EOFError:", exc_info=e)
2593
2536
    
2594
2537
    with PGPEngine() as pgp:
2595
 
        for client_name, client in clients_data.items():
2596
 
            # Skip removed clients
2597
 
            if client_name not in client_settings:
2598
 
                continue
2599
 
            
 
2538
        for client_name, client in clients_data.iteritems():
2600
2539
            # Decide which value to use after restoring saved state.
2601
2540
            # We have three different values: Old config file,
2602
2541
            # new config file, and saved state.
2623
2562
                if datetime.datetime.utcnow() >= client["expires"]:
2624
2563
                    if not client["last_checked_ok"]:
2625
2564
                        logger.warning(
2626
 
                            "disabling client {} - Client never "
 
2565
                            "disabling client {0} - Client never "
2627
2566
                            "performed a successful checker"
2628
2567
                            .format(client_name))
2629
2568
                        client["enabled"] = False
2630
2569
                    elif client["last_checker_status"] != 0:
2631
2570
                        logger.warning(
2632
 
                            "disabling client {} - Client last"
2633
 
                            " checker failed with error code {}"
 
2571
                            "disabling client {0} - Client "
 
2572
                            "last checker failed with error code {1}"
2634
2573
                            .format(client_name,
2635
2574
                                    client["last_checker_status"]))
2636
2575
                        client["enabled"] = False
2639
2578
                                             .utcnow()
2640
2579
                                             + client["timeout"])
2641
2580
                        logger.debug("Last checker succeeded,"
2642
 
                                     " keeping {} enabled"
 
2581
                                     " keeping {0} enabled"
2643
2582
                                     .format(client_name))
2644
2583
            try:
2645
2584
                client["secret"] = (
2648
2587
                                ["secret"]))
2649
2588
            except PGPError:
2650
2589
                # If decryption fails, we use secret from new settings
2651
 
                logger.debug("Failed to decrypt {} old secret"
 
2590
                logger.debug("Failed to decrypt {0} old secret"
2652
2591
                             .format(client_name))
2653
2592
                client["secret"] = (
2654
2593
                    client_settings[client_name]["secret"])
2662
2601
        clients_data[client_name] = client_settings[client_name]
2663
2602
    
2664
2603
    # Create all client objects
2665
 
    for client_name, client in clients_data.items():
 
2604
    for client_name, client in clients_data.iteritems():
2666
2605
        tcp_server.clients[client_name] = client_class(
2667
 
            name = client_name, settings = client,
2668
 
            server_settings = server_settings)
 
2606
            name = client_name, settings = client)
2669
2607
    
2670
2608
    if not tcp_server.clients:
2671
2609
        logger.warning("No clients defined")
2675
2613
            try:
2676
2614
                with pidfile:
2677
2615
                    pid = os.getpid()
2678
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2616
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2679
2617
            except IOError:
2680
2618
                logger.error("Could not write to file %r with PID %d",
2681
2619
                             pidfilename, pid)
2727
2665
            def GetAllClientsWithProperties(self):
2728
2666
                "D-Bus method"
2729
2667
                return dbus.Dictionary(
2730
 
                    { c.dbus_object_path: c.GetAll("")
2731
 
                      for c in tcp_server.clients.itervalues() },
 
2668
                    ((c.dbus_object_path, c.GetAll(""))
 
2669
                     for c in tcp_server.clients.itervalues()),
2732
2670
                    signature="oa{sv}")
2733
2671
            
2734
2672
            @dbus.service.method(_interface, in_signature="o")
2751
2689
    
2752
2690
    def cleanup():
2753
2691
        "Cleanup function; run on exit"
2754
 
        if zeroconf:
2755
 
            service.cleanup()
 
2692
        service.cleanup()
2756
2693
        
2757
2694
        multiprocessing.active_children()
2758
 
        wnull.close()
2759
2695
        if not (tcp_server.clients or client_settings):
2760
2696
            return
2761
2697
        
2772
2708
                
2773
2709
                # A list of attributes that can not be pickled
2774
2710
                # + secret.
2775
 
                exclude = { "bus", "changedstate", "secret",
2776
 
                            "checker", "server_settings" }
 
2711
                exclude = set(("bus", "changedstate", "secret",
 
2712
                               "checker"))
2777
2713
                for name, typ in (inspect.getmembers
2778
2714
                                  (dbus.service.Object)):
2779
2715
                    exclude.add(name)
2802
2738
                except NameError:
2803
2739
                    pass
2804
2740
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2805
 
                logger.warning("Could not save persistent state: {}"
 
2741
                logger.warning("Could not save persistent state: {0}"
2806
2742
                               .format(os.strerror(e.errno)))
2807
2743
            else:
2808
2744
                logger.warning("Could not save persistent state:",
2809
2745
                               exc_info=e)
2810
 
                raise
 
2746
                raise e
2811
2747
        
2812
2748
        # Delete all clients, and settings from config
2813
2749
        while tcp_server.clients:
2837
2773
    tcp_server.server_activate()
2838
2774
    
2839
2775
    # Find out what port we got
2840
 
    if zeroconf:
2841
 
        service.port = tcp_server.socket.getsockname()[1]
 
2776
    service.port = tcp_server.socket.getsockname()[1]
2842
2777
    if use_ipv6:
2843
2778
        logger.info("Now listening on address %r, port %d,"
2844
2779
                    " flowinfo %d, scope_id %d",
2850
2785
    #service.interface = tcp_server.socket.getsockname()[3]
2851
2786
    
2852
2787
    try:
2853
 
        if zeroconf:
2854
 
            # From the Avahi example code
2855
 
            try:
2856
 
                service.activate()
2857
 
            except dbus.exceptions.DBusException as error:
2858
 
                logger.critical("D-Bus Exception", exc_info=error)
2859
 
                cleanup()
2860
 
                sys.exit(1)
2861
 
            # End of Avahi example code
 
2788
        # From the Avahi example code
 
2789
        try:
 
2790
            service.activate()
 
2791
        except dbus.exceptions.DBusException as error:
 
2792
            logger.critical("D-Bus Exception", exc_info=error)
 
2793
            cleanup()
 
2794
            sys.exit(1)
 
2795
        # End of Avahi example code
2862
2796
        
2863
2797
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2864
2798
                             lambda *args, **kwargs: