/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: 2014-08-09 13:12:55 UTC
  • Revision ID: teddy@recompile.se-20140809131255-lp31j98u2pl0xpe6
mandos: Stop using str() and remove unnecessary unicode() calls.

* mandos (if_nametoindex): Use "bytes" literal instead of str().
  (initlogger): Use a unicode string for log device.
  (AvahiError.__unicode__): Removed.
  (DBusPropertyException.__unicode__): - '' -
  (ClientDBus.Secret_dbus_property): Use bytes() instead of str().
  (IPv6_TCPServer.server_bind): Use .encode() instead of str().
  (string_to_delta): Removed unnecessary unicode() call.
  (main): Use "isinstance(x, bytes)" instead of "type(x) is str", use
          .decode() instead of unicode(), and use .encode() instead of
          str().

Show diffs side-by-side

added added

removed removed

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