/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: 2019-07-30 18:15:41 UTC
  • Revision ID: teddy@recompile.se-20190730181541-wzzydg1u0jck1oio
Update Debian package standard-version to "4.4.0"

* debian/control (Standards-Version): Update to "4.4.0".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python3 -bI
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 -*-
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
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
#
77
77
import itertools
78
78
import collections
79
79
import codecs
80
 
import unittest
81
 
import random
82
 
import shlex
83
80
 
84
81
import dbus
85
82
import dbus.service
86
 
import gi
87
83
from gi.repository import GLib
88
84
from dbus.mainloop.glib import DBusGMainLoop
89
85
import ctypes
91
87
import xml.dom.minidom
92
88
import inspect
93
89
 
94
 
if sys.version_info.major == 2:
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
112
 
 
113
 
# Show warnings by default
114
 
if not sys.warnoptions:
115
 
    import warnings
116
 
    warnings.simplefilter("default")
117
 
 
118
90
# Try to find the value of SO_BINDTODEVICE:
119
91
try:
120
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
112
            # No value found
141
113
            SO_BINDTODEVICE = None
142
114
 
143
 
if sys.version_info < (3, 2):
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
145
117
 
146
 
version = "1.8.14"
 
118
version = "1.8.4"
147
119
stored_state_file = "clients.pickle"
148
120
 
149
121
logger = logging.getLogger()
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
122
syslogger = None
152
123
 
153
124
try:
208
179
    pass
209
180
 
210
181
 
211
 
class PGPEngine:
 
182
class PGPEngine(object):
212
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
184
 
214
185
    def __init__(self):
218
189
            output = subprocess.check_output(["gpgconf"])
219
190
            for line in output.splitlines():
220
191
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
192
                if name == "gpg":
222
193
                    self.gpg = path
223
194
                    break
224
195
        except OSError as e:
229
200
                          '--force-mdc',
230
201
                          '--quiet']
231
202
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
204
            self.gnupgargs.append("--no-use-agent")
234
205
 
235
206
    def __enter__(self):
304
275
 
305
276
 
306
277
# Pretend that we have an Avahi module
307
 
class avahi:
 
278
class avahi(object):
308
279
    """This isn't so much a class as it is a module-like namespace."""
309
280
    IF_UNSPEC = -1               # avahi-common/address.h
310
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
344
315
    pass
345
316
 
346
317
 
347
 
class AvahiService:
 
318
class AvahiService(object):
348
319
    """An Avahi (Zeroconf) service.
349
320
 
350
321
    Attributes:
524
495
class AvahiServiceToSyslog(AvahiService):
525
496
    def rename(self, *args, **kwargs):
526
497
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
498
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
499
        syslogger.setFormatter(logging.Formatter(
530
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
501
            .format(self.name)))
533
503
 
534
504
 
535
505
# Pretend that we have a GnuTLS module
536
 
class gnutls:
 
506
class gnutls(object):
537
507
    """This isn't so much a class as it is a module-like namespace."""
538
508
 
539
509
    library = ctypes.util.find_library("gnutls")
602
572
        pass
603
573
 
604
574
    # Classes
605
 
    class Credentials:
 
575
    class Credentials(object):
606
576
        def __init__(self):
607
577
            self._c_object = gnutls.certificate_credentials_t()
608
578
            gnutls.certificate_allocate_credentials(
612
582
        def __del__(self):
613
583
            gnutls.certificate_free_credentials(self._c_object)
614
584
 
615
 
    class ClientSession:
 
585
    class ClientSession(object):
616
586
        def __init__(self, socket, credentials=None):
617
587
            self._c_object = gnutls.session_t()
618
588
            gnutls_flags = gnutls.CLIENT
775
745
 
776
746
        x509_crt_fmt_t = ctypes.c_int
777
747
 
778
 
        # All the function declarations below are from
779
 
        # gnutls/abstract.h
 
748
        # All the function declarations below are from gnutls/abstract.h
780
749
        pubkey_init = _library.gnutls_pubkey_init
781
750
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
782
751
        pubkey_init.restype = _error_code
796
765
        pubkey_deinit.argtypes = [pubkey_t]
797
766
        pubkey_deinit.restype = None
798
767
    else:
799
 
        # All the function declarations below are from
800
 
        # gnutls/openpgp.h
 
768
        # All the function declarations below are from gnutls/openpgp.h
801
769
 
802
770
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
803
771
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
809
777
                                       openpgp_crt_fmt_t]
