/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-08-03 12:40:59 UTC
  • mfrom: (1144 trunk)
  • mto: This revision was merged to the branch mainline in revision 1145.
  • Revision ID: teddy@recompile.se-20190803124059-z12hb7q97uc74ydk
Merge from trunk

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
91
88
import xml.dom.minidom
92
89
import inspect
93
90
 
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
91
# Try to find the value of SO_BINDTODEVICE:
119
92
try:
120
93
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
113
            # No value found
141
114
            SO_BINDTODEVICE = None
142
115
 
 
116
if sys.version_info.major == 2:
 
117
    str = unicode
 
118
 
143
119
if sys.version_info < (3, 2):
144
120
    configparser.Configparser = configparser.SafeConfigParser
145
121
 
146
 
version = "1.8.14"
 
122
version = "1.8.5"
147
123
stored_state_file = "clients.pickle"
148
124
 
149
125
logger = logging.getLogger()
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
126
syslogger = None
152
127
 
153
128
try:
208
183
    pass
209
184
 
210
185
 
211
 
class PGPEngine:
 
186
class PGPEngine(object):
212
187
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
188
 
214
189
    def __init__(self):
218
193
            output = subprocess.check_output(["gpgconf"])
219
194
            for line in output.splitlines():
220
195
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
196
                if name == "gpg":
222
197
                    self.gpg = path
223
198
                    break
224
199
        except OSError as e:
229
204
                          '--force-mdc',
230
205
                          '--quiet']
231
206
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
207
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
208
            self.gnupgargs.append("--no-use-agent")
234
209
 
235
210
    def __enter__(self):
304
279
 
305
280
 
306
281
# Pretend that we have an Avahi module
307
 
class avahi:
 
282
class avahi(object):
308
283
    """This isn't so much a class as it is a module-like namespace."""
309
284
    IF_UNSPEC = -1               # avahi-common/address.h
310
285
    PROTO_UNSPEC = -1            # avahi-common/address.h
344
319
    pass
345
320
 
346
321
 
347
 
class AvahiService:
 
322
class AvahiService(object):
348
323
    """An Avahi (Zeroconf) service.
349
324
 
350
325
    Attributes:
524
499
class AvahiServiceToSyslog(AvahiService):
525
500
    def rename(self, *args, **kwargs):
526
501
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
502
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
503
        syslogger.setFormatter(logging.Formatter(
530
504
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
505
            .format(self.name)))
533
507
 
534
508
 
535
509
# Pretend that we have a GnuTLS module
536
 
class gnutls:
 
510
class gnutls(object):
537
511
    """This isn't so much a class as it is a module-like namespace."""
538
512
 
539
513
    library = ctypes.util.find_library("gnutls")
602
576
        pass
603
577
 
604
578
    # Classes
605
 
    class Credentials:
 
579
    class Credentials(object):
606
580
        def __init__(self):
607
581
            self._c_object = gnutls.certificate_credentials_t()
608
582
            gnutls.certificate_allocate_credentials(
612
586
        def __del__(self):
613
587
            gnutls.certificate_free_credentials(self._c_object)
614
588
 
615
 
    class ClientSession:
 
589
    class ClientSession(object):
616
590
        def __init__(self, socket, credentials=None):
617
591
            self._c_object = gnutls.session_t()
618
592
            gnutls_flags = gnutls.CLIENT
775
749
 
776
750
        x509_crt_fmt_t = ctypes.c_int
777
751
 
778
 
        # All the function declarations below are from
779
 
        # gnutls/abstract.h
 
752
        # All the function declarations below are from gnutls/abstract.h
780
753
        pubkey_init = _library.gnutls_pubkey_init
781
754
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
782
755
        pubkey_init.restype = _error_code
796
769
        pubkey_deinit.argtypes = [pubkey_t]
797
770
        pubkey_deinit.restype = None
798
771
    else:
799
 
        # All the function declarations below are from
800
 
        # gnutls/openpgp.h
 
772
        # All the function declarations below are from gnutls/openpgp.h
801
773
 
802
774
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
803
775
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
809
781
                                       openpgp_crt_fmt_t]
810
782
        openpgp_crt_import.restype = _error_code
811
783
 
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
 
        ]
 
784
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
785
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
786
                                            ctypes.POINTER(ctypes.c_uint)]
819
787
        openpgp_crt_verify_self.restype = _error_code
820
788
 
821
789
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
850
818
    connection.close()
851
819
 
852
820
 
853
 
class Client:
 
