/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: 2021-03-21 19:51:15 UTC
  • Revision ID: teddy@recompile.se-20210321195115-qe6g0fyj1kabwlav
Fix theoretical GnuTLS bug

Fix "NameError: global name '_error_code' is not defined" error if
GNUTLS_E_INTERRUPTED or GNUTLS_E_AGAIN was ever returned from
gnutls_record_send().

* mandos (gnutls._retry_on_error): Import "_error_code" from outer
  class scope to local function scope via a keyword argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python3 -b
 
1
#!/usr/bin/python3 -bI
2
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 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-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
#
78
78
import collections
79
79
import codecs
80
80
import unittest
 
81
import random
 
82
import shlex
81
83
 
82
84
import dbus
83
85
import dbus.service
91
93
 
92
94
if sys.version_info.major == 2:
93
95
    __metaclass__ = type
 
96
    str = unicode
 
97
 
 
98
# Add collections.abc.Callable if it does not exist
 
99
try:
 
100
    collections.abc.Callable
 
101
except AttributeError:
 
102
    class abc:
 
103
        Callable = collections.Callable
 
104
    collections.abc = abc
 
105
    del abc
 
106
 
 
107
# Add shlex.quote if it does not exist
 
108
try:
 
109
    shlex.quote
 
110
except AttributeError:
 
111
    shlex.quote = re.escape
94
112
 
95
113
# Show warnings by default
96
114
if not sys.warnoptions:
122
140
            # No value found
123
141
            SO_BINDTODEVICE = None
124
142
 
125
 
if sys.version_info.major == 2:
126
 
    str = unicode
127
 
 
128
143
if sys.version_info < (3, 2):
129
144
    configparser.Configparser = configparser.SafeConfigParser
130
145
 
131
 
version = "1.8.9"
 
146
version = "1.8.14"
132
147
stored_state_file = "clients.pickle"
133
148
 
134
149
logger = logging.getLogger()
509
524
class AvahiServiceToSyslog(AvahiService):
510
525
    def rename(self, *args, **kwargs):
511
526
        """Add the new name to the syslog messages"""
512
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
528
                                                       **kwargs)
513
529
        syslogger.setFormatter(logging.Formatter(
514
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
515
531
            .format(self.name)))
645
661
            raise gnutls.CertificateSecurityError(code=result)
646
662
        raise gnutls.Error(code=result)
647
663
 
648
 
    def _retry_on_error(result, func, arguments):
 
664
    def _retry_on_error(result, func, arguments,
 
665
                        _error_code=_error_code):
649
666
        """A function to retry on some errors, suitable
650
667
        for the 'errcheck' attribute on ctypes functions"""
651
668
        while result < 0:
759
776
 
760
777
        x509_crt_fmt_t = ctypes.c_int
761
778
 
762
 
        # All the function declarations below are from gnutls/abstract.h
 
779
        # All the function declarations below are from
 
780
        # gnutls/abstract.h
763
781
        pubkey_init = _library.gnutls_pubkey_init
764
782
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
765
783
        pubkey_init.restype = _error_code
779
797
        pubkey_deinit.argtypes = [pubkey_t]
780
798
        pubkey_deinit.restype = None
781
799
    else:
782
 
        # All the function declarations below are from gnutls/openpgp.h
 
800
        # All the function declarations below are from
 
801
        # gnutls/openpgp.h
783
802
 
784
803
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
785
804
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
791
810
                                       openpgp_crt_fmt_t]
792
811
        openpgp_crt_import.restype = _error_code
793
812
 
794
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
795
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
796
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
813
        openpgp_crt_verify_self = \
 
814
            _library.gnutls_openpgp_crt_verify_self
 
815
        openpgp_crt_verify_self.argtypes = [
 
816
            openpgp_crt_t,
 
817
            ctypes.c_uint,
 
818
            ctypes.POINTER(ctypes.c_uint),
 
819
        ]
797
820
        openpgp_crt_verify_self.restype = _error_code
798
821
 
799
822
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
1037
1060
        if self.checker_initiator_tag is not None:
1038
1061
            GLib.source_remove(self.checker_initiator_tag)
1039
1062
        self.checker_initiator_tag = GLib.timeout_add(
1040
 
            int(self.interval.total_seconds() * 1000),
 
1063
            random.randrange(int(self.interval.total_seconds() * 1000
 
1064
                                 + 1)),
1041
1065
            self.start_checker)
1042
1066
        # Schedule a disable() when 'timeout' has passed
1043
1067
        if self.disable_initiator_tag is not None:
1118
1142
        if self.checker is None:
1119
1143
            # Escape attributes for the shell
1120
1144
            escaped_attrs = {
1121
 
                attr: re.escape(str(getattr(self, attr)))
 
1145
                attr: shlex.quote(str(getattr(self, attr)))
1122
1146
                for attr in self.runtime_expansions}
1123
1147
            try:
1124
1148
                command = self.checker_command % escaped_attrs
1413
1437
                raise ValueError("Byte arrays not supported for non-"
1414
1438
                                 "'ay' signature {!r}"
1415
1439
                                 .format(prop._dbus_signature))
1416
 
            value = dbus.ByteArray(b''.join(chr(byte)
1417
 
                                            for byte in value))
 
1440
            value = dbus.ByteArray(bytes(value))
1418
1441
        prop(value)
1419
1442
 
1420
1443
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2453
2476
        buf = ctypes.create_string_buffer(32)
2454
2477
        buf_len = ctypes.c_size_t(len(buf))
2455
2478
        # Get the key ID from the raw public key into the buffer
2456
 
        gnutls.pubkey_get_key_id(pubkey,
2457
 
                                 gnutls.KEYID_USE_SHA256,
2458
 
                                 ctypes.cast(ctypes.byref(buf),
2459
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
2460
 
                                 ctypes.byref(buf_len))
 
2479
        gnutls.pubkey_get_key_id(
 
2480
            pubkey,
 
2481
            gnutls.KEYID_USE_SHA256,
 
2482
            ctypes.cast(ctypes.byref(buf),
 
2483
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2484
            ctypes.byref(buf_len))
2461
2485
        # Deinit the certificate
2462
2486
        gnutls.pubkey_deinit(pubkey)
2463
2487
 
2708
2732
            address = request[3]
2709
2733
 
2710
2734
            for c in self.clients.values():
2711
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2735
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2736
                              "27AE41E4649B934CA495991B7852B855"):
2712
2737
                    continue
2713
2738
                if key_id and c.key_id == key_id:
2714
2739
                    client = c
2749
2774
        if command == 'getattr':
2750
2775
            attrname = request[1]
2751
2776
            if isinstance(client_object.__getattribute__(attrname),
2752
 
                          collections.Callable):
 
2777
                          collections.abc.Callable):
2753
2778
                parent_pipe.send(('function', ))
2754
2779
            else:
2755
2780
                parent_pipe.send((
2766
2791
def rfc3339_duration_to_delta(duration):
2767
2792
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2768
2793
 
2769
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
 
    True
2771
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
 
    True
2773
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
 
    True
2775
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
 
    True
2777
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
 
    True
2779
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
 
    True
2781
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2782
 
    True
 
2794
    >>> timedelta = datetime.timedelta
 
2795
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2796
    True
 
2797
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2798
    True
 
2799
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2800
    True
 
2801
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2802
    True
 
2803
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2804
    True
 
2805
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2806
    True
 
2807
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2808
    True
 
2809
    >>> del timedelta
2783
2810
    """
2784
2811
 
2785
2812
    # Parsing an RFC 3339 duration with regular expressions is not