810
778
        openpgp_crt_import.restype = _error_code
811
779
 
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
 
        ]
 
780
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
781
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
782
                                            ctypes.POINTER(ctypes.c_uint)]
819
783
        openpgp_crt_verify_self.restype = _error_code
820
784
 
821
785
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
850
814
    connection.close()
851
815
 
852
816
 
853
 
class Client:
 
817
class Client(object):
854
818
    """A representation of a client host served by this server.
855
819
 
856
820
    Attributes:
1059
1023
        if self.checker_initiator_tag is not None:
1060
1024
            GLib.source_remove(self.checker_initiator_tag)
1061
1025
        self.checker_initiator_tag = GLib.timeout_add(
1062
 
            random.randrange(int(self.interval.total_seconds() * 1000
1063
 
                                 + 1)),
 
1026
            int(self.interval.total_seconds() * 1000),
1064
1027
            self.start_checker)
1065
1028
        # Schedule a disable() when 'timeout' has passed
1066
1029
        if self.disable_initiator_tag is not None:
1076
1039
        # Read return code from connection (see call_pipe)
1077
1040
        returncode = connection.recv()
1078
1041
        connection.close()
1079
 
        if self.checker is not None:
1080
 
            self.checker.join()
 
1042
        self.checker.join()
1081
1043
        self.checker_callback_tag = None
1082
1044
        self.checker = None
1083
1045
 
1141
1103
        if self.checker is None:
1142
1104
            # Escape attributes for the shell
1143
1105
            escaped_attrs = {
1144
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1106
                attr: re.escape(str(getattr(self, attr)))
1145
1107
                for attr in self.runtime_expansions}
1146
1108
            try:
1147
1109
                command = self.checker_command % escaped_attrs
1174
1136
                kwargs=popen_args)
1175
1137
            self.checker.start()
1176
1138
            self.checker_callback_tag = GLib.io_add_watch(
1177
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1178
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1139
                pipe[0].fileno(), GLib.IO_IN,
1179
1140
                self.checker_callback, pipe[0], command)
1180
1141
        # Re-run this periodically if run by GLib.timeout_add
1181
1142
        return True
1436
1397
                raise ValueError("Byte arrays not supported for non-"
1437
1398
                                 "'ay' signature {!r}"
1438
1399
                                 .format(prop._dbus_signature))
1439
 
            value = dbus.ByteArray(bytes(value))
 
1400
            value = dbus.ByteArray(b''.join(chr(byte)
 
1401
                                            for byte in value))
1440
1402
        prop(value)
1441
1403
 
1442
1404
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2247
2209
    del _interface
2248
2210
 
2249
2211
 
2250
 
class ProxyClient:
 
2212
class ProxyClient(object):
2251
2213
    def __init__(self, child_pipe, key_id, fpr, address):
2252
2214
        self._pipe = child_pipe
2253
2215
        self._pipe.send(('init', key_id, fpr, address))
2475
2437
        buf = ctypes.create_string_buffer(32)
2476
2438
        buf_len = ctypes.c_size_t(len(buf))
2477
2439
        # Get the key ID from the raw public key into the buffer
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))
 
2440
        gnutls.pubkey_get_key_id(pubkey,
 
2441
                                 gnutls.KEYID_USE_SHA256,
 
2442
                                 ctypes.cast(ctypes.byref(buf),
 
2443
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2444
                                 ctypes.byref(buf_len))
2484
2445
        # Deinit the certificate
2485
2446
        gnutls.pubkey_deinit(pubkey)
2486
2447
 
2527
2488
        return hex_fpr
2528
2489
 
2529
2490
 
2530
 
class MultiprocessingMixIn:
 
2491
class MultiprocessingMixIn(object):
2531
2492
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2532
2493
 
2533
2494
    def sub_process_main(self, request, address):
2545
2506
        return proc
2546
2507
 
2547
2508
 
2548
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2509
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2549
2510
    """ adds a pipe to the MixIn """
2550
2511
 
2551
2512
    def process_request(self, request, client_address):
2566
2527
 
2567
2528
 
2568
2529
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2569
 
                     socketserver.TCPServer):
 
2530
                     socketserver.TCPServer, object):
2570
2531
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2571
2532
 
2572
2533
    Attributes:
2705
2666
    def add_pipe(self, parent_pipe, proc):
2706
2667
        # Call "handle_ipc" for both data and EOF events
2707
2668
        GLib.io_add_watch(
2708
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2709
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2669
            parent_pipe.fileno(),
 
2670
            GLib.IO_IN | GLib.IO_HUP,
2710
2671
            functools.partial(self.handle_ipc,
2711
2672
                              parent_pipe=parent_pipe,
2712
2673
                              proc=proc))
2731
2692
            address = request[3]
2732
2693
 
2733
2694
            for c in self.clients.values():
2734
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2735
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2695
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2736
2696
                    continue
2737
2697
                if key_id and c.key_id == key_id:
2738
2698
                    client = c
2751
2711
                return False
2752
2712
 
2753
2713
            GLib.io_add_watch(
2754
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2755
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2714
                parent_pipe.fileno(),
 
2715
                GLib.IO_IN | GLib.IO_HUP,
2756
2716
                functools.partial(self.handle_ipc,
2757
2717
                                  parent_pipe=parent_pipe,
2758
2718
                                  proc=proc,
2773
2733
        if command == 'getattr':
2774
2734
            attrname = request[1]
2775
2735
            if isinstance(client_object.__getattribute__(attrname),
2776
 
                          collections.abc.Callable):
 
2736
                          collections.Callable):
2777
2737
                parent_pipe.send(('function', ))
2778
2738
            else:
2779
2739
                parent_pipe.send((
2790
2750
def rfc3339_duration_to_delta(duration):
2791
2751
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2792
2752
 
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
 
2753
    >>> rfc3339_duration_to_delta("P7D")
 
2754
    datetime.timedelta(7)
 
2755
    >>> rfc3339_duration_to_delta("PT60S")
 
2756
    datetime.timedelta(0, 60)
 
2757
    >>> rfc3339_duration_to_delta("PT60M")
 
2758
    datetime.timedelta(0, 3600)
 
2759
    >>> rfc3339_duration_to_delta("PT24H")
 
2760
    datetime.timedelta(1)
 
2761
    >>> rfc3339_duration_to_delta("P1W")
 
2762
    datetime.timedelta(7)
 
2763
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2764
    datetime.timedelta(0, 330)
 
2765
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2766
    datetime.timedelta(1, 200)
2809
2767
    """
2810
2768
 
2811
2769
    # Parsing an RFC 3339 duration with regular expressions is not
2891
2849
def string_to_delta(interval):
2892
2850
    """Parse a string and return a datetime.timedelta
2893
2851
 
2894
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2895
 
    True
2896
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2897
 
    True
2898
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2899
 
    True
2900
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2901
 
    True
2902
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2903
 
    True
2904
 
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2905
 
    True
 
2852
    >>> string_to_delta('7d')
 
2853
    datetime.timedelta(7)
 
2854
    >>> string_to_delta('60s')
 
2855
    datetime.timedelta(0, 60)
 
2856
    >>> string_to_delta('60m')
 
2857
    datetime.timedelta(0, 3600)
 
2858
    >>> string_to_delta('24h')
 
2859
    datetime.timedelta(1)
 
2860
    >>> string_to_delta('1w')
 
2861
    datetime.timedelta(7)
 
2862
    >>> string_to_delta('5m 30s')
 
2863
    datetime.timedelta(0, 330)
2906
2864
    """
2907
2865
 
2908
2866
    try:
3010
2968
 
3011
2969
    options = parser.parse_args()
3012
2970
 
 
2971
    if options.check:
 
2972
        import doctest
 
2973
        fail_count, test_count = doctest.testmod()
 
2974
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2975
 
3013
2976
    # Default values for config file for server-global settings
3014
2977
    if gnutls.has_rawpk:
3015
2978
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3035
2998
    del priority
3036
2999
 
3037
3000
    # Parse config file for server-global settings
3038
 
    server_config = configparser.ConfigParser(server_defaults)
 
3001
    server_config = configparser.SafeConfigParser(server_defaults)
3039
3002
    del server_defaults
3040
3003
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3041
 
    # Convert the ConfigParser object to a dict
 
3004
    # Convert the SafeConfigParser object to a dict
3042
3005
    server_settings = server_config.defaults()
3043
3006
    # Use the appropriate methods on the non-string config options
3044
3007
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3116
3079
                                  server_settings["servicename"])))
3117
3080
 
3118
3081
    # Parse config file with clients
3119
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3082
    client_config = configparser.SafeConfigParser(Client
 
3083
                                                  .client_defaults)
3120
3084
    client_config.read(os.path.join(server_settings["configdir"],
3121
3085
                                    "clients.conf"))
3122
3086
 
3193
3157
        # Close all input and output, do double fork, etc.
3194
3158
        daemon()
3195
3159
 
3196
 
    if gi.version_info < (3, 10, 2):
3197
 
        # multiprocessing will use threads, so before we use GLib we
3198
 
        # need to inform GLib that threads will be used.
3199
 
        GLib.threads_init()
 
3160
    # multiprocessing will use threads, so before we use GLib we need
 
3161
    # to inform GLib that threads will be used.
 
3162
    GLib.threads_init()
3200
3163
 
3201
3164
    global main_loop
3202
3165
    # From the Avahi example code
3278
3241
                             if isinstance(s, bytes)
3279
3242
                             else s) for s in
3280
3243
                            value["client_structure"]]
3281
 
                        # .name, .host, and .checker_command
3282
 
                        for k in ("name", "host", "checker_command"):
 
3244
                        # .name & .host
 
3245
                        for k in ("name", "host"):
3283
3246
                            if isinstance(value[k], bytes):
3284
3247
                                value[k] = value[k].decode("utf-8")
3285
3248
                        if "key_id" not in value:
3295
3258
                        for key, value in
3296
3259
                        bytes_old_client_settings.items()}
3297
3260
                    del bytes_old_client_settings
3298
 
                    # .host and .checker_command
 
3261
                    # .host
3299
3262
                    for value in old_client_settings.values():
3300
 
                        for attribute in ("host", "checker_command"):
3301
 
                            if isinstance(value[attribute], bytes):
3302
 
                                value[attribute] = (value[attribute]
3303
 
                                                    .decode("utf-8"))
 
3263
                        if isinstance(value["host"], bytes):
 
3264
                            value["host"] = (value["host"]
 
3265
                                             .decode("utf-8"))
3304
3266
            os.remove(stored_state_path)
3305
3267
        except IOError as e:
3306
3268
            if e.errno == errno.ENOENT:
3631
3593
                sys.exit(1)
3632
3594
            # End of Avahi example code
3633
3595
 
3634
 
        GLib.io_add_watch(
3635
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3636
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3637
 
            lambda *args, **kwargs: (tcp_server.handle_request
3638
 
                                     (*args[2:], **kwargs) or True))
 
3596
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3597
                          lambda *args, **kwargs:
 
3598
                          (tcp_server.handle_request
 
3599
                           (*args[2:], **kwargs) or True))
3639
3600
 
3640
3601
        logger.debug("Starting main loop")
3641
3602
        main_loop.run()
3651
3612
    # Must run before the D-Bus bus name gets deregistered
3652
3613
    cleanup()
3653
3614
 
3654
 
 
3655
 
def should_only_run_tests():
3656
 
    parser = argparse.ArgumentParser(add_help=False)
3657
 
    parser.add_argument("--check", action='store_true')
3658
 
    args, unknown_args = parser.parse_known_args()
3659
 
    run_tests = args.check
3660
 
    if run_tests:
3661
 
        # Remove --check argument from sys.argv
3662
 
        sys.argv[1:] = unknown_args
3663
 
    return run_tests
3664
 
 
3665
 
# Add all tests from doctest strings
3666
 
def load_tests(loader, tests, none):
3667
 
    import doctest
3668
 
    tests.addTests(doctest.DocTestSuite())
3669
 
    return tests
3670
3615
 
3671
3616
if __name__ == '__main__':
3672
 
    try:
3673
 
        if should_only_run_tests():
3674
 
            # Call using ./mandos --check [--verbose]
3675
 
            unittest.main()
3676
 
        else:
3677
 
            main()
3678
 
    finally:
3679
 
        logging.shutdown()
 
3617
    main()