/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2022-04-23 21:14:38 UTC
  • Revision ID: teddy@recompile.se-20220423211438-qadwdpyodk1zfra5
Debian package: Client: Update Lintian override file

* debian/mandos-client.lintian-overrides: Remove all empty commented
  lines.  Re-word text to avoid negation.  Rename "setuid-binary" tag
  to "elevated-privileges".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2019 Teddy Hogeborn
15
 
# Copyright © 2008-2019 Björn Påhlsson
 
14
# Copyright © 2008-2020 Teddy Hogeborn
 
15
# Copyright © 2008-2020 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
79
79
import codecs
80
80
import unittest
81
81
import random
 
82
import shlex
82
83
 
83
84
import dbus
84
85
import dbus.service
103
104
    collections.abc = abc
104
105
    del abc
105
106
 
 
107
# Add shlex.quote if it does not exist
 
108
try:
 
109
    shlex.quote
 
110
except AttributeError:
 
111
    shlex.quote = re.escape
 
112
 
106
113
# Show warnings by default
107
114
if not sys.warnoptions:
108
115
    import warnings
136
143
if sys.version_info < (3, 2):
137
144
    configparser.Configparser = configparser.SafeConfigParser
138
145
 
139
 
version = "1.8.9"
 
146
version = "1.8.14"
140
147
stored_state_file = "clients.pickle"
141
148
 
142
149
logger = logging.getLogger()
517
524
class AvahiServiceToSyslog(AvahiService):
518
525
    def rename(self, *args, **kwargs):
519
526
        """Add the new name to the syslog messages"""
520
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
528
                                                       **kwargs)
521
529
        syslogger.setFormatter(logging.Formatter(
522
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
523
531
            .format(self.name)))
555
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
556
564
 
557
565
    # Types
558
 
    class session_int(ctypes.Structure):
 
566
    class _session_int(ctypes.Structure):
559
567
        _fields_ = []
560
 
    session_t = ctypes.POINTER(session_int)
 
568
    session_t = ctypes.POINTER(_session_int)
561
569
 
562
570
    class certificate_credentials_st(ctypes.Structure):
563
571
        _fields_ = []
569
577
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
570
578
                    ('size', ctypes.c_uint)]
571
579
 
572
 
    class openpgp_crt_int(ctypes.Structure):
 
580
    class _openpgp_crt_int(ctypes.Structure):
573
581
        _fields_ = []
574
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
582
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
575
583
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
576
584
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
577
585
    credentials_type_t = ctypes.c_int
586
594
            # gnutls.strerror()
587
595
            self.code = code
588
596
            if message is None and code is not None:
589
 
                message = gnutls.strerror(code)
 
597
                message = gnutls.strerror(code).decode(
 
598
                    "utf-8", errors="replace")
590
599
            return super(gnutls.Error, self).__init__(
591
600
                message, *args)
592
601
 
593
602
    class CertificateSecurityError(Error):
594
603
        pass
595
604
 
 
605
    class PointerTo:
 
606
        def __init__(self, cls):
 
607
            self.cls = cls
 
608
 
 
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))
 
614
 
 
615
    class CastToVoidPointer:
 
616
        def __init__(self, cls):
 
617
            self.cls = cls
 
618
 
 
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)
 
624
 
 
625
    class With_from_param:
 
626
        @classmethod
 
627
        def from_param(cls, obj):
 
628
            return obj._as_parameter_
 
629
 
596
630
    # Classes
597
 
    class Credentials:
 
631
    class Credentials(With_from_param):
598
632
        def __init__(self):
599
 
            self._c_object = gnutls.certificate_credentials_t()
600
 
            gnutls.certificate_allocate_credentials(
601
 
                ctypes.byref(self._c_object))
 
633
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
634
            gnutls.certificate_allocate_credentials(self)
602
635
            self.type = gnutls.CRD_CERTIFICATE
603
636
 
604
637
        def __del__(self):
605
 
            gnutls.certificate_free_credentials(self._c_object)
 
638
            gnutls.certificate_free_credentials(self)
606
639
 
607
 
    class ClientSession:
 
640
    class ClientSession(With_from_param):
608
641
        def __init__(self, socket, credentials=None):
609
 
            self._c_object = gnutls.session_t()
 
642
            self._as_parameter_ = gnutls.session_t()
610
643
            gnutls_flags = gnutls.CLIENT
611
644
            if gnutls.check_version(b"3.5.6"):
612
645
                gnutls_flags |= gnutls.NO_TICKETS
613
646
            if gnutls.has_rawpk:
614
647
                gnutls_flags |= gnutls.ENABLE_RAWPK
615
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
648
            gnutls.init(self, gnutls_flags)
616
649
            del gnutls_flags
617
 
            gnutls.set_default_priority(self._c_object)
618
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
619
 
            gnutls.handshake_set_private_extensions(self._c_object,
620
 
                                                    True)
 
650
            gnutls.set_default_priority(self)
 
651
            gnutls.transport_set_ptr(self, socket.fileno())
 
652
            gnutls.handshake_set_private_extensions(self, True)
621
653
            self.socket = socket
622
654
            if credentials is None:
623
655
                credentials = gnutls.Credentials()
624
 
            gnutls.credentials_set(self._c_object, credentials.type,
625
 
                                   ctypes.cast(credentials._c_object,
626
 
                                               ctypes.c_void_p))
 
656
            gnutls.credentials_set(self, credentials.type,
 
657
                                   credentials)
627
658
            self.credentials = credentials
628
659
 
629
660
        def __del__(self):
630
 
            gnutls.deinit(self._c_object)
 
661
            gnutls.deinit(self)
631
662
 
632
663
        def handshake(self):
633
 
            return gnutls.handshake(self._c_object)
 
664
            return gnutls.handshake(self)
634
665
 
635
666
        def send(self, data):
636
667
            data = bytes(data)
637
668
            data_len = len(data)
638
669
            while data_len > 0:
639
 
                data_len -= gnutls.record_send(self._c_object,
640
 
                                               data[-data_len:],
 
670
                data_len -= gnutls.record_send(self, data[-data_len:],
641
671
                                               data_len)
642
672
 
643
673
        def bye(self):
644
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
674
            return gnutls.bye(self, gnutls.SHUT_RDWR)
645
675
 
646
676
    # Error handling functions
647
677
    def _error_code(result):
648
678
        """A function to raise exceptions on errors, suitable
649
679
        for the 'restype' attribute on ctypes functions"""
650
 
        if result >= 0:
 
680
        if result >= gnutls.E_SUCCESS:
651
681
            return result
652
682
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
653
683
            raise gnutls.CertificateSecurityError(code=result)
654
684
        raise gnutls.Error(code=result)
655
685
 
656
 
    def _retry_on_error(result, func, arguments):
 
686
    def _retry_on_error(result, func, arguments,
 
687
                        _error_code=_error_code):
657
688
        """A function to retry on some errors, suitable
658
689
        for the 'errcheck' attribute on ctypes functions"""
659
 
        while result < 0:
 
690
        while result < gnutls.E_SUCCESS:
660
691
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
661
692
                return _error_code(result)
662
693
            result = func(*arguments)
667
698
 
668
699
    # Functions
669
700
    priority_set_direct = _library.gnutls_priority_set_direct
670
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
701
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
671
702
                                    ctypes.POINTER(ctypes.c_char_p)]
672
703
    priority_set_direct.restype = _error_code
673
704
 
674
705
    init = _library.gnutls_init
675
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
706
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
676
707
    init.restype = _error_code
677
708
 
678
709
    set_default_priority = _library.gnutls_set_default_priority
679
 
    set_default_priority.argtypes = [session_t]
 
710
    set_default_priority.argtypes = [ClientSession]
680
711
    set_default_priority.restype = _error_code
681
712
 
682
713
    record_send = _library.gnutls_record_send
683
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
714
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
684
715
                            ctypes.c_size_t]
685
716
    record_send.restype = ctypes.c_ssize_t
686
717
    record_send.errcheck = _retry_on_error
688
719
    certificate_allocate_credentials = (
689
720
        _library.gnutls_certificate_allocate_credentials)
690
721
    certificate_allocate_credentials.argtypes = [
691
 
        ctypes.POINTER(certificate_credentials_t)]
 
722
        PointerTo(Credentials)]
692
723
    certificate_allocate_credentials.restype = _error_code
693
724
 
694
725
    certificate_free_credentials = (
695
726
        _library.gnutls_certificate_free_credentials)
696
 
    certificate_free_credentials.argtypes = [
697
 
        certificate_credentials_t]
 
727
    certificate_free_credentials.argtypes = [Credentials]
698
728
    certificate_free_credentials.restype = None
699
729
 
