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,
 
477
529
        syslogger.setFormatter(logging.Formatter(
 
478
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
479
531
            .format(self.name)))
 
482
535
# 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))
 
 
537
    """This isn't so much a class as it is a module-like namespace."""
 
 
539
    library = ctypes.util.find_library("gnutls")
 
 
541
        library = ctypes.util.find_library("gnutls-deb0")
 
 
542
    _library = ctypes.cdll.LoadLibrary(library)
 
498
545
    # Unless otherwise indicated, the constants and types below are
 
499
546
    # all from the gnutls/gnutls.h C header file.
 
503
550
    E_INTERRUPTED = -52
 
508
556
    CRD_CERTIFICATE = 1
 
509
557
    E_NO_CERTIFICATE_FOUND = -49
 
 
562
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
510
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
513
566
    class session_int(ctypes.Structure):
 
515
568
    session_t = ctypes.POINTER(session_int)
 
516
570
    class certificate_credentials_st(ctypes.Structure):
 
518
572
    certificate_credentials_t = ctypes.POINTER(
 
519
573
        certificate_credentials_st)
 
520
574
    certificate_type_t = ctypes.c_int
 
521
576
    class datum_t(ctypes.Structure):
 
522
577
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
523
578
                    ('size', ctypes.c_uint)]
 
524
580
    class openpgp_crt_int(ctypes.Structure):
 
526
582
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
 
583
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
528
584
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
529
585
    credentials_type_t = ctypes.c_int
 
530
586
    transport_ptr_t = ctypes.c_void_p
 
531
587
    close_request_t = ctypes.c_int
 
534
590
    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=()):
 
 
591
        def __init__(self, message=None, code=None, args=()):
 
540
592
            # Default usage is by a message string, but if a return
 
541
593
            # code is passed, convert it to a string with
 
542
594
            # gnutls.strerror()
 
544
596
            if message is None and code is not None:
 
545
 
                message = GnuTLS.strerror(code)
 
546
 
            return super(GnuTLS.Error, self).__init__(
 
 
597
                message = gnutls.strerror(code)
 
 
598
            return super(gnutls.Error, self).__init__(
 
549
601
    class CertificateSecurityError(Error):
 
553
 
    class Credentials(object):
 
554
606
        def __init__(self):
 
555
607
            self._c_object = gnutls.certificate_credentials_t()
 
556
608
            gnutls.certificate_allocate_credentials(
 
557
609
                ctypes.byref(self._c_object))
 
558
610
            self.type = gnutls.CRD_CERTIFICATE
 
560
612
        def __del__(self):
 
561
613
            gnutls.certificate_free_credentials(self._c_object)
 
563
 
    class ClientSession(object):
 
564
 
        def __init__(self, socket, credentials = None):
 
 
616
        def __init__(self, socket, credentials=None):
 
565
617
            self._c_object = gnutls.session_t()
 
566
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
 
618
            gnutls_flags = gnutls.CLIENT
 
 
619
            if gnutls.check_version(b"3.5.6"):
 
 
620
                gnutls_flags |= gnutls.NO_TICKETS
 
 
622
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
623
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
567
625
            gnutls.set_default_priority(self._c_object)
 
568
626
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
569
627
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
611
669
                return _error_code(result)
 
612
670
            result = func(*arguments)
 
615
673
    # Unless otherwise indicated, the function declarations below are
 
616
674
    # all from the gnutls/gnutls.h C header file.
 
619
677
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
678
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
679
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
680
    priority_set_direct.restype = _error_code
 
624
682
    init = _library.gnutls_init
 
625
683
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
684
    init.restype = _error_code
 
628
686
    set_default_priority = _library.gnutls_set_default_priority
 
629
687
    set_default_priority.argtypes = [session_t]
 
630
688
    set_default_priority.restype = _error_code
 
632
690
    record_send = _library.gnutls_record_send
 
633
691
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
635
693
    record_send.restype = ctypes.c_ssize_t
 
636
694
    record_send.errcheck = _retry_on_error
 
638
696
    certificate_allocate_credentials = (
 
639
697
        _library.gnutls_certificate_allocate_credentials)
 
640
698
    certificate_allocate_credentials.argtypes = [
 
641
699
        ctypes.POINTER(certificate_credentials_t)]
 
642
700
    certificate_allocate_credentials.restype = _error_code
 
644
702
    certificate_free_credentials = (
 
645
703
        _library.gnutls_certificate_free_credentials)
 
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
704
    certificate_free_credentials.argtypes = [
 
 
705
        certificate_credentials_t]
 
647
706
    certificate_free_credentials.restype = None
 
649
708
    handshake_set_private_extensions = (
 
650
709
        _library.gnutls_handshake_set_private_extensions)
 
651
710
    handshake_set_private_extensions.argtypes = [session_t,
 
653
712
    handshake_set_private_extensions.restype = None
 
655
714
    credentials_set = _library.gnutls_credentials_set
 
656
715
    credentials_set.argtypes = [session_t, credentials_type_t,
 
658
717
    credentials_set.restype = _error_code
 
660
719
    strerror = _library.gnutls_strerror
 
661
720
    strerror.argtypes = [ctypes.c_int]
 
662
721
    strerror.restype = ctypes.c_char_p
 
664
723
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
724
    certificate_type_get.argtypes = [session_t]
 
666
725
    certificate_type_get.restype = _error_code
 
668
727
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
728
    certificate_get_peers.argtypes = [session_t,
 
670
729
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
730
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
673
732
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
733
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
734
    global_set_log_level.restype = None
 
677
736
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
737
    global_set_log_function.argtypes = [log_func]
 
679
738
    global_set_log_function.restype = None
 
681
740
    deinit = _library.gnutls_deinit
 
682
741
    deinit.argtypes = [session_t]
 
683
742
    deinit.restype = None
 
685
744
    handshake = _library.gnutls_handshake
 
686
745
    handshake.argtypes = [session_t]
 
687
746
    handshake.restype = _error_code
 
688
747
    handshake.errcheck = _retry_on_error
 
690
749
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
750
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
751
    transport_set_ptr.restype = None
 
694
753
    bye = _library.gnutls_bye
 
695
754
    bye.argtypes = [session_t, close_request_t]
 
696
755
    bye.restype = _error_code
 
697
756
    bye.errcheck = _retry_on_error
 
699
758
    check_version = _library.gnutls_check_version
 
700
759
    check_version.argtypes = [ctypes.c_char_p]
 
701
760
    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
 
 
762
    _need_version = b"3.3.0"
 
 
763
    if check_version(_need_version) is None:
 
 
764
        raise self.Error("Needs GnuTLS {} or later"
 
 
765
                         .format(_need_version))
 
 
767
    _tls_rawpk_version = b"3.6.6"
 
 
768
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
772
        class pubkey_st(ctypes.Structure):
 
 
774
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
776
        x509_crt_fmt_t = ctypes.c_int
 
 
778
        # All the function declarations below are from
 
 
780
        pubkey_init = _library.gnutls_pubkey_init
 
 
781
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
782
        pubkey_init.restype = _error_code
 
 
784
        pubkey_import = _library.gnutls_pubkey_import
 
 
785
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
787
        pubkey_import.restype = _error_code
 
 
789
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
790
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
791
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
792
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
793
        pubkey_get_key_id.restype = _error_code
 
 
795
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
796
        pubkey_deinit.argtypes = [pubkey_t]
 
 
797
        pubkey_deinit.restype = None
 
 
799
        # All the function declarations below are from
 
 
802
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
803
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
804
        openpgp_crt_init.restype = _error_code
 
 
806
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
807
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
808
                                       ctypes.POINTER(datum_t),
 
 
810
        openpgp_crt_import.restype = _error_code
 
 
812
        openpgp_crt_verify_self = \
 
 
813
            _library.gnutls_openpgp_crt_verify_self
 
 
814
        openpgp_crt_verify_self.argtypes = [
 
 
817
            ctypes.POINTER(ctypes.c_uint),
 
 
819
        openpgp_crt_verify_self.restype = _error_code
 
 
821
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
822
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
823
        openpgp_crt_deinit.restype = None
 
 
825
        openpgp_crt_get_fingerprint = (
 
 
826
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
827
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
831
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
833
    if check_version(b"3.6.4"):
 
 
834
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
835
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
836
        certificate_type_get2.restype = _error_code
 
732
838
    # Remove non-public functions
 
733
839
    del _error_code, _retry_on_error
 
734
 
# Create the global "gnutls" object, simulating a module
 
737
842
def call_pipe(connection,       # : multiprocessing.Connection
 
738
843
              func, *args, **kwargs):
 
739
844
    """This function is meant to be called by multiprocessing.Process
 
741
846
    This function runs func(*args, **kwargs), and writes the resulting
 
742
847
    return value on the provided multiprocessing.Connection.
 
744
849
    connection.send(func(*args, **kwargs))
 
745
850
    connection.close()
 
747
 
class Client(object):
 
748
854
    """A representation of a client host served by this server.
 
751
857
    approved:   bool(); 'None' if not yet approved/disapproved
 
752
858
    approval_delay: datetime.timedelta(); Time to wait for approval
 
753
859
    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.
 
 
860
    checker: multiprocessing.Process(); a running checker process used
 
 
861
             to see if the client lives. 'None' if no process is
 
757
863
    checker_callback_tag: a GLib event source tag, or None
 
758
864
    checker_command: string; External command which is run to check
 
759
865
                     if client lives.  %() expansions are done at
 
 
1428
1542
                         exc_info=error)
 
1429
1543
        return xmlstring
 
1432
1547
    dbus.OBJECT_MANAGER_IFACE
 
1433
1548
except AttributeError:
 
1434
1549
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1436
1552
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
1553
    """A D-Bus object with an ObjectManager.
 
1439
1555
    Classes inheriting from this exposes the standard
 
1440
1556
    GetManagedObjects call and the InterfacesAdded and
 
1441
1557
    InterfacesRemoved signals on the standard
 
1442
1558
    "org.freedesktop.DBus.ObjectManager" interface.
 
1444
1560
    Note: No signals are sent automatically; they must be sent
 
1447
1563
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
 
                         out_signature = "a{oa{sa{sv}}}")
 
 
1564
                         out_signature="a{oa{sa{sv}}}")
 
1449
1565
    def GetManagedObjects(self):
 
1450
1566
        """This function must be overridden"""
 
1451
1567
        raise NotImplementedError()
 
1453
1569
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
 
                         signature = "oa{sa{sv}}")
 
 
1570
                         signature="oa{sa{sv}}")
 
1455
1571
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1458
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1574
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1459
1575
    def InterfacesRemoved(self, object_path, interfaces):
 
1462
1578
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
 
                         out_signature = "s",
 
1464
 
                         path_keyword = 'object_path',
 
1465
 
                         connection_keyword = 'connection')
 
 
1580
                         path_keyword='object_path',
 
 
1581
                         connection_keyword='connection')
 
1466
1582
    def Introspect(self, object_path, connection):
 
1467
1583
        """Overloading of standard D-Bus method.
 
1469
1585
        Override return argument name of GetManagedObjects to be
 
1470
1586
        "objpath_interfaces_and_properties"
 
 
2152
2278
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2153
2279
    """A class to handle client connections.
 
2155
2281
    Instantiated once for each connection to handle it.
 
2156
2282
    Note: This will run in its own forked process."""
 
2158
2284
    def handle(self):
 
2159
2285
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2160
2286
            logger.info("TCP connection from: %s",
 
2161
2287
                        str(self.client_address))
 
2162
2288
            logger.debug("Pipe FD: %d",
 
2163
2289
                         self.server.child_pipe.fileno())
 
2165
2291
            session = gnutls.ClientSession(self.request)
 
2167
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2168
 
            #                      "+AES-256-CBC", "+SHA1",
 
2169
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2293
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2294
            #                       "+AES-256-CBC", "+SHA1",
 
 
2295
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
2171
2297
            # Use a fallback default, since this MUST be set.
 
2172
2298
            priority = self.server.gnutls_priority
 
2173
2299
            if priority is None:
 
2174
2300
                priority = "NORMAL"
 
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
 
 
2301
            gnutls.priority_set_direct(session._c_object,
 
 
2302
                                       priority.encode("utf-8"),
 
2178
2305
            # Start communication using the Mandos protocol
 
2179
2306
            # Get protocol number
 
2180
2307
            line = self.request.makefile().readline()
 
 
2345
 
class MultiprocessingMixIn(object):
 
 
2530
class MultiprocessingMixIn:
 
2346
2531
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2348
2533
    def sub_process_main(self, request, address):
 
2350
2535
            self.finish_request(request, address)
 
2351
2536
        except Exception:
 
2352
2537
            self.handle_error(request, address)
 
2353
2538
        self.close_request(request)
 
2355
2540
    def process_request(self, request, address):
 
2356
2541
        """Start a new process to process the request."""
 
2357
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2358
 
                                       args = (request, address))
 
 
2542
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2543
                                       args=(request, address))
 
2363
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
 
2548
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2364
2549
    """ adds a pipe to the MixIn """
 
2366
2551
    def process_request(self, request, client_address):
 
2367
2552
        """Overrides and wraps the original process_request().
 
2369
2554
        This function creates a new pipe in self.pipe
 
2371
2556
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2373
2558
        proc = MultiprocessingMixIn.process_request(self, request,
 
2374
2559
                                                    client_address)
 
2375
2560
        self.child_pipe.close()
 
2376
2561
        self.add_pipe(parent_pipe, proc)
 
2378
2563
    def add_pipe(self, parent_pipe, proc):
 
2379
2564
        """Dummy function; override as necessary"""
 
2380
2565
        raise NotImplementedError()
 
2383
2568
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2384
 
                     socketserver.TCPServer, object):
 
 
2569
                     socketserver.TCPServer):
 
2385
2570
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2388
2573
        enabled:        Boolean; whether this server is activated yet
 
2389
2574
        interface:      None or a network interface name (string)
 
2390
2575
        use_ipv6:       Boolean; to use IPv6 or not
 
2393
2578
    def __init__(self, server_address, RequestHandlerClass,
 
2394
2579
                 interface=None,
 
 
2428
2614
        # socket_wrapper(), if socketfd was set.
 
2429
2615
        socketserver.TCPServer.__init__(self, server_address,
 
2430
2616
                                        RequestHandlerClass)
 
2432
2618
    def server_bind(self):
 
2433
2619
        """This overrides the normal server_bind() function
 
2434
2620
        to bind to an interface if one was specified, and also NOT to
 
2435
2621
        bind to an address or port if they were not specified."""
 
 
2622
        global SO_BINDTODEVICE
 
2436
2623
        if self.interface is not None:
 
2437
2624
            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)
 
 
2625
                # Fall back to a hard-coded value which seems to be
 
 
2627
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2628
                SO_BINDTODEVICE = 25
 
 
2630
                self.socket.setsockopt(
 
 
2631
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2632
                    (self.interface + "\0").encode("utf-8"))
 
 
2633
            except socket.error as error:
 
 
2634
                if error.errno == errno.EPERM:
 
 
2635
                    logger.error("No permission to bind to"
 
 
2636
                                 " interface %s", self.interface)
 
 
2637
                elif error.errno == errno.ENOPROTOOPT:
 
 
2638
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2639
                                 " cannot bind to interface %s",
 
 
2641
                elif error.errno == errno.ENODEV:
 
 
2642
                    logger.error("Interface %s does not exist,"
 
 
2643
                                 " cannot bind", self.interface)
 
2459
2646
        # Only bind(2) the socket if we really need to.
 
2460
2647
        if self.server_address[0] or self.server_address[1]:
 
 
2648
            if self.server_address[1]:
 
 
2649
                self.allow_reuse_address = True
 
2461
2650
            if not self.server_address[0]:
 
2462
2651
                if self.address_family == socket.AF_INET6:
 
2463
 
                    any_address = "::" # in6addr_any
 
 
2652
                    any_address = "::"  # in6addr_any
 
2465
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
 
2654
                    any_address = "0.0.0.0"  # INADDR_ANY
 
2466
2655
                self.server_address = (any_address,
 
2467
2656
                                       self.server_address[1])
 
2468
2657
            elif not self.server_address[1]:
 
 
2502
2691
        self.gnutls_priority = gnutls_priority
 
2503
2692
        IPv6_TCPServer.__init__(self, server_address,
 
2504
2693
                                RequestHandlerClass,
 
2505
 
                                interface = interface,
 
2506
 
                                use_ipv6 = use_ipv6,
 
2507
 
                                socketfd = socketfd)
 
 
2694
                                interface=interface,
 
2509
2698
    def server_activate(self):
 
2510
2699
        if self.enabled:
 
2511
2700
            return socketserver.TCPServer.server_activate(self)
 
2513
2702
    def enable(self):
 
2514
2703
        self.enabled = True
 
2516
2705
    def add_pipe(self, parent_pipe, proc):
 
2517
2706
        # Call "handle_ipc" for both data and EOF events
 
2518
2707
        GLib.io_add_watch(
 
2519
 
            parent_pipe.fileno(),
 
2520
 
            GLib.IO_IN | GLib.IO_HUP,
 
 
2708
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2709
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2521
2710
            functools.partial(self.handle_ipc,
 
2522
 
                              parent_pipe = parent_pipe,
 
 
2711
                              parent_pipe=parent_pipe,
 
2525
2714
    def handle_ipc(self, source, condition,
 
2526
2715
                   parent_pipe=None,
 
2528
2717
                   client_object=None):
 
2529
2718
        # error, or the other end of multiprocessing.Pipe has closed
 
2530
2719
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2531
2720
            # Wait for other process to exit
 
2535
2724
        # Read a request from the child
 
2536
2725
        request = parent_pipe.recv()
 
2537
2726
        command = request[0]
 
2539
2728
        if command == 'init':
 
2541
 
            address = request[2]
 
 
2729
            key_id = request[1].decode("ascii")
 
 
2730
            fpr = request[2].decode("ascii")
 
 
2731
            address = request[3]
 
2543
2733
            for c in self.clients.values():
 
2544
 
                if c.fingerprint == fpr:
 
 
2734
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
 
2735
                              "27AE41E4649B934CA495991B7852B855"):
 
 
2737
                if key_id and c.key_id == key_id:
 
 
2740
                if fpr and c.fingerprint == fpr:
 
2548
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2549
 
                            "dress: %s", fpr, address)
 
 
2744
                logger.info("Client not found for key ID: %s, address"
 
 
2745
                            ": %s", key_id or fpr, address)
 
2550
2746
                if self.use_dbus:
 
2551
2747
                    # Emit D-Bus signal
 
2552
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2748
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2554
2750
                parent_pipe.send(False)
 
2557
2753
            GLib.io_add_watch(
 
2558
 
                parent_pipe.fileno(),
 
2559
 
                GLib.IO_IN | GLib.IO_HUP,
 
 
2754
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2755
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2560
2756
                functools.partial(self.handle_ipc,
 
2561
 
                                  parent_pipe = parent_pipe,
 
2563
 
                                  client_object = client))
 
 
2757
                                  parent_pipe=parent_pipe,
 
 
2759
                                  client_object=client))
 
2564
2760
            parent_pipe.send(True)
 
2565
2761
            # remove the old hook in favor of the new above hook on
 
 
2569
2765
            funcname = request[1]
 
2570
2766
            args = request[2]
 
2571
2767
            kwargs = request[3]
 
2573
2769
            parent_pipe.send(('data', getattr(client_object,
 
2574
2770
                                              funcname)(*args,
 
2577
2773
        if command == 'getattr':
 
2578
2774
            attrname = request[1]
 
2579
2775
            if isinstance(client_object.__getattribute__(attrname),
 
2580
 
                          collections.Callable):
 
 
2776
                          collections.abc.Callable):
 
2581
2777
                parent_pipe.send(('function', ))
 
2583
2779
                parent_pipe.send((
 
2584
2780
                    'data', client_object.__getattribute__(attrname)))
 
2586
2782
        if command == 'setattr':
 
2587
2783
            attrname = request[1]
 
2588
2784
            value = request[2]
 
2589
2785
            setattr(client_object, attrname, value)
 
2594
2790
def rfc3339_duration_to_delta(duration):
 
2595
2791
    """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)
 
 
2793
    >>> timedelta = datetime.timedelta
 
 
2794
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
 
2796
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
 
2798
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
 
2800
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
 
2802
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
 
2804
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
 
2806
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2613
2811
    # Parsing an RFC 3339 duration with regular expressions is not
 
2614
2812
    # possible - there would have to be multiple places for the same
 
2615
2813
    # values, like seconds.  The current code, while more esoteric, is
 
2616
2814
    # cleaner without depending on a parsing library.  If Python had a
 
2617
2815
    # built-in library for parsing we would use it, but we'd like to
 
2618
2816
    # avoid excessive use of external libraries.
 
2620
2818
    # New type for defining tokens, syntax, and semantics all-in-one
 
2621
2819
    Token = collections.namedtuple("Token", (
 
2622
2820
        "regexp",  # To match token; if "value" is not None, must have
 
 
2806
3007
    parser.add_argument("--no-zeroconf", action="store_false",
 
2807
3008
                        dest="zeroconf", help="Do not use Zeroconf",
 
2810
3011
    options = parser.parse_args()
 
2814
 
        fail_count, test_count = doctest.testmod()
 
2815
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2817
3013
    # 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",
 
 
3014
    if gnutls.has_rawpk:
 
 
3015
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
3016
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
3018
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
3019
                    ":+SIGN-DSA-SHA256")
 
 
3020
    server_defaults = {"interface": "",
 
 
3024
                       "priority": priority,
 
 
3025
                       "servicename": "Mandos",
 
 
3031
                       "statedir": "/var/lib/mandos",
 
 
3032
                       "foreground": "False",
 
2836
3037
    # Parse config file for server-global settings
 
2837
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3038
    server_config = configparser.ConfigParser(server_defaults)
 
2838
3039
    del server_defaults
 
2839
3040
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2840
 
    # Convert the SafeConfigParser object to a dict
 
 
3041
    # Convert the ConfigParser object to a dict
 
2841
3042
    server_settings = server_config.defaults()
 
2842
3043
    # Use the appropriate methods on the non-string config options
 
2843
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
3044
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3045
                   "foreground", "zeroconf"):
 
2844
3046
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2846
3048
    if server_settings["port"]:
 
 
3019
3221
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3020
3222
        service = AvahiServiceToSyslog(
 
3021
 
            name = server_settings["servicename"],
 
3022
 
            servicetype = "_mandos._tcp",
 
3023
 
            protocol = protocol,
 
 
3223
            name=server_settings["servicename"],
 
 
3224
            servicetype="_mandos._tcp",
 
3025
3227
        if server_settings["interface"]:
 
3026
3228
            service.interface = if_nametoindex(
 
3027
3229
                server_settings["interface"].encode("utf-8"))
 
3029
3231
    global multiprocessing_manager
 
3030
3232
    multiprocessing_manager = multiprocessing.Manager()
 
3032
3234
    client_class = Client
 
3034
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3236
        client_class = functools.partial(ClientDBus, bus=bus)
 
3036
3238
    client_settings = Client.config_parser(client_config)
 
3037
3239
    old_client_settings = {}
 
3038
3240
    clients_data = {}
 
3040
3242
    # This is used to redirect stdout and stderr for checker processes
 
3042
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3244
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3043
3245
    # Only used if server is running in foreground but not in debug
 
3045
3247
    if debug or not foreground:
 
3048
3250
    # Get client data and settings from last running state.
 
3049
3251
    if server_settings["restore"]:
 
3051
3253
            with open(stored_state_path, "rb") as stored_state:
 
3052
 
                if sys.version_info.major == 2:                
 
 
3254
                if sys.version_info.major == 2:
 
3053
3255
                    clients_data, old_client_settings = pickle.load(
 
3056
3258
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
 
                    ### Fix bytes to strings
 
 
3259
                        pickle.load(stored_state, encoding="bytes"))
 
 
3260
                    #   Fix bytes to strings
 
3061
 
                    clients_data = { (key.decode("utf-8")
 
3062
 
                                      if isinstance(key, bytes)
 
3065
 
                                     bytes_clients_data.items() }
 
 
3263
                    clients_data = {(key.decode("utf-8")
 
 
3264
                                     if isinstance(key, bytes)
 
 
3267
                                    bytes_clients_data.items()}
 
3066
3268
                    del bytes_clients_data
 
3067
3269
                    for key in clients_data:
 
3068
 
                        value = { (k.decode("utf-8")
 
3069
 
                                   if isinstance(k, bytes) else k): v
 
3071
 
                                  clients_data[key].items() }
 
 
3270
                        value = {(k.decode("utf-8")
 
 
3271
                                  if isinstance(k, bytes) else k): v
 
 
3273
                                 clients_data[key].items()}
 
3072
3274
                        clients_data[key] = value
 
3073
3275
                        # .client_structure
 
3074
3276
                        value["client_structure"] = [
 
3075
3277
                            (s.decode("utf-8")
 
3076
3278
                             if isinstance(s, bytes)
 
3077
3279
                             else s) for s in
 
3078
 
                            value["client_structure"] ]
 
3080
 
                        for k in ("name", "host"):
 
 
3280
                            value["client_structure"]]
 
 
3281
                        # .name, .host, and .checker_command
 
 
3282
                        for k in ("name", "host", "checker_command"):
 
3081
3283
                            if isinstance(value[k], bytes):
 
3082
3284
                                value[k] = value[k].decode("utf-8")
 
3083
 
                    ## old_client_settings
 
 
3285
                        if "key_id" not in value:
 
 
3286
                            value["key_id"] = ""
 
 
3287
                        elif "fingerprint" not in value:
 
 
3288
                            value["fingerprint"] = ""
 
 
3289
                    #  old_client_settings
 
3085
3291
                    old_client_settings = {
 
3086
3292
                        (key.decode("utf-8")
 
3087
3293
                         if isinstance(key, bytes)
 
3088
3294
                         else key): value
 
3089
3295
                        for key, value in
 
3090
 
                        bytes_old_client_settings.items() }
 
 
3296
                        bytes_old_client_settings.items()}
 
3091
3297
                    del bytes_old_client_settings
 
 
3298
                    # .host and .checker_command
 
3093
3299
                    for value in old_client_settings.values():
 
3094
 
                        if isinstance(value["host"], bytes):
 
3095
 
                            value["host"] = (value["host"]
 
 
3300
                        for attribute in ("host", "checker_command"):
 
 
3301
                            if isinstance(value[attribute], bytes):
 
 
3302
                                value[attribute] = (value[attribute]
 
3097
3304
            os.remove(stored_state_path)
 
3098
3305
        except IOError as e:
 
3099
3306
            if e.errno == errno.ENOENT: