/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2021-02-03 08:57:27 UTC
  • Revision ID: teddy@recompile.se-20210203085727-r2nseei71wb0clpf
Tags: version-1.8.14-1
Version 1.8.14-1

* Makefile (version): Change to "1.8.14".
* NEWS (Version 1.8.14): Add new entry.
* debian/changelog (1.8.14-1): - '' -

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
#
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
93
95
    __metaclass__ = type
94
96
    str = unicode
95
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
 
112
 
96
113
# Show warnings by default
97
114
if not sys.warnoptions:
98
115
    import warnings
126
143
if sys.version_info < (3, 2):
127
144
    configparser.Configparser = configparser.SafeConfigParser
128
145
 
129
 
version = "1.8.9"
 
146
version = "1.8.14"
130
147
stored_state_file = "clients.pickle"
131
148
 
132
149
logger = logging.getLogger()
507
524
class AvahiServiceToSyslog(AvahiService):
508
525
    def rename(self, *args, **kwargs):
509
526
        """Add the new name to the syslog messages"""
510
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
528
                                                       **kwargs)
511
529
        syslogger.setFormatter(logging.Formatter(
512
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
513
531
            .format(self.name)))
757
775
 
758
776
        x509_crt_fmt_t = ctypes.c_int
759
777
 
760
 
        # All the function declarations below are from gnutls/abstract.h
 
778
        # All the function declarations below are from
 
779
        # gnutls/abstract.h
761
780
        pubkey_init = _library.gnutls_pubkey_init
762
781
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
763
782
        pubkey_init.restype = _error_code
777
796
        pubkey_deinit.argtypes = [pubkey_t]
778
797
        pubkey_deinit.restype = None
779
798
    else:
780
 
        # All the function declarations below are from gnutls/openpgp.h
 
799
        # All the function declarations below are from
 
800
        # gnutls/openpgp.h
781
801
 
782
802
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
783
803
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
789
809
                                       openpgp_crt_fmt_t]
790
810
        openpgp_crt_import.restype = _error_code
791
811
 
792
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
793
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
794
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
812
        openpgp_crt_verify_self = \
 
813
            _library.gnutls_openpgp_crt_verify_self
 
814
        openpgp_crt_verify_self.argtypes = [
 
815
            openpgp_crt_t,
 
816
            ctypes.c_uint,
 
817
            ctypes.POINTER(ctypes.c_uint),
 
818
        ]
795
819
        openpgp_crt_verify_self.restype = _error_code
796
820
 
797
821
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
1035
1059
        if self.checker_initiator_tag is not None:
1036
1060
            GLib.source_remove(self.checker_initiator_tag)
1037
1061
        self.checker_initiator_tag = GLib.timeout_add(
1038
 
            int(self.interval.total_seconds() * 1000),
 
1062
            random.randrange(int(self.interval.total_seconds() * 1000
 
1063
                                 + 1)),
1039
1064
            self.start_checker)
1040
1065
        # Schedule a disable() when 'timeout' has passed
1041
1066
        if self.disable_initiator_tag is not None:
1116
1141
        if self.checker is None:
1117
1142
            # Escape attributes for the shell
1118
1143
            escaped_attrs = {
1119
 
                attr: re.escape(str(getattr(self, attr)))
 
1144
                attr: shlex.quote(str(getattr(self, attr)))
1120
1145
                for attr in self.runtime_expansions}
1121
1146
            try:
1122
1147
                command = self.checker_command % escaped_attrs
2450
2475
        buf = ctypes.create_string_buffer(32)
2451
2476
        buf_len = ctypes.c_size_t(len(buf))
2452
2477
        # Get the key ID from the raw public key into the buffer
2453
 
        gnutls.pubkey_get_key_id(pubkey,
2454
 
                                 gnutls.KEYID_USE_SHA256,
2455
 
                                 ctypes.cast(ctypes.byref(buf),
2456
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
2457
 
                                 ctypes.byref(buf_len))
 
2478
        gnutls.pubkey_get_key_id(
 
2479
            pubkey,
 
2480
            gnutls.KEYID_USE_SHA256,
 
2481
            ctypes.cast(ctypes.byref(buf),
 
2482
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2483
            ctypes.byref(buf_len))
2458
2484
        # Deinit the certificate
2459
2485
        gnutls.pubkey_deinit(pubkey)
2460
2486
 
2705
2731
            address = request[3]
2706
2732
 
2707
2733
            for c in self.clients.values():
2708
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2734
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2735
                              "27AE41E4649B934CA495991B7852B855"):
2709
2736
                    continue
2710
2737
                if key_id and c.key_id == key_id:
2711
2738
                    client = c
2746
2773
        if command == 'getattr':
2747
2774
            attrname = request[1]
2748
2775
            if isinstance(client_object.__getattribute__(attrname),
2749
 
                          collections.Callable):
 
2776
                          collections.abc.Callable):
2750
2777
                parent_pipe.send(('function', ))
2751
2778
            else:
2752
2779
                parent_pipe.send((
2763
2790
def rfc3339_duration_to_delta(duration):
2764
2791
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2765
2792
 
2766
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2767
 
    True
2768
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2769
 
    True
2770
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2771
 
    True
2772
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2773
 
    True
2774
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2775
 
    True
2776
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2777
 
    True
2778
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2779
 
    True
 
2793
    >>> timedelta = datetime.timedelta
 
2794
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2795
    True
 
2796
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2797
    True
 
2798
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2799
    True
 
2800
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2801
    True
 
2802
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2803
    True
 
2804
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2805
    True
 
2806
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2807
    True
 
2808
    >>> del timedelta
2780
2809
    """
2781
2810
 
2782
2811
    # Parsing an RFC 3339 duration with regular expressions is not