700
730
    handshake_set_private_extensions = (
701
731
        _library.gnutls_handshake_set_private_extensions)
702
 
    handshake_set_private_extensions.argtypes = [session_t,
 
732
    handshake_set_private_extensions.argtypes = [ClientSession,
703
733
                                                 ctypes.c_int]
704
734
    handshake_set_private_extensions.restype = None
705
735
 
706
736
    credentials_set = _library.gnutls_credentials_set
707
 
    credentials_set.argtypes = [session_t, credentials_type_t,
708
 
                                ctypes.c_void_p]
 
737
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
738
                                CastToVoidPointer(Credentials)]
709
739
    credentials_set.restype = _error_code
710
740
 
711
741
    strerror = _library.gnutls_strerror
713
743
    strerror.restype = ctypes.c_char_p
714
744
 
715
745
    certificate_type_get = _library.gnutls_certificate_type_get
716
 
    certificate_type_get.argtypes = [session_t]
 
746
    certificate_type_get.argtypes = [ClientSession]
717
747
    certificate_type_get.restype = _error_code
718
748
 
719
749
    certificate_get_peers = _library.gnutls_certificate_get_peers
720
 
    certificate_get_peers.argtypes = [session_t,
 
750
    certificate_get_peers.argtypes = [ClientSession,
721
751
                                      ctypes.POINTER(ctypes.c_uint)]
722
752
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
723
753
 
730
760
    global_set_log_function.restype = None
731
761
 
732
762
    deinit = _library.gnutls_deinit
733
 
    deinit.argtypes = [session_t]
 
763
    deinit.argtypes = [ClientSession]
734
764
    deinit.restype = None
735
765
 
736
766
    handshake = _library.gnutls_handshake
737
 
    handshake.argtypes = [session_t]
738
 
    handshake.restype = _error_code
 
767
    handshake.argtypes = [ClientSession]
 
768
    handshake.restype = ctypes.c_int
739
769
    handshake.errcheck = _retry_on_error
740
770
 
741
771
    transport_set_ptr = _library.gnutls_transport_set_ptr
742
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
772
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
743
773
    transport_set_ptr.restype = None
744
774
 
745
775
    bye = _library.gnutls_bye
746
 
    bye.argtypes = [session_t, close_request_t]
747
 
    bye.restype = _error_code
 
776
    bye.argtypes = [ClientSession, close_request_t]
 
777
    bye.restype = ctypes.c_int
748
778
    bye.errcheck = _retry_on_error
749
779
 
750
780
    check_version = _library.gnutls_check_version
767
797
 
768
798
        x509_crt_fmt_t = ctypes.c_int
769
799
 
770
 
        # All the function declarations below are from gnutls/abstract.h
 
800
        # All the function declarations below are from
 
801
        # gnutls/abstract.h
771
802
        pubkey_init = _library.gnutls_pubkey_init
772
803
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
773
804
        pubkey_init.restype = _error_code
787
818
        pubkey_deinit.argtypes = [pubkey_t]
788
819
        pubkey_deinit.restype = None
789
820
    else:
790
 
        # All the function declarations below are from gnutls/openpgp.h
 
821
        # All the function declarations below are from
 
822
        # gnutls/openpgp.h
791
823
 
792
824
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
793
825
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
799
831
                                       openpgp_crt_fmt_t]
800
832
        openpgp_crt_import.restype = _error_code
801
833
 
802
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
803
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
804
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
834
        openpgp_crt_verify_self = \
 
835
            _library.gnutls_openpgp_crt_verify_self
 
836
        openpgp_crt_verify_self.argtypes = [
 
837
            openpgp_crt_t,
 
838
            ctypes.c_uint,
 
839
            ctypes.POINTER(ctypes.c_uint),
 
840
        ]
805
841
        openpgp_crt_verify_self.restype = _error_code
806
842
 
807
843
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
818
854
 
819
855
    if check_version(b"3.6.4"):
820
856
        certificate_type_get2 = _library.gnutls_certificate_type_get2
821
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
857
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
822
858
        certificate_type_get2.restype = _error_code
823
859
 
824
860
    # Remove non-public functions
1127
1163
        if self.checker is None:
1128
1164
            # Escape attributes for the shell
1129
1165
            escaped_attrs = {
1130
 
                attr: re.escape(str(getattr(self, attr)))
 
1166
                attr: shlex.quote(str(getattr(self, attr)))
1131
1167
                for attr in self.runtime_expansions}
1132
1168
            try:
1133
1169
                command = self.checker_command % escaped_attrs
2284
2320
            priority = self.server.gnutls_priority
2285
2321
            if priority is None:
2286
2322
                priority = "NORMAL"
2287
 
            gnutls.priority_set_direct(session._c_object,
2288
 
                                       priority.encode("utf-8"),
2289
 
                                       None)
 
2323
            gnutls.priority_set_direct(session,
 
2324
                                       priority.encode("utf-8"), None)
2290
2325
 
2291
2326
            # Start communication using the Mandos protocol
2292
2327
            # Get protocol number
2319
2354
                    except (TypeError, gnutls.Error) as error:
2320
2355
                        logger.warning("Bad certificate: %s", error)
2321
2356
                        return
2322
 
                    logger.debug("Key ID: %s", key_id)
 
2357
                    logger.debug("Key ID: %s",
 
2358
                                 key_id.decode("utf-8",
 
2359
                                               errors="replace"))
2323
2360
 
2324
2361
                else:
2325
2362
                    key_id = b""
2417
2454
    def peer_certificate(session):
2418
2455
        "Return the peer's certificate as a bytestring"
2419
2456
        try:
2420
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
2421
 
                                                     gnutls.CTYPE_PEERS)
 
2457
            cert_type = gnutls.certificate_type_get2(
 
2458
                session, gnutls.CTYPE_PEERS)
2422
2459
        except AttributeError:
2423
 
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2460
            cert_type = gnutls.certificate_type_get(session)
2424
2461
        if gnutls.has_rawpk:
2425
2462
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2426
2463
        else:
2433
2470
            return b""
2434
2471
        list_size = ctypes.c_uint(1)
2435
2472
        cert_list = (gnutls.certificate_get_peers
2436
 
                     (session._c_object, ctypes.byref(list_size)))
 
2473
                     (session, ctypes.byref(list_size)))
2437
2474
        if not bool(cert_list) and list_size.value != 0:
2438
2475
            raise gnutls.Error("error getting peer certificate")
2439
2476
        if list_size.value == 0:
2461
2498
        buf = ctypes.create_string_buffer(32)
2462
2499
        buf_len = ctypes.c_size_t(len(buf))
2463
2500
        # Get the key ID from the raw public key into the buffer
2464
 
        gnutls.pubkey_get_key_id(pubkey,
2465
 
                                 gnutls.KEYID_USE_SHA256,
2466
 
                                 ctypes.cast(ctypes.byref(buf),
2467
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
2468
 
                                 ctypes.byref(buf_len))
 
2501
        gnutls.pubkey_get_key_id(
 
2502
            pubkey,
 
2503
            gnutls.KEYID_USE_SHA256,
 
2504
            ctypes.cast(ctypes.byref(buf),
 
2505
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2506
            ctypes.byref(buf_len))
2469
2507
        # Deinit the certificate
2470
2508
        gnutls.pubkey_deinit(pubkey)
2471
2509
 
2716
2754
            address = request[3]
2717
2755
 
2718
2756
            for c in self.clients.values():
2719
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2757
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2758
                              "27AE41E4649B934CA495991B7852B855"):
2720
2759
                    continue
2721
2760
                if key_id and c.key_id == key_id:
2722
2761
                    client = c
2774
2813
def rfc3339_duration_to_delta(duration):
2775
2814
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2776
2815
 
2777
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2778
 
    True
2779
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2780
 
    True
2781
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2782
 
    True
2783
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2784
 
    True
2785
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2786
 
    True
2787
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2788
 
    True
2789
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2790
 
    True
 
2816
    >>> timedelta = datetime.timedelta
 
2817
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2818
    True
 
2819
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2820
    True
 
2821
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2822
    True
 
2823
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2824
    True
 
2825
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2826
    True
 
2827
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2828
    True
 
2829
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2830
    True
 
2831
    >>> del timedelta
2791
2832
    """
2792
2833
 
2793
2834
    # Parsing an RFC 3339 duration with regular expressions is not
3160
3201
 
3161
3202
        @gnutls.log_func
3162
3203
        def debug_gnutls(level, string):
3163
 
            logger.debug("GnuTLS: %s", string[:-1])
 
3204
            logger.debug("GnuTLS: %s",
 
3205
                         string[:-1].decode("utf-8",
 
3206
                                            errors="replace"))
3164
3207
 
3165
3208
        gnutls.global_set_log_function(debug_gnutls)
3166
3209