821
class Client(object):
854
822
    """A representation of a client host served by this server.
855
823
 
856
824
    Attributes:
1059
1027
        if self.checker_initiator_tag is not None:
1060
1028
            GLib.source_remove(self.checker_initiator_tag)
1061
1029
        self.checker_initiator_tag = GLib.timeout_add(
1062
 
            random.randrange(int(self.interval.total_seconds() * 1000
1063
 
                                 + 1)),
 
1030
            int(self.interval.total_seconds() * 1000),
1064
1031
            self.start_checker)
1065
1032
        # Schedule a disable() when 'timeout' has passed
1066
1033
        if self.disable_initiator_tag is not None:
1076
1043
        # Read return code from connection (see call_pipe)
1077
1044
        returncode = connection.recv()
1078
1045
        connection.close()
1079
 
        if self.checker is not None:
1080
 
            self.checker.join()
 
1046
        self.checker.join()
1081
1047
        self.checker_callback_tag = None
1082
1048
        self.checker = None
1083
1049
 
1141
1107
        if self.checker is None:
1142
1108
            # Escape attributes for the shell
1143
1109
            escaped_attrs = {
1144
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1110
                attr: re.escape(str(getattr(self, attr)))
1145
1111
                for attr in self.runtime_expansions}
1146
1112
            try:
1147
1113
                command = self.checker_command % escaped_attrs
1174
1140
                kwargs=popen_args)
1175
1141
            self.checker.start()
1176
1142
            self.checker_callback_tag = GLib.io_add_watch(
1177
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1178
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1143
                pipe[0].fileno(), GLib.IO_IN,
1179
1144
                self.checker_callback, pipe[0], command)
1180
1145
        # Re-run this periodically if run by GLib.timeout_add
1181
1146
        return True
1436
1401
                raise ValueError("Byte arrays not supported for non-"
1437
1402
                                 "'ay' signature {!r}"
1438
1403
                                 .format(prop._dbus_signature))
1439
 
            value = dbus.ByteArray(bytes(value))
 
1404
            value = dbus.ByteArray(b''.join(chr(byte)
 
1405
                                            for byte in value))
1440
1406
        prop(value)
1441
1407
 
1442
1408
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2247
2213
    del _interface
2248
2214
 
2249
2215
 
2250
 
class ProxyClient:
 
2216
class ProxyClient(object):
2251
2217
    def __init__(self, child_pipe, key_id, fpr, address):
2252
2218
        self._pipe = child_pipe
2253
2219
        self._pipe.send(('init', key_id, fpr, address))
2475
2441
        buf = ctypes.create_string_buffer(32)
2476
2442
        buf_len = ctypes.c_size_t(len(buf))
2477
2443
        # 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))
 
2444
        gnutls.pubkey_get_key_id(pubkey,
 
2445
                                 gnutls.KEYID_USE_SHA256,
 
2446
                                 ctypes.cast(ctypes.byref(buf),
 
2447
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2448
                                 ctypes.byref(buf_len))
2484
2449
        # Deinit the certificate
2485
2450
        gnutls.pubkey_deinit(pubkey)
2486
2451
 
2527
2492
        return hex_fpr
2528
2493
 
2529
2494
 
2530
 
class MultiprocessingMixIn:
 
2495
class MultiprocessingMixIn(object):
2531
2496
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2532
2497
 
2533
2498
    def sub_process_main(self, request, address):
2545
2510
        return proc
2546
2511
 
2547
2512
 
2548
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2513
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2549
2514
    """ adds a pipe to the MixIn """
2550
2515
 
2551
2516
    def process_request(self, request, client_address):
2566
2531
 
2567
2532
 
2568
2533
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2569
 
                     socketserver.TCPServer):
 
2534
                     socketserver.TCPServer, object):
2570
2535
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2571
2536
 
2572
2537
    Attributes:
2705
2670
    def add_pipe(self, parent_pipe, proc):
2706
2671
        # Call "handle_ipc" for both data and EOF events
2707
2672
        GLib.io_add_watch(
2708
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2709
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2673
            parent_pipe.fileno(),
 
2674
            GLib.IO_IN | GLib.IO_HUP,
2710
2675
            functools.partial(self.handle_ipc,
2711
2676
                              parent_pipe=parent_pipe,
2712
2677
                              proc=proc))
2731
2696
            address = request[3]
2732
2697
 
2733
2698
            for c in self.clients.values():
2734
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2735
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2699
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2736
2700
                    continue
2737
2701
                if key_id and c.key_id == key_id:
2738
2702
                    client = c
2751
2715
                return False
2752
2716
 
2753
2717
            GLib.io_add_watch(
2754
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2755
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2718
                parent_pipe.fileno(),
 
2719
                GLib.IO_IN | GLib.IO_HUP,
2756
2720
                functools.partial(self.handle_ipc,
2757
2721
                                  parent_pipe=parent_pipe,
2758
2722
                                  proc=proc,
2773
2737
        if command == 'getattr':
2774
2738
            attrname = request[1]
2775
2739
            if isinstance(client_object.__getattribute__(attrname),
2776
 
                          collections.abc.Callable):
 
2740
                          collections.Callable):
2777
2741
                parent_pipe.send(('function', ))
2778
2742
            else:
2779
2743
                parent_pipe.send((
2790
2754
def rfc3339_duration_to_delta(duration):
2791
2755
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2792
2756
 
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
 
2757
    >>> rfc3339_duration_to_delta("P7D")
 
2758
    datetime.timedelta(7)
 
2759
    >>> rfc3339_duration_to_delta("PT60S")
 
2760
    datetime.timedelta(0, 60)
 
2761
    >>> rfc3339_duration_to_delta("PT60M")
 
2762
    datetime.timedelta(0, 3600)
 
2763
    >>> rfc3339_duration_to_delta("PT24H")
 
2764
    datetime.timedelta(1)
 
2765
    >>> rfc3339_duration_to_delta("P1W")
 
2766
    datetime.timedelta(7)
 
2767
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2768
    datetime.timedelta(0, 330)
 
2769
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2770
    datetime.timedelta(1, 200)
2809
2771
    """
2810
2772
 
2811
2773
    # Parsing an RFC 3339 duration with regular expressions is not
2891
2853
def string_to_delta(interval):
2892
2854
    """Parse a string and return a datetime.timedelta
2893
2855
 
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
 
2856
    >>> string_to_delta('7d')
 
2857
    datetime.timedelta(7)
 
2858
    >>> string_to_delta('60s')
 
2859
    datetime.timedelta(0, 60)
 
2860
    >>> string_to_delta('60m')
 
2861
    datetime.timedelta(0, 3600)
 
2862
    >>> string_to_delta('24h')
 
2863
    datetime.timedelta(1)
 
2864
    >>> string_to_delta('1w')
 
2865
    datetime.timedelta(7)
 
2866
    >>> string_to_delta('5m 30s')
 
2867
    datetime.timedelta(0, 330)
2906
2868
    """
2907
2869
 
2908
2870
    try:
3010
2972
 
3011
2973
    options = parser.parse_args()
3012
2974
 
 
2975
    if options.check:
 
2976
        import doctest
 
2977
        fail_count, test_count = doctest.testmod()
 
2978
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2979
 
3013
2980
    # Default values for config file for server-global settings
3014
2981
    if gnutls.has_rawpk:
3015
2982
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3278
3245
                             if isinstance(s, bytes)
3279
3246
                             else s) for s in
3280
3247
                            value["client_structure"]]
3281
 
                        # .name, .host, and .checker_command
3282
 
                        for k in ("name", "host", "checker_command"):
 
3248
                        # .name & .host
 
3249
                        for k in ("name", "host"):
3283
3250
                            if isinstance(value[k], bytes):
3284
3251
                                value[k] = value[k].decode("utf-8")
3285
3252
                        if "key_id" not in value:
3295
3262
                        for key, value in
3296
3263
                        bytes_old_client_settings.items()}
3297
3264
                    del bytes_old_client_settings
3298
 
                    # .host and .checker_command
 
3265
                    # .host
3299
3266
                    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"))
 
3267
                        if isinstance(value["host"], bytes):
 
3268
                            value["host"] = (value["host"]
 
3269
                                             .decode("utf-8"))
3304
3270
            os.remove(stored_state_path)
3305
3271
        except IOError as e:
3306
3272
            if e.errno == errno.ENOENT:
3631
3597
                sys.exit(1)
3632
3598
            # End of Avahi example code
3633
3599
 
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))
 
3600
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3601
                          lambda *args, **kwargs:
 
3602
                          (tcp_server.handle_request
 
3603
                           (*args[2:], **kwargs) or True))
3639
3604
 
3640
3605
        logger.debug("Starting main loop")
3641
3606
        main_loop.run()
3651
3616
    # Must run before the D-Bus bus name gets deregistered
3652
3617
    cleanup()
3653
3618
 
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
3619
 
3671
3620
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()
 
3621
    main()