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>.
 
 
495
524
class AvahiServiceToSyslog(AvahiService):
 
496
525
    def rename(self, *args, **kwargs):
 
497
526
        """Add the new name to the syslog messages"""
 
498
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
499
529
        syslogger.setFormatter(logging.Formatter(
 
500
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
530
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
501
531
            .format(self.name)))
 
505
535
# Pretend that we have a GnuTLS module
 
506
 
class GnuTLS(object):
 
507
 
    """This isn't so much a class as it is a module-like namespace.
 
508
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
 
537
    """This isn't so much a class as it is a module-like namespace."""
 
510
539
    library = ctypes.util.find_library("gnutls")
 
511
540
    if library is None:
 
512
541
        library = ctypes.util.find_library("gnutls-deb0")
 
513
542
    _library = ctypes.cdll.LoadLibrary(library)
 
515
 
    _need_version = b"3.3.0"
 
518
 
        # Need to use class name "GnuTLS" here, since this method is
 
519
 
        # called before the assignment to the "gnutls" global variable
 
521
 
        if GnuTLS.check_version(self._need_version) is None:
 
522
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
523
 
                               .format(self._need_version))
 
525
545
    # Unless otherwise indicated, the constants and types below are
 
526
546
    # all from the gnutls/gnutls.h C header file.
 
 
564
590
    class Error(Exception):
 
565
 
        # We need to use the class name "GnuTLS" here, since this
 
566
 
        # exception might be raised from within GnuTLS.__init__,
 
567
 
        # which is called before the assignment to the "gnutls"
 
568
 
        # global variable has happened.
 
569
591
        def __init__(self, message=None, code=None, args=()):
 
570
592
            # Default usage is by a message string, but if a return
 
571
593
            # code is passed, convert it to a string with
 
572
594
            # gnutls.strerror()
 
574
596
            if message is None and code is not None:
 
575
 
                message = GnuTLS.strerror(code)
 
576
 
            return super(GnuTLS.Error, self).__init__(
 
 
597
                message = gnutls.strerror(code).decode(
 
 
598
                    "utf-8", errors="replace")
 
 
599
            return super(gnutls.Error, self).__init__(
 
579
602
    class CertificateSecurityError(Error):
 
 
606
        def __init__(self, cls):
 
 
609
        def from_param(self, obj):
 
 
610
            if not isinstance(obj, self.cls):
 
 
611
                raise TypeError("Not of type {}: {!r}"
 
 
612
                                .format(self.cls.__name__, obj))
 
 
613
            return ctypes.byref(obj.from_param(obj))
 
 
615
    class CastToVoidPointer:
 
 
616
        def __init__(self, cls):
 
 
619
        def from_param(self, obj):
 
 
620
            if not isinstance(obj, self.cls):
 
 
621
                raise TypeError("Not of type {}: {!r}"
 
 
622
                                .format(self.cls.__name__, obj))
 
 
623
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
 
 
625
    class With_from_param:
 
 
627
        def from_param(cls, obj):
 
 
628
            return obj._as_parameter_
 
583
 
    class Credentials(object):
 
 
631
    class Credentials(With_from_param):
 
584
632
        def __init__(self):
 
585
 
            self._c_object = gnutls.certificate_credentials_t()
 
586
 
            gnutls.certificate_allocate_credentials(
 
587
 
                ctypes.byref(self._c_object))
 
 
633
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
 
634
            gnutls.certificate_allocate_credentials(self)
 
588
635
            self.type = gnutls.CRD_CERTIFICATE
 
590
637
        def __del__(self):
 
591
 
            gnutls.certificate_free_credentials(self._c_object)
 
 
638
            gnutls.certificate_free_credentials(self)
 
593
 
    class ClientSession(object):
 
 
640
    class ClientSession(With_from_param):
 
594
641
        def __init__(self, socket, credentials=None):
 
595
 
            self._c_object = gnutls.session_t()
 
596
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
597
 
            gnutls.set_default_priority(self._c_object)
 
598
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
599
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
642
            self._as_parameter_ = gnutls.session_t()
 
 
643
            gnutls_flags = gnutls.CLIENT
 
 
644
            if gnutls.check_version(b"3.5.6"):
 
 
645
                gnutls_flags |= gnutls.NO_TICKETS
 
 
647
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
648
            gnutls.init(self, gnutls_flags)
 
 
650
            gnutls.set_default_priority(self)
 
 
651
            gnutls.transport_set_ptr(self, socket.fileno())
 
 
652
            gnutls.handshake_set_private_extensions(self, True)
 
601
653
            self.socket = socket
 
602
654
            if credentials is None:
 
603
655
                credentials = gnutls.Credentials()
 
604
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
605
 
                                   ctypes.cast(credentials._c_object,
 
 
656
            gnutls.credentials_set(self, credentials.type,
 
607
658
            self.credentials = credentials
 
609
660
        def __del__(self):
 
610
 
            gnutls.deinit(self._c_object)
 
612
663
        def handshake(self):
 
613
 
            return gnutls.handshake(self._c_object)
 
 
664
            return gnutls.handshake(self)
 
615
666
        def send(self, data):
 
616
667
            data = bytes(data)
 
617
668
            data_len = len(data)
 
618
669
            while data_len > 0:
 
619
 
                data_len -= gnutls.record_send(self._c_object,
 
 
670
                data_len -= gnutls.record_send(self, data[-data_len:],
 
624
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
674
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
626
676
    # Error handling functions
 
627
677
    def _error_code(result):
 
628
678
        """A function to raise exceptions on errors, suitable
 
629
 
        for the 'restype' attribute on ctypes functions"""
 
 
679
        for the "restype" attribute on ctypes functions"""
 
 
680
        if result >= gnutls.E_SUCCESS:
 
632
682
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
633
683
            raise gnutls.CertificateSecurityError(code=result)
 
634
684
        raise gnutls.Error(code=result)
 
636
 
    def _retry_on_error(result, func, arguments):
 
 
686
    def _retry_on_error(result, func, arguments,
 
 
687
                        _error_code=_error_code):
 
637
688
        """A function to retry on some errors, suitable
 
638
 
        for the 'errcheck' attribute on ctypes functions"""
 
 
689
        for the "errcheck" attribute on ctypes functions"""
 
 
690
        while result < gnutls.E_SUCCESS:
 
640
691
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
641
692
                return _error_code(result)
 
642
693
            result = func(*arguments)
 
 
649
700
    priority_set_direct = _library.gnutls_priority_set_direct
 
650
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
701
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
651
702
                                    ctypes.POINTER(ctypes.c_char_p)]
 
652
703
    priority_set_direct.restype = _error_code
 
654
705
    init = _library.gnutls_init
 
655
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
706
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
656
707
    init.restype = _error_code
 
658
709
    set_default_priority = _library.gnutls_set_default_priority
 
659
 
    set_default_priority.argtypes = [session_t]
 
 
710
    set_default_priority.argtypes = [ClientSession]
 
660
711
    set_default_priority.restype = _error_code
 
662
713
    record_send = _library.gnutls_record_send
 
663
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
714
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
665
716
    record_send.restype = ctypes.c_ssize_t
 
666
717
    record_send.errcheck = _retry_on_error
 
 
668
719
    certificate_allocate_credentials = (
 
669
720
        _library.gnutls_certificate_allocate_credentials)
 
670
721
    certificate_allocate_credentials.argtypes = [
 
671
 
        ctypes.POINTER(certificate_credentials_t)]
 
 
722
        PointerTo(Credentials)]
 
672
723
    certificate_allocate_credentials.restype = _error_code
 
674
725
    certificate_free_credentials = (
 
675
726
        _library.gnutls_certificate_free_credentials)
 
676
 
    certificate_free_credentials.argtypes = [
 
677
 
        certificate_credentials_t]
 
 
727
    certificate_free_credentials.argtypes = [Credentials]
 
678
728
    certificate_free_credentials.restype = None
 
680
730
    handshake_set_private_extensions = (
 
681
731
        _library.gnutls_handshake_set_private_extensions)
 
682
 
    handshake_set_private_extensions.argtypes = [session_t,
 
 
732
    handshake_set_private_extensions.argtypes = [ClientSession,
 
684
734
    handshake_set_private_extensions.restype = None
 
686
736
    credentials_set = _library.gnutls_credentials_set
 
687
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
737
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
 
738
                                CastToVoidPointer(Credentials)]
 
689
739
    credentials_set.restype = _error_code
 
691
741
    strerror = _library.gnutls_strerror
 
 
710
760
    global_set_log_function.restype = None
 
712
762
    deinit = _library.gnutls_deinit
 
713
 
    deinit.argtypes = [session_t]
 
 
763
    deinit.argtypes = [ClientSession]
 
714
764
    deinit.restype = None
 
716
766
    handshake = _library.gnutls_handshake
 
717
 
    handshake.argtypes = [session_t]
 
718
 
    handshake.restype = _error_code
 
 
767
    handshake.argtypes = [ClientSession]
 
 
768
    handshake.restype = ctypes.c_int
 
719
769
    handshake.errcheck = _retry_on_error
 
721
771
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
722
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
772
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
723
773
    transport_set_ptr.restype = None
 
725
775
    bye = _library.gnutls_bye
 
726
 
    bye.argtypes = [session_t, close_request_t]
 
727
 
    bye.restype = _error_code
 
 
776
    bye.argtypes = [ClientSession, close_request_t]
 
 
777
    bye.restype = ctypes.c_int
 
728
778
    bye.errcheck = _retry_on_error
 
730
780
    check_version = _library.gnutls_check_version
 
731
781
    check_version.argtypes = [ctypes.c_char_p]
 
732
782
    check_version.restype = ctypes.c_char_p
 
734
 
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
737
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
738
 
    openpgp_crt_init.restype = _error_code
 
740
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
741
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
742
 
                                   ctypes.POINTER(datum_t),
 
744
 
    openpgp_crt_import.restype = _error_code
 
746
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
747
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
748
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
749
 
    openpgp_crt_verify_self.restype = _error_code
 
751
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
752
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
753
 
    openpgp_crt_deinit.restype = None
 
755
 
    openpgp_crt_get_fingerprint = (
 
756
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
757
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
761
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
 
784
    _need_version = b"3.3.0"
 
 
785
    if check_version(_need_version) is None:
 
 
786
        raise self.Error("Needs GnuTLS {} or later"
 
 
787
                         .format(_need_version))
 
 
789
    _tls_rawpk_version = b"3.6.6"
 
 
790
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
794
        class pubkey_st(ctypes.Structure):
 
 
796
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
798
        x509_crt_fmt_t = ctypes.c_int
 
 
800
        # All the function declarations below are from
 
 
802
        pubkey_init = _library.gnutls_pubkey_init
 
 
803
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
804
        pubkey_init.restype = _error_code
 
 
806
        pubkey_import = _library.gnutls_pubkey_import
 
 
807
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
809
        pubkey_import.restype = _error_code
 
 
811
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
812
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
813
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
814
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
815
        pubkey_get_key_id.restype = _error_code
 
 
817
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
818
        pubkey_deinit.argtypes = [pubkey_t]
 
 
819
        pubkey_deinit.restype = None
 
 
821
        # All the function declarations below are from
 
 
824
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
825
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
826
        openpgp_crt_init.restype = _error_code
 
 
828
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
829
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
830
                                       ctypes.POINTER(datum_t),
 
 
832
        openpgp_crt_import.restype = _error_code
 
 
834
        openpgp_crt_verify_self = \
 
 
835
            _library.gnutls_openpgp_crt_verify_self
 
 
836
        openpgp_crt_verify_self.argtypes = [
 
 
839
            ctypes.POINTER(ctypes.c_uint),
 
 
841
        openpgp_crt_verify_self.restype = _error_code
 
 
843
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
844
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
845
        openpgp_crt_deinit.restype = None
 
 
847
        openpgp_crt_get_fingerprint = (
 
 
848
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
849
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
853
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
855
    if check_version(b"3.6.4"):
 
 
856
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
857
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
 
858
        certificate_type_get2.restype = _error_code
 
763
860
    # Remove non-public functions
 
764
861
    del _error_code, _retry_on_error
 
765
 
# Create the global "gnutls" object, simulating a module
 
769
864
def call_pipe(connection,       # : multiprocessing.Connection
 
 
2161
 
class ProxyClient(object):
 
2162
 
    def __init__(self, child_pipe, fpr, address):
 
 
2273
    def __init__(self, child_pipe, key_id, fpr, address):
 
2163
2274
        self._pipe = child_pipe
 
2164
 
        self._pipe.send(('init', fpr, address))
 
 
2275
        self._pipe.send(("init", key_id, fpr, address))
 
2165
2276
        if not self._pipe.recv():
 
 
2277
            raise KeyError(key_id or fpr)
 
2168
2279
    def __getattribute__(self, name):
 
2170
2281
            return super(ProxyClient, self).__getattribute__(name)
 
2171
 
        self._pipe.send(('getattr', name))
 
 
2282
        self._pipe.send(("getattr", name))
 
2172
2283
        data = self._pipe.recv()
 
2173
 
        if data[0] == 'data':
 
 
2284
        if data[0] == "data":
 
2175
 
        if data[0] == 'function':
 
 
2286
        if data[0] == "function":
 
2177
2288
            def func(*args, **kwargs):
 
2178
 
                self._pipe.send(('funcall', name, args, kwargs))
 
 
2289
                self._pipe.send(("funcall", name, args, kwargs))
 
2179
2290
                return self._pipe.recv()[1]
 
2183
2294
    def __setattr__(self, name, value):
 
2185
2296
            return super(ProxyClient, self).__setattr__(name, value)
 
2186
 
        self._pipe.send(('setattr', name, value))
 
 
2297
        self._pipe.send(("setattr", name, value))
 
2189
2300
class ClientHandler(socketserver.BaseRequestHandler, object):
 
 
2237
2347
            approval_required = False
 
2240
 
                    fpr = self.fingerprint(
 
2241
 
                        self.peer_certificate(session))
 
2242
 
                except (TypeError, gnutls.Error) as error:
 
2243
 
                    logger.warning("Bad certificate: %s", error)
 
2245
 
                logger.debug("Fingerprint: %s", fpr)
 
2248
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2349
                if gnutls.has_rawpk:
 
 
2352
                        key_id = self.key_id(
 
 
2353
                            self.peer_certificate(session))
 
 
2354
                    except (TypeError, gnutls.Error) as error:
 
 
2355
                        logger.warning("Bad certificate: %s", error)
 
 
2357
                    logger.debug("Key ID: %s",
 
 
2358
                                 key_id.decode("utf-8",
 
 
2364
                        fpr = self.fingerprint(
 
 
2365
                            self.peer_certificate(session))
 
 
2366
                    except (TypeError, gnutls.Error) as error:
 
 
2367
                        logger.warning("Bad certificate: %s", error)
 
 
2369
                    logger.debug("Fingerprint: %s", fpr)
 
 
2372
                    client = ProxyClient(child_pipe, key_id, fpr,
 
2249
2373
                                         self.client_address)
 
2250
2374
                except KeyError:
 
 
2330
2454
    def peer_certificate(session):
 
2331
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
2332
 
        # If not an OpenPGP certificate...
 
2333
 
        if (gnutls.certificate_type_get(session._c_object)
 
2334
 
            != gnutls.CRT_OPENPGP):
 
 
2455
        "Return the peer's certificate as a bytestring"
 
 
2457
            cert_type = gnutls.certificate_type_get2(
 
 
2458
                session, gnutls.CTYPE_PEERS)
 
 
2459
        except AttributeError:
 
 
2460
            cert_type = gnutls.certificate_type_get(session)
 
 
2461
        if gnutls.has_rawpk:
 
 
2462
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2464
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2465
        # If not a valid certificate type...
 
 
2466
        if cert_type not in valid_cert_types:
 
 
2467
            logger.info("Cert type %r not in %r", cert_type,
 
2335
2469
            # ...return invalid data
 
2337
2471
        list_size = ctypes.c_uint(1)
 
2338
2472
        cert_list = (gnutls.certificate_get_peers
 
2339
 
                     (session._c_object, ctypes.byref(list_size)))
 
 
2473
                     (session, ctypes.byref(list_size)))
 
2340
2474
        if not bool(cert_list) and list_size.value != 0:
 
2341
2475
            raise gnutls.Error("error getting peer certificate")
 
2342
2476
        if list_size.value == 0:
 
 
2345
2479
        return ctypes.string_at(cert.data, cert.size)
 
 
2482
    def key_id(certificate):
 
 
2483
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2484
        # New GnuTLS "datum" with the public key
 
 
2485
        datum = gnutls.datum_t(
 
 
2486
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2487
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2488
            ctypes.c_uint(len(certificate)))
 
 
2489
        # XXX all these need to be created in the gnutls "module"
 
 
2490
        # New empty GnuTLS certificate
 
 
2491
        pubkey = gnutls.pubkey_t()
 
 
2492
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2493
        # Import the raw public key into the certificate
 
 
2494
        gnutls.pubkey_import(pubkey,
 
 
2495
                             ctypes.byref(datum),
 
 
2496
                             gnutls.X509_FMT_DER)
 
 
2497
        # New buffer for the key ID
 
 
2498
        buf = ctypes.create_string_buffer(32)
 
 
2499
        buf_len = ctypes.c_size_t(len(buf))
 
 
2500
        # Get the key ID from the raw public key into the buffer
 
 
2501
        gnutls.pubkey_get_key_id(
 
 
2503
            gnutls.KEYID_USE_SHA256,
 
 
2504
            ctypes.cast(ctypes.byref(buf),
 
 
2505
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2506
            ctypes.byref(buf_len))
 
 
2507
        # Deinit the certificate
 
 
2508
        gnutls.pubkey_deinit(pubkey)
 
 
2510
        # Convert the buffer to a Python bytestring
 
 
2511
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2512
        # Convert the bytestring to hexadecimal notation
 
 
2513
        hex_key_id = binascii.hexlify(key_id).upper()
 
2348
2517
    def fingerprint(openpgp):
 
2349
2518
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2350
2519
        # New GnuTLS "datum" with the OpenPGP public key
 
 
2576
2748
        request = parent_pipe.recv()
 
2577
2749
        command = request[0]
 
2579
 
        if command == 'init':
 
2581
 
            address = request[2]
 
 
2751
        if command == "init":
 
 
2752
            key_id = request[1].decode("ascii")
 
 
2753
            fpr = request[2].decode("ascii")
 
 
2754
            address = request[3]
 
2583
2756
            for c in self.clients.values():
 
2584
 
                if c.fingerprint == fpr:
 
 
2757
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
 
2758
                              "27AE41E4649B934CA495991B7852B855"):
 
 
2760
                if key_id and c.key_id == key_id:
 
 
2763
                if fpr and c.fingerprint == fpr:
 
2588
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2589
 
                            "dress: %s", fpr, address)
 
 
2767
                logger.info("Client not found for key ID: %s, address"
 
 
2768
                            ": %s", key_id or fpr, address)
 
2590
2769
                if self.use_dbus:
 
2591
2770
                    # Emit D-Bus signal
 
2592
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2771
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2594
2773
                parent_pipe.send(False)
 
2597
2776
            GLib.io_add_watch(
 
2598
 
                parent_pipe.fileno(),
 
2599
 
                GLib.IO_IN | GLib.IO_HUP,
 
 
2777
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2778
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2600
2779
                functools.partial(self.handle_ipc,
 
2601
2780
                                  parent_pipe=parent_pipe,
 
 
2634
2813
def rfc3339_duration_to_delta(duration):
 
2635
2814
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2637
 
    >>> rfc3339_duration_to_delta("P7D")
 
2638
 
    datetime.timedelta(7)
 
2639
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2640
 
    datetime.timedelta(0, 60)
 
2641
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2642
 
    datetime.timedelta(0, 3600)
 
2643
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2644
 
    datetime.timedelta(1)
 
2645
 
    >>> rfc3339_duration_to_delta("P1W")
 
2646
 
    datetime.timedelta(7)
 
2647
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2648
 
    datetime.timedelta(0, 330)
 
2649
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2650
 
    datetime.timedelta(1, 200)
 
 
2816
    >>> timedelta = datetime.timedelta
 
 
2817
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
 
2819
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
 
2821
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
 
2823
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
 
2825
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
 
2827
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
 
2829
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2653
2834
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2733
2914
def string_to_delta(interval):
 
2734
2915
    """Parse a string and return a datetime.timedelta
 
2736
 
    >>> string_to_delta('7d')
 
2737
 
    datetime.timedelta(7)
 
2738
 
    >>> string_to_delta('60s')
 
2739
 
    datetime.timedelta(0, 60)
 
2740
 
    >>> string_to_delta('60m')
 
2741
 
    datetime.timedelta(0, 3600)
 
2742
 
    >>> string_to_delta('24h')
 
2743
 
    datetime.timedelta(1)
 
2744
 
    >>> string_to_delta('1w')
 
2745
 
    datetime.timedelta(7)
 
2746
 
    >>> string_to_delta('5m 30s')
 
2747
 
    datetime.timedelta(0, 330)
 
 
2917
    >>> string_to_delta("7d") == datetime.timedelta(7)
 
 
2919
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
 
 
2921
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
 
 
2923
    >>> string_to_delta("24h") == datetime.timedelta(1)
 
 
2925
    >>> string_to_delta("1w") == datetime.timedelta(7)
 
 
2927
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
 
 
2875
3055
                       "foreground": "False",
 
2876
3056
                       "zeroconf": "True",
 
2879
3060
    # Parse config file for server-global settings
 
2880
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3061
    server_config = configparser.ConfigParser(server_defaults)
 
2881
3062
    del server_defaults
 
2882
3063
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2883
 
    # Convert the SafeConfigParser object to a dict
 
 
3064
    # Convert the ConfigParser object to a dict
 
2884
3065
    server_settings = server_config.defaults()
 
2885
3066
    # Use the appropriate methods on the non-string config options
 
2886
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
3067
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3068
                   "foreground", "zeroconf"):
 
2887
3069
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2889
3071
    if server_settings["port"]: