2
 
# -*- mode: python; coding: utf-8 -*-
 
 
2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-2016 Teddy Hogeborn
 
15
 
# Copyright © 2008-2016 Björn Påhlsson
 
17
 
# This program is free software: you can redistribute it and/or modify
 
18
 
# it under the terms of the GNU General Public License as published by
 
 
14
# Copyright © 2008-2020 Teddy Hogeborn
 
 
15
# Copyright © 2008-2020 Björn Påhlsson
 
 
17
# This file is part of Mandos.
 
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
 
20
# under the terms of the GNU General Public License as published by
 
19
21
# the Free Software Foundation, either version 3 of the License, or
 
20
22
# (at your option) any later version.
 
22
 
#     This program is distributed in the hope that it will be useful,
 
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
25
27
#     GNU General Public License for more details.
 
27
29
# You should have received a copy of the GNU General Public License
 
28
 
# along with this program.  If not, see
 
29
 
# <http://www.gnu.org/licenses/>.
 
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
31
32
# Contact the authors at <mandos@recompile.se>.
 
34
35
from __future__ import (division, absolute_import, print_function,
 
 
86
91
import xml.dom.minidom
 
 
94
if sys.version_info.major == 2:
 
 
98
# Add collections.abc.Callable if it does not exist
 
 
100
    collections.abc.Callable
 
 
101
except AttributeError:
 
 
103
        Callable = collections.Callable
 
 
104
    collections.abc = abc
 
 
107
# Add shlex.quote if it does not exist
 
 
110
except AttributeError:
 
 
111
    shlex.quote = re.escape
 
 
113
# Show warnings by default
 
 
114
if not sys.warnoptions:
 
 
116
    warnings.simplefilter("default")
 
 
118
# Try to find the value of SO_BINDTODEVICE:
 
 
120
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
121
    # newer, and it is also the most natural place for it:
 
90
122
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
91
123
except AttributeError:
 
 
125
        # This is where SO_BINDTODEVICE was up to and including Python
 
93
127
        from IN import SO_BINDTODEVICE
 
94
128
    except ImportError:
 
95
 
        SO_BINDTODEVICE = None
 
97
 
if sys.version_info.major == 2:
 
 
129
        # In Python 2.7 it seems to have been removed entirely.
 
 
130
        # Try running the C preprocessor:
 
 
132
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
134
                                  stdin=subprocess.PIPE,
 
 
135
                                  stdout=subprocess.PIPE)
 
 
136
            stdout = cc.communicate(
 
 
137
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
138
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
139
        except (OSError, ValueError, IndexError):
 
 
141
            SO_BINDTODEVICE = None
 
 
143
if sys.version_info < (3, 2):
 
 
144
    configparser.Configparser = configparser.SafeConfigParser
 
101
147
stored_state_file = "clients.pickle"
 
103
149
logger = logging.getLogger()
 
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
 
107
154
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
108
155
        ctypes.util.find_library("c")).if_nametoindex
 
109
156
except (OSError, AttributeError):
 
111
158
    def if_nametoindex(interface):
 
112
159
        "Get an interface index the hard way, i.e. using fcntl()"
 
113
160
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
 
227
276
                                     '--passphrase-file',
 
229
278
                                    + self.gnupgargs,
 
230
 
                                    stdin = subprocess.PIPE,
 
231
 
                                    stdout = subprocess.PIPE,
 
232
 
                                    stderr = subprocess.PIPE)
 
233
 
            ciphertext, err = proc.communicate(input = data)
 
 
279
                                    stdin=subprocess.PIPE,
 
 
280
                                    stdout=subprocess.PIPE,
 
 
281
                                    stderr=subprocess.PIPE)
 
 
282
            ciphertext, err = proc.communicate(input=data)
 
234
283
        if proc.returncode != 0:
 
235
284
            raise PGPError(err)
 
236
285
        return ciphertext
 
238
287
    def decrypt(self, data, password):
 
239
288
        passphrase = self.password_encode(password)
 
240
289
        with tempfile.NamedTemporaryFile(
 
241
 
                dir = self.tempdir) as passfile:
 
 
290
                dir=self.tempdir) as passfile:
 
242
291
            passfile.write(passphrase)
 
244
293
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
245
294
                                     '--passphrase-file',
 
247
296
                                    + self.gnupgargs,
 
248
 
                                    stdin = subprocess.PIPE,
 
249
 
                                    stdout = subprocess.PIPE,
 
250
 
                                    stderr = subprocess.PIPE)
 
251
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
 
297
                                    stdin=subprocess.PIPE,
 
 
298
                                    stdout=subprocess.PIPE,
 
 
299
                                    stderr=subprocess.PIPE)
 
 
300
            decrypted_plaintext, err = proc.communicate(input=data)
 
252
301
        if proc.returncode != 0:
 
253
302
            raise PGPError(err)
 
254
303
        return decrypted_plaintext
 
256
306
# Pretend that we have an Avahi module
 
258
 
    """This isn't so much a class as it is a module-like namespace.
 
259
 
    It is instantiated once, and simulates having an Avahi module."""
 
260
 
    IF_UNSPEC = -1              # avahi-common/address.h
 
261
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
 
262
 
    PROTO_INET = 0              # avahi-common/address.h
 
263
 
    PROTO_INET6 = 1             # avahi-common/address.h
 
 
308
    """This isn't so much a class as it is a module-like namespace."""
 
 
309
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
310
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
311
    PROTO_INET = 0               # avahi-common/address.h
 
 
312
    PROTO_INET6 = 1              # avahi-common/address.h
 
264
313
    DBUS_NAME = "org.freedesktop.Avahi"
 
265
314
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
266
315
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
267
316
    DBUS_PATH_SERVER = "/"
 
268
 
    def string_array_to_txt_array(self, t):
 
 
319
    def string_array_to_txt_array(t):
 
269
320
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
270
321
                           for s in t), signature="ay")
 
271
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
 
272
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
 
273
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
 
274
 
    SERVER_INVALID = 0          # avahi-common/defs.h
 
275
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
 
276
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
 
277
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
 
278
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
 
 
322
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
323
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
324
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
325
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
326
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
327
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
328
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
329
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
281
332
class AvahiError(Exception):
 
282
333
    def __init__(self, value, *args, **kwargs):
 
 
473
524
class AvahiServiceToSyslog(AvahiService):
 
474
525
    def rename(self, *args, **kwargs):
 
475
526
        """Add the new name to the syslog messages"""
 
476
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
477
528
        syslogger.setFormatter(logging.Formatter(
 
478
529
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
479
530
            .format(self.name)))
 
482
534
# Pretend that we have a GnuTLS module
 
483
 
class GnuTLS(object):
 
484
 
    """This isn't so much a class as it is a module-like namespace.
 
485
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
487
 
    _library = ctypes.cdll.LoadLibrary(
 
488
 
        ctypes.util.find_library("gnutls"))
 
489
 
    _need_version = b"3.3.0"
 
491
 
        # Need to use class name "GnuTLS" here, since this method is
 
492
 
        # called before the assignment to the "gnutls" global variable
 
494
 
        if GnuTLS.check_version(self._need_version) is None:
 
495
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
496
 
                               .format(self._need_version))
 
 
536
    """This isn't so much a class as it is a module-like namespace."""
 
 
538
    library = ctypes.util.find_library("gnutls")
 
 
540
        library = ctypes.util.find_library("gnutls-deb0")
 
 
541
    _library = ctypes.cdll.LoadLibrary(library)
 
498
544
    # Unless otherwise indicated, the constants and types below are
 
499
545
    # all from the gnutls/gnutls.h C header file.
 
503
549
    E_INTERRUPTED = -52
 
508
555
    CRD_CERTIFICATE = 1
 
509
556
    E_NO_CERTIFICATE_FOUND = -49
 
 
561
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
510
562
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
513
565
    class session_int(ctypes.Structure):
 
515
567
    session_t = ctypes.POINTER(session_int)
 
516
569
    class certificate_credentials_st(ctypes.Structure):
 
518
571
    certificate_credentials_t = ctypes.POINTER(
 
519
572
        certificate_credentials_st)
 
520
573
    certificate_type_t = ctypes.c_int
 
521
575
    class datum_t(ctypes.Structure):
 
522
576
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
523
577
                    ('size', ctypes.c_uint)]
 
524
579
    class openpgp_crt_int(ctypes.Structure):
 
526
581
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
 
582
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
528
583
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
529
584
    credentials_type_t = ctypes.c_int
 
530
585
    transport_ptr_t = ctypes.c_void_p
 
531
586
    close_request_t = ctypes.c_int
 
534
589
    class Error(Exception):
 
535
 
        # We need to use the class name "GnuTLS" here, since this
 
536
 
        # exception might be raised from within GnuTLS.__init__,
 
537
 
        # which is called before the assignment to the "gnutls"
 
538
 
        # global variable has happened.
 
539
 
        def __init__(self, message = None, code = None, args=()):
 
 
590
        def __init__(self, message=None, code=None, args=()):
 
540
591
            # Default usage is by a message string, but if a return
 
541
592
            # code is passed, convert it to a string with
 
542
593
            # gnutls.strerror()
 
544
595
            if message is None and code is not None:
 
545
 
                message = GnuTLS.strerror(code)
 
546
 
            return super(GnuTLS.Error, self).__init__(
 
 
596
                message = gnutls.strerror(code)
 
 
597
            return super(gnutls.Error, self).__init__(
 
549
600
    class CertificateSecurityError(Error):
 
553
 
    class Credentials(object):
 
554
605
        def __init__(self):
 
555
606
            self._c_object = gnutls.certificate_credentials_t()
 
556
607
            gnutls.certificate_allocate_credentials(
 
557
608
                ctypes.byref(self._c_object))
 
558
609
            self.type = gnutls.CRD_CERTIFICATE
 
560
611
        def __del__(self):
 
561
612
            gnutls.certificate_free_credentials(self._c_object)
 
563
 
    class ClientSession(object):
 
564
 
        def __init__(self, socket, credentials = None):
 
 
615
        def __init__(self, socket, credentials=None):
 
565
616
            self._c_object = gnutls.session_t()
 
566
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
 
617
            gnutls_flags = gnutls.CLIENT
 
 
618
            if gnutls.check_version(b"3.5.6"):
 
 
619
                gnutls_flags |= gnutls.NO_TICKETS
 
 
621
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
622
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
567
624
            gnutls.set_default_priority(self._c_object)
 
568
625
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
569
626
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
611
668
                return _error_code(result)
 
612
669
            result = func(*arguments)
 
615
672
    # Unless otherwise indicated, the function declarations below are
 
616
673
    # all from the gnutls/gnutls.h C header file.
 
619
676
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
677
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
678
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
679
    priority_set_direct.restype = _error_code
 
624
681
    init = _library.gnutls_init
 
625
682
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
683
    init.restype = _error_code
 
628
685
    set_default_priority = _library.gnutls_set_default_priority
 
629
686
    set_default_priority.argtypes = [session_t]
 
630
687
    set_default_priority.restype = _error_code
 
632
689
    record_send = _library.gnutls_record_send
 
633
690
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
635
692
    record_send.restype = ctypes.c_ssize_t
 
636
693
    record_send.errcheck = _retry_on_error
 
638
695
    certificate_allocate_credentials = (
 
639
696
        _library.gnutls_certificate_allocate_credentials)
 
640
697
    certificate_allocate_credentials.argtypes = [
 
641
698
        ctypes.POINTER(certificate_credentials_t)]
 
642
699
    certificate_allocate_credentials.restype = _error_code
 
644
701
    certificate_free_credentials = (
 
645
702
        _library.gnutls_certificate_free_credentials)
 
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
703
    certificate_free_credentials.argtypes = [
 
 
704
        certificate_credentials_t]
 
647
705
    certificate_free_credentials.restype = None
 
649
707
    handshake_set_private_extensions = (
 
650
708
        _library.gnutls_handshake_set_private_extensions)
 
651
709
    handshake_set_private_extensions.argtypes = [session_t,
 
653
711
    handshake_set_private_extensions.restype = None
 
655
713
    credentials_set = _library.gnutls_credentials_set
 
656
714
    credentials_set.argtypes = [session_t, credentials_type_t,
 
658
716
    credentials_set.restype = _error_code
 
660
718
    strerror = _library.gnutls_strerror
 
661
719
    strerror.argtypes = [ctypes.c_int]
 
662
720
    strerror.restype = ctypes.c_char_p
 
664
722
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
723
    certificate_type_get.argtypes = [session_t]
 
666
724
    certificate_type_get.restype = _error_code
 
668
726
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
727
    certificate_get_peers.argtypes = [session_t,
 
670
728
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
729
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
673
731
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
732
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
733
    global_set_log_level.restype = None
 
677
735
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
736
    global_set_log_function.argtypes = [log_func]
 
679
737
    global_set_log_function.restype = None
 
681
739
    deinit = _library.gnutls_deinit
 
682
740
    deinit.argtypes = [session_t]
 
683
741
    deinit.restype = None
 
685
743
    handshake = _library.gnutls_handshake
 
686
744
    handshake.argtypes = [session_t]
 
687
745
    handshake.restype = _error_code
 
688
746
    handshake.errcheck = _retry_on_error
 
690
748
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
749
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
750
    transport_set_ptr.restype = None
 
694
752
    bye = _library.gnutls_bye
 
695
753
    bye.argtypes = [session_t, close_request_t]
 
696
754
    bye.restype = _error_code
 
697
755
    bye.errcheck = _retry_on_error
 
699
757
    check_version = _library.gnutls_check_version
 
700
758
    check_version.argtypes = [ctypes.c_char_p]
 
701
759
    check_version.restype = ctypes.c_char_p
 
703
 
    # All the function declarations below are from gnutls/openpgp.h
 
705
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
706
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
707
 
    openpgp_crt_init.restype = _error_code
 
709
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
710
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
711
 
                                   ctypes.POINTER(datum_t),
 
713
 
    openpgp_crt_import.restype = _error_code
 
715
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
716
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
717
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
718
 
    openpgp_crt_verify_self.restype = _error_code
 
720
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
721
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
722
 
    openpgp_crt_deinit.restype = None
 
724
 
    openpgp_crt_get_fingerprint = (
 
725
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
726
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
730
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
 
761
    _need_version = b"3.3.0"
 
 
762
    if check_version(_need_version) is None:
 
 
763
        raise self.Error("Needs GnuTLS {} or later"
 
 
764
                         .format(_need_version))
 
 
766
    _tls_rawpk_version = b"3.6.6"
 
 
767
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
771
        class pubkey_st(ctypes.Structure):
 
 
773
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
775
        x509_crt_fmt_t = ctypes.c_int
 
 
777
        # All the function declarations below are from gnutls/abstract.h
 
 
778
        pubkey_init = _library.gnutls_pubkey_init
 
 
779
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
780
        pubkey_init.restype = _error_code
 
 
782
        pubkey_import = _library.gnutls_pubkey_import
 
 
783
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
785
        pubkey_import.restype = _error_code
 
 
787
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
788
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
789
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
790
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
791
        pubkey_get_key_id.restype = _error_code
 
 
793
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
794
        pubkey_deinit.argtypes = [pubkey_t]
 
 
795
        pubkey_deinit.restype = None
 
 
797
        # All the function declarations below are from gnutls/openpgp.h
 
 
799
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
800
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
801
        openpgp_crt_init.restype = _error_code
 
 
803
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
804
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
805
                                       ctypes.POINTER(datum_t),
 
 
807
        openpgp_crt_import.restype = _error_code
 
 
809
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
810
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
811
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
812
        openpgp_crt_verify_self.restype = _error_code
 
 
814
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
815
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
816
        openpgp_crt_deinit.restype = None
 
 
818
        openpgp_crt_get_fingerprint = (
 
 
819
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
820
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
824
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
826
    if check_version(b"3.6.4"):
 
 
827
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
828
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
829
        certificate_type_get2.restype = _error_code
 
732
831
    # Remove non-public functions
 
733
832
    del _error_code, _retry_on_error
 
734
 
# Create the global "gnutls" object, simulating a module
 
737
835
def call_pipe(connection,       # : multiprocessing.Connection
 
738
836
              func, *args, **kwargs):
 
739
837
    """This function is meant to be called by multiprocessing.Process
 
741
839
    This function runs func(*args, **kwargs), and writes the resulting
 
742
840
    return value on the provided multiprocessing.Connection.
 
744
842
    connection.send(func(*args, **kwargs))
 
745
843
    connection.close()
 
747
 
class Client(object):
 
748
847
    """A representation of a client host served by this server.
 
751
850
    approved:   bool(); 'None' if not yet approved/disapproved
 
752
851
    approval_delay: datetime.timedelta(); Time to wait for approval
 
753
852
    approval_duration: datetime.timedelta(); Duration of one approval
 
754
 
    checker:    subprocess.Popen(); a running checker process used
 
755
 
                                    to see if the client lives.
 
756
 
                                    'None' if no process is running.
 
 
853
    checker: multiprocessing.Process(); a running checker process used
 
 
854
             to see if the client lives. 'None' if no process is
 
757
856
    checker_callback_tag: a GLib event source tag, or None
 
758
857
    checker_command: string; External command which is run to check
 
759
858
                     if client lives.  %() expansions are done at
 
 
1428
1535
                         exc_info=error)
 
1429
1536
        return xmlstring
 
1432
1540
    dbus.OBJECT_MANAGER_IFACE
 
1433
1541
except AttributeError:
 
1434
1542
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1436
1545
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
1546
    """A D-Bus object with an ObjectManager.
 
1439
1548
    Classes inheriting from this exposes the standard
 
1440
1549
    GetManagedObjects call and the InterfacesAdded and
 
1441
1550
    InterfacesRemoved signals on the standard
 
1442
1551
    "org.freedesktop.DBus.ObjectManager" interface.
 
1444
1553
    Note: No signals are sent automatically; they must be sent
 
1447
1556
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
 
                         out_signature = "a{oa{sa{sv}}}")
 
 
1557
                         out_signature="a{oa{sa{sv}}}")
 
1449
1558
    def GetManagedObjects(self):
 
1450
1559
        """This function must be overridden"""
 
1451
1560
        raise NotImplementedError()
 
1453
1562
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
 
                         signature = "oa{sa{sv}}")
 
 
1563
                         signature="oa{sa{sv}}")
 
1455
1564
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1458
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1567
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1459
1568
    def InterfacesRemoved(self, object_path, interfaces):
 
1462
1571
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
 
                         out_signature = "s",
 
1464
 
                         path_keyword = 'object_path',
 
1465
 
                         connection_keyword = 'connection')
 
 
1573
                         path_keyword='object_path',
 
 
1574
                         connection_keyword='connection')
 
1466
1575
    def Introspect(self, object_path, connection):
 
1467
1576
        """Overloading of standard D-Bus method.
 
1469
1578
        Override return argument name of GetManagedObjects to be
 
1470
1579
        "objpath_interfaces_and_properties"
 
 
2152
2271
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2153
2272
    """A class to handle client connections.
 
2155
2274
    Instantiated once for each connection to handle it.
 
2156
2275
    Note: This will run in its own forked process."""
 
2158
2277
    def handle(self):
 
2159
2278
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2160
2279
            logger.info("TCP connection from: %s",
 
2161
2280
                        str(self.client_address))
 
2162
2281
            logger.debug("Pipe FD: %d",
 
2163
2282
                         self.server.child_pipe.fileno())
 
2165
2284
            session = gnutls.ClientSession(self.request)
 
2167
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2168
 
            #                      "+AES-256-CBC", "+SHA1",
 
2169
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2286
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2287
            #                       "+AES-256-CBC", "+SHA1",
 
 
2288
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
2171
2290
            # Use a fallback default, since this MUST be set.
 
2172
2291
            priority = self.server.gnutls_priority
 
2173
2292
            if priority is None:
 
2174
2293
                priority = "NORMAL"
 
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
 
 
2294
            gnutls.priority_set_direct(session._c_object,
 
 
2295
                                       priority.encode("utf-8"),
 
2178
2298
            # Start communication using the Mandos protocol
 
2179
2299
            # Get protocol number
 
2180
2300
            line = self.request.makefile().readline()
 
 
2345
 
class MultiprocessingMixIn(object):
 
 
2522
class MultiprocessingMixIn:
 
2346
2523
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2348
2525
    def sub_process_main(self, request, address):
 
2350
2527
            self.finish_request(request, address)
 
2351
2528
        except Exception:
 
2352
2529
            self.handle_error(request, address)
 
2353
2530
        self.close_request(request)
 
2355
2532
    def process_request(self, request, address):
 
2356
2533
        """Start a new process to process the request."""
 
2357
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2358
 
                                       args = (request, address))
 
 
2534
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2535
                                       args=(request, address))
 
2363
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
 
2540
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2364
2541
    """ adds a pipe to the MixIn """
 
2366
2543
    def process_request(self, request, client_address):
 
2367
2544
        """Overrides and wraps the original process_request().
 
2369
2546
        This function creates a new pipe in self.pipe
 
2371
2548
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2373
2550
        proc = MultiprocessingMixIn.process_request(self, request,
 
2374
2551
                                                    client_address)
 
2375
2552
        self.child_pipe.close()
 
2376
2553
        self.add_pipe(parent_pipe, proc)
 
2378
2555
    def add_pipe(self, parent_pipe, proc):
 
2379
2556
        """Dummy function; override as necessary"""
 
2380
2557
        raise NotImplementedError()
 
2383
2560
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2384
 
                     socketserver.TCPServer, object):
 
 
2561
                     socketserver.TCPServer):
 
2385
2562
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2388
2565
        enabled:        Boolean; whether this server is activated yet
 
2389
2566
        interface:      None or a network interface name (string)
 
2390
2567
        use_ipv6:       Boolean; to use IPv6 or not
 
2393
2570
    def __init__(self, server_address, RequestHandlerClass,
 
2394
2571
                 interface=None,
 
 
2428
2606
        # socket_wrapper(), if socketfd was set.
 
2429
2607
        socketserver.TCPServer.__init__(self, server_address,
 
2430
2608
                                        RequestHandlerClass)
 
2432
2610
    def server_bind(self):
 
2433
2611
        """This overrides the normal server_bind() function
 
2434
2612
        to bind to an interface if one was specified, and also NOT to
 
2435
2613
        bind to an address or port if they were not specified."""
 
 
2614
        global SO_BINDTODEVICE
 
2436
2615
        if self.interface is not None:
 
2437
2616
            if SO_BINDTODEVICE is None:
 
2438
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
2439
 
                             " cannot bind to interface %s",
 
2443
 
                    self.socket.setsockopt(
 
2444
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2445
 
                        (self.interface + "\0").encode("utf-8"))
 
2446
 
                except socket.error as error:
 
2447
 
                    if error.errno == errno.EPERM:
 
2448
 
                        logger.error("No permission to bind to"
 
2449
 
                                     " interface %s", self.interface)
 
2450
 
                    elif error.errno == errno.ENOPROTOOPT:
 
2451
 
                        logger.error("SO_BINDTODEVICE not available;"
 
2452
 
                                     " cannot bind to interface %s",
 
2454
 
                    elif error.errno == errno.ENODEV:
 
2455
 
                        logger.error("Interface %s does not exist,"
 
2456
 
                                     " cannot bind", self.interface)
 
 
2617
                # Fall back to a hard-coded value which seems to be
 
 
2619
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2620
                SO_BINDTODEVICE = 25
 
 
2622
                self.socket.setsockopt(
 
 
2623
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2624
                    (self.interface + "\0").encode("utf-8"))
 
 
2625
            except socket.error as error:
 
 
2626
                if error.errno == errno.EPERM:
 
 
2627
                    logger.error("No permission to bind to"
 
 
2628
                                 " interface %s", self.interface)
 
 
2629
                elif error.errno == errno.ENOPROTOOPT:
 
 
2630
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2631
                                 " cannot bind to interface %s",
 
 
2633
                elif error.errno == errno.ENODEV:
 
 
2634
                    logger.error("Interface %s does not exist,"
 
 
2635
                                 " cannot bind", self.interface)
 
2459
2638
        # Only bind(2) the socket if we really need to.
 
2460
2639
        if self.server_address[0] or self.server_address[1]:
 
 
2640
            if self.server_address[1]:
 
 
2641
                self.allow_reuse_address = True
 
2461
2642
            if not self.server_address[0]:
 
2462
2643
                if self.address_family == socket.AF_INET6:
 
2463
 
                    any_address = "::" # in6addr_any
 
 
2644
                    any_address = "::"  # in6addr_any
 
2465
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
 
2646
                    any_address = "0.0.0.0"  # INADDR_ANY
 
2466
2647
                self.server_address = (any_address,
 
2467
2648
                                       self.server_address[1])
 
2468
2649
            elif not self.server_address[1]:
 
 
2502
2683
        self.gnutls_priority = gnutls_priority
 
2503
2684
        IPv6_TCPServer.__init__(self, server_address,
 
2504
2685
                                RequestHandlerClass,
 
2505
 
                                interface = interface,
 
2506
 
                                use_ipv6 = use_ipv6,
 
2507
 
                                socketfd = socketfd)
 
 
2686
                                interface=interface,
 
2509
2690
    def server_activate(self):
 
2510
2691
        if self.enabled:
 
2511
2692
            return socketserver.TCPServer.server_activate(self)
 
2513
2694
    def enable(self):
 
2514
2695
        self.enabled = True
 
2516
2697
    def add_pipe(self, parent_pipe, proc):
 
2517
2698
        # Call "handle_ipc" for both data and EOF events
 
2518
2699
        GLib.io_add_watch(
 
2519
 
            parent_pipe.fileno(),
 
2520
 
            GLib.IO_IN | GLib.IO_HUP,
 
 
2700
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2701
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2521
2702
            functools.partial(self.handle_ipc,
 
2522
 
                              parent_pipe = parent_pipe,
 
 
2703
                              parent_pipe=parent_pipe,
 
2525
2706
    def handle_ipc(self, source, condition,
 
2526
2707
                   parent_pipe=None,
 
2528
2709
                   client_object=None):
 
2529
2710
        # error, or the other end of multiprocessing.Pipe has closed
 
2530
2711
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2531
2712
            # Wait for other process to exit
 
2535
2716
        # Read a request from the child
 
2536
2717
        request = parent_pipe.recv()
 
2537
2718
        command = request[0]
 
2539
2720
        if command == 'init':
 
2541
 
            address = request[2]
 
 
2721
            key_id = request[1].decode("ascii")
 
 
2722
            fpr = request[2].decode("ascii")
 
 
2723
            address = request[3]
 
2543
2725
            for c in self.clients.values():
 
2544
 
                if c.fingerprint == fpr:
 
 
2726
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2728
                if key_id and c.key_id == key_id:
 
 
2731
                if fpr and c.fingerprint == fpr:
 
2548
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2549
 
                            "dress: %s", fpr, address)
 
 
2735
                logger.info("Client not found for key ID: %s, address"
 
 
2736
                            ": %s", key_id or fpr, address)
 
2550
2737
                if self.use_dbus:
 
2551
2738
                    # Emit D-Bus signal
 
2552
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2739
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2554
2741
                parent_pipe.send(False)
 
2557
2744
            GLib.io_add_watch(
 
2558
 
                parent_pipe.fileno(),
 
2559
 
                GLib.IO_IN | GLib.IO_HUP,
 
 
2745
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2746
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2560
2747
                functools.partial(self.handle_ipc,
 
2561
 
                                  parent_pipe = parent_pipe,
 
2563
 
                                  client_object = client))
 
 
2748
                                  parent_pipe=parent_pipe,
 
 
2750
                                  client_object=client))
 
2564
2751
            parent_pipe.send(True)
 
2565
2752
            # remove the old hook in favor of the new above hook on
 
 
2569
2756
            funcname = request[1]
 
2570
2757
            args = request[2]
 
2571
2758
            kwargs = request[3]
 
2573
2760
            parent_pipe.send(('data', getattr(client_object,
 
2574
2761
                                              funcname)(*args,
 
2577
2764
        if command == 'getattr':
 
2578
2765
            attrname = request[1]
 
2579
2766
            if isinstance(client_object.__getattribute__(attrname),
 
2580
 
                          collections.Callable):
 
 
2767
                          collections.abc.Callable):
 
2581
2768
                parent_pipe.send(('function', ))
 
2583
2770
                parent_pipe.send((
 
2584
2771
                    'data', client_object.__getattribute__(attrname)))
 
2586
2773
        if command == 'setattr':
 
2587
2774
            attrname = request[1]
 
2588
2775
            value = request[2]
 
2589
2776
            setattr(client_object, attrname, value)
 
2594
2781
def rfc3339_duration_to_delta(duration):
 
2595
2782
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2597
 
    >>> rfc3339_duration_to_delta("P7D")
 
2598
 
    datetime.timedelta(7)
 
2599
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2600
 
    datetime.timedelta(0, 60)
 
2601
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2602
 
    datetime.timedelta(0, 3600)
 
2603
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2604
 
    datetime.timedelta(1)
 
2605
 
    >>> rfc3339_duration_to_delta("P1W")
 
2606
 
    datetime.timedelta(7)
 
2607
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2608
 
    datetime.timedelta(0, 330)
 
2609
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2610
 
    datetime.timedelta(1, 200)
 
 
2784
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
 
2786
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
 
2788
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
 
2790
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
 
2792
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
 
2794
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
 
2796
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2613
2800
    # Parsing an RFC 3339 duration with regular expressions is not
 
2614
2801
    # possible - there would have to be multiple places for the same
 
2615
2802
    # values, like seconds.  The current code, while more esoteric, is
 
2616
2803
    # cleaner without depending on a parsing library.  If Python had a
 
2617
2804
    # built-in library for parsing we would use it, but we'd like to
 
2618
2805
    # avoid excessive use of external libraries.
 
2620
2807
    # New type for defining tokens, syntax, and semantics all-in-one
 
2621
2808
    Token = collections.namedtuple("Token", (
 
2622
2809
        "regexp",  # To match token; if "value" is not None, must have
 
 
2806
2996
    parser.add_argument("--no-zeroconf", action="store_false",
 
2807
2997
                        dest="zeroconf", help="Do not use Zeroconf",
 
2810
3000
    options = parser.parse_args()
 
2814
 
        fail_count, test_count = doctest.testmod()
 
2815
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2817
3002
    # Default values for config file for server-global settings
 
2818
 
    server_defaults = { "interface": "",
 
2823
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2824
 
                        ":+SIGN-DSA-SHA256",
 
2825
 
                        "servicename": "Mandos",
 
2831
 
                        "statedir": "/var/lib/mandos",
 
2832
 
                        "foreground": "False",
 
 
3003
    if gnutls.has_rawpk:
 
 
3004
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
3005
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
3007
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
3008
                    ":+SIGN-DSA-SHA256")
 
 
3009
    server_defaults = {"interface": "",
 
 
3013
                       "priority": priority,
 
 
3014
                       "servicename": "Mandos",
 
 
3020
                       "statedir": "/var/lib/mandos",
 
 
3021
                       "foreground": "False",
 
2836
3026
    # Parse config file for server-global settings
 
2837
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3027
    server_config = configparser.ConfigParser(server_defaults)
 
2838
3028
    del server_defaults
 
2839
3029
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2840
 
    # Convert the SafeConfigParser object to a dict
 
 
3030
    # Convert the ConfigParser object to a dict
 
2841
3031
    server_settings = server_config.defaults()
 
2842
3032
    # Use the appropriate methods on the non-string config options
 
2843
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
3033
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3034
                   "foreground", "zeroconf"):
 
2844
3035
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2846
3037
    if server_settings["port"]:
 
 
3019
3210
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3020
3211
        service = AvahiServiceToSyslog(
 
3021
 
            name = server_settings["servicename"],
 
3022
 
            servicetype = "_mandos._tcp",
 
3023
 
            protocol = protocol,
 
 
3212
            name=server_settings["servicename"],
 
 
3213
            servicetype="_mandos._tcp",
 
3025
3216
        if server_settings["interface"]:
 
3026
3217
            service.interface = if_nametoindex(
 
3027
3218
                server_settings["interface"].encode("utf-8"))
 
3029
3220
    global multiprocessing_manager
 
3030
3221
    multiprocessing_manager = multiprocessing.Manager()
 
3032
3223
    client_class = Client
 
3034
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3225
        client_class = functools.partial(ClientDBus, bus=bus)
 
3036
3227
    client_settings = Client.config_parser(client_config)
 
3037
3228
    old_client_settings = {}
 
3038
3229
    clients_data = {}
 
3040
3231
    # This is used to redirect stdout and stderr for checker processes
 
3042
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3233
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3043
3234
    # Only used if server is running in foreground but not in debug
 
3045
3236
    if debug or not foreground:
 
3048
3239
    # Get client data and settings from last running state.
 
3049
3240
    if server_settings["restore"]:
 
3051
3242
            with open(stored_state_path, "rb") as stored_state:
 
3052
 
                if sys.version_info.major == 2:                
 
 
3243
                if sys.version_info.major == 2:
 
3053
3244
                    clients_data, old_client_settings = pickle.load(
 
3056
3247
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
 
                    ### Fix bytes to strings
 
 
3248
                        pickle.load(stored_state, encoding="bytes"))
 
 
3249
                    #   Fix bytes to strings
 
3061
 
                    clients_data = { (key.decode("utf-8")
 
3062
 
                                      if isinstance(key, bytes)
 
3065
 
                                     bytes_clients_data.items() }
 
 
3252
                    clients_data = {(key.decode("utf-8")
 
 
3253
                                     if isinstance(key, bytes)
 
 
3256
                                    bytes_clients_data.items()}
 
3066
3257
                    del bytes_clients_data
 
3067
3258
                    for key in clients_data:
 
3068
 
                        value = { (k.decode("utf-8")
 
3069
 
                                   if isinstance(k, bytes) else k): v
 
3071
 
                                  clients_data[key].items() }
 
 
3259
                        value = {(k.decode("utf-8")
 
 
3260
                                  if isinstance(k, bytes) else k): v
 
 
3262
                                 clients_data[key].items()}
 
3072
3263
                        clients_data[key] = value
 
3073
3264
                        # .client_structure
 
3074
3265
                        value["client_structure"] = [
 
3075
3266
                            (s.decode("utf-8")
 
3076
3267
                             if isinstance(s, bytes)
 
3077
3268
                             else s) for s in
 
3078
 
                            value["client_structure"] ]
 
3080
 
                        for k in ("name", "host"):
 
 
3269
                            value["client_structure"]]
 
 
3270
                        # .name, .host, and .checker_command
 
 
3271
                        for k in ("name", "host", "checker_command"):
 
3081
3272
                            if isinstance(value[k], bytes):
 
3082
3273
                                value[k] = value[k].decode("utf-8")
 
3083
 
                    ## old_client_settings
 
 
3274
                        if "key_id" not in value:
 
 
3275
                            value["key_id"] = ""
 
 
3276
                        elif "fingerprint" not in value:
 
 
3277
                            value["fingerprint"] = ""
 
 
3278
                    #  old_client_settings
 
3085
3280
                    old_client_settings = {
 
3086
3281
                        (key.decode("utf-8")
 
3087
3282
                         if isinstance(key, bytes)
 
3088
3283
                         else key): value
 
3089
3284
                        for key, value in
 
3090
 
                        bytes_old_client_settings.items() }
 
 
3285
                        bytes_old_client_settings.items()}
 
3091
3286
                    del bytes_old_client_settings
 
 
3287
                    # .host and .checker_command
 
3093
3288
                    for value in old_client_settings.values():
 
3094
 
                        if isinstance(value["host"], bytes):
 
3095
 
                            value["host"] = (value["host"]
 
 
3289
                        for attribute in ("host", "checker_command"):
 
 
3290
                            if isinstance(value[attribute], bytes):
 
 
3291
                                value[attribute] = (value[attribute]
 
3097
3293
            os.remove(stored_state_path)
 
3098
3294
        except IOError as e:
 
3099
3295
            if e.errno == errno.ENOENT: