/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 at recompile
  • Date: 2019-12-04 23:52:20 UTC
  • Revision ID: teddy@recompile.se-20191204235220-yn88brp0scmqwy2t
Remove non-project-specific pattern from .bzrignore

Only project-specific patterns should be in the .bzrignore file.
Other generic patterns should be in the ~/.config/breezy/ignore and
~/.bazaar/ignore files.

* .bzrignore (.tramp_history): Remove.

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-2020 Teddy Hogeborn
15
 
# Copyright © 2008-2020 Björn Påhlsson
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
15
# Copyright © 2008-2019 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
83
81
 
84
82
import dbus
85
83
import dbus.service
95
93
    __metaclass__ = type
96
94
    str = unicode
97
95
 
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
 
 
113
96
# Show warnings by default
114
97
if not sys.warnoptions:
115
98
    import warnings
143
126
if sys.version_info < (3, 2):
144
127
    configparser.Configparser = configparser.SafeConfigParser
145
128
 
146
 
version = "1.8.14"
 
129
version = "1.8.9"
147
130
stored_state_file = "clients.pickle"
148
131
 
149
132
logger = logging.getLogger()
524
507
class AvahiServiceToSyslog(AvahiService):
525
508
    def rename(self, *args, **kwargs):
526
509
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
510
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
511
        syslogger.setFormatter(logging.Formatter(
530
512
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
513
            .format(self.name)))
661
643
            raise gnutls.CertificateSecurityError(code=result)
662
644
        raise gnutls.Error(code=result)
663
645
 
664
 
    def _retry_on_error(result, func, arguments,
665
 
                        _error_code=_error_code):
 
646
    def _retry_on_error(result, func, arguments):
666
647
        """A function to retry on some errors, suitable
667
648
        for the 'errcheck' attribute on ctypes functions"""
668
649
        while result < 0:
776
757
 
777
758
        x509_crt_fmt_t = ctypes.c_int
778
759
 
779
 
        # All the function declarations below are from
780
 
        # gnutls/abstract.h
 
760
        # All the function declarations below are from gnutls/abstract.h
781
761
        pubkey_init = _library.gnutls_pubkey_init
782
762
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
783
763
        pubkey_init.restype = _error_code
797
777
        pubkey_deinit.argtypes = [pubkey_t]
798
778
        pubkey_deinit.restype = None
799
779
    else:
800
 
        # All the function declarations below are from
801
 
        # gnutls/openpgp.h
 
780
        # All the function declarations below are from gnutls/openpgp.h
802
781
 
803
782
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
804
783
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
810
789
                                       openpgp_crt_fmt_t]
811
790
        openpgp_crt_import.restype = _error_code
812
791
 
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
 
        ]
 
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)]
820
795
        openpgp_crt_verify_self.restype = _error_code
821
796
 
822
797
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
1060
1035
        if self.checker_initiator_tag is not None:
1061
1036
            GLib.source_remove(self.checker_initiator_tag)
1062
1037
        self.checker_initiator_tag = GLib.timeout_add(
1063
 
            random.randrange(int(self.interval.total_seconds() * 1000
1064
 
                                 + 1)),
 
1038
            int(self.interval.total_seconds() * 1000),
1065
1039
            self.start_checker)
1066
1040
        # Schedule a disable() when 'timeout' has passed
1067
1041
        if self.disable_initiator_tag is not None:
1142
1116
        if self.checker is None:
1143
1117
            # Escape attributes for the shell
1144
1118
            escaped_attrs = {
1145
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1119
                attr: re.escape(str(getattr(self, attr)))
1146
1120
                for attr in self.runtime_expansions}
1147
1121
            try:
1148
1122
                command = self.checker_command % escaped_attrs
2476
2450
        buf = ctypes.create_string_buffer(32)
2477
2451
        buf_len = ctypes.c_size_t(len(buf))
2478
2452
        # Get the key ID from the raw public key into the buffer
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))
 
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))
2485
2458
        # Deinit the certificate
2486
2459
        gnutls.pubkey_deinit(pubkey)
2487
2460
 
2732
2705
            address = request[3]
2733
2706
 
2734
2707
            for c in self.clients.values():
2735
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2736
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2708
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2737
2709
                    continue
2738
2710
                if key_id and c.key_id == key_id:
2739
2711
                    client = c
2774
2746
        if command == 'getattr':
2775
2747
            attrname = request[1]
2776
2748
            if isinstance(client_object.__getattribute__(attrname),
2777
 
                          collections.abc.Callable):
 
2749
                          collections.Callable):
2778
2750
                parent_pipe.send(('function', ))
2779
2751
            else:
2780
2752
                parent_pipe.send((
2791
2763
def rfc3339_duration_to_delta(duration):
2792
2764
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2793
2765
 
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
 
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
2810
2780
    """
2811
2781
 
2812
2782
    # Parsing an RFC 3339 duration with regular expressions is not