/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: 2019-07-25 21:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190725214240-31i9qehf60xb8yu4
Use hexadecimal unicode character references, not decimal

* mandos-options.xml (priority): Use "​" instead of "​"
  to make it slightly more clear that ZERO WIDTH SPACE is intended.

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
#
77
77
import itertools
78
78
import collections
79
79
import codecs
80
 
import unittest
81
 
import random
82
80
 
83
81
import dbus
84
82
import dbus.service
85
 
import gi
86
83
from gi.repository import GLib
87
84
from dbus.mainloop.glib import DBusGMainLoop
88
85
import ctypes
90
87
import xml.dom.minidom
91
88
import inspect
92
89
 
93
 
if sys.version_info.major == 2:
94
 
    __metaclass__ = type
95
 
    str = unicode
96
 
 
97
 
# Add collections.abc.Callable if it does not exist
98
 
try:
99
 
    collections.abc.Callable
100
 
except AttributeError:
101
 
    class abc:
102
 
        Callable = collections.Callable
103
 
    collections.abc = abc
104
 
    del abc
105
 
 
106
 
# Show warnings by default
107
 
if not sys.warnoptions:
108
 
    import warnings
109
 
    warnings.simplefilter("default")
110
 
 
111
90
# Try to find the value of SO_BINDTODEVICE:
112
91
try:
113
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
133
112
            # No value found
134
113
            SO_BINDTODEVICE = None
135
114
 
136
 
if sys.version_info < (3, 2):
137
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
138
117
 
139
 
version = "1.8.9"
 
118
version = "1.8.4"
140
119
stored_state_file = "clients.pickle"
141
120
 
142
121
logger = logging.getLogger()
143
 
logging.captureWarnings(True)   # Show warnings via the logging system
144
122
syslogger = None
145
123
 
146
124
try:
201
179
    pass
202
180
 
203
181
 
204
 
class PGPEngine:
 
182
class PGPEngine(object):
205
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
206
184
 
207
185
    def __init__(self):
211
189
            output = subprocess.check_output(["gpgconf"])
212
190
            for line in output.splitlines():
213
191
                name, text, path = line.split(b":")
214
 
                if name == b"gpg":
 
192
                if name == "gpg":
215
193
                    self.gpg = path
216
194
                    break
217
195
        except OSError as e:
222
200
                          '--force-mdc',
223
201
                          '--quiet']
224
202
        # Only GPG version 1 has the --no-use-agent option.
225
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
226
204
            self.gnupgargs.append("--no-use-agent")
227
205
 
228
206
    def __enter__(self):
297
275
 
298
276
 
299
277
# Pretend that we have an Avahi module
300
 
class avahi:
 
278
class avahi(object):
301
279
    """This isn't so much a class as it is a module-like namespace."""
302
280
    IF_UNSPEC = -1               # avahi-common/address.h
303
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
337
315
    pass
338
316
 
339
317
 
340
 
class AvahiService:
 
318
class AvahiService(object):
341
319
    """An Avahi (Zeroconf) service.
342
320
 
343
321
    Attributes:
525
503
 
526
504
 
527
505
# Pretend that we have a GnuTLS module
528
 
class gnutls:
 
506
class gnutls(object):
529
507
    """This isn't so much a class as it is a module-like namespace."""
530
508
 
531
509
    library = ctypes.util.find_library("gnutls")
594
572
        pass
595
573
 
596
574
    # Classes
597
 
    class Credentials:
 
575
    class Credentials(object):
598
576
        def __init__(self):
599
577
            self._c_object = gnutls.certificate_credentials_t()
600
578
            gnutls.certificate_allocate_credentials(
604
582
        def __del__(self):
605
583
            gnutls.certificate_free_credentials(self._c_object)
606
584
 
607
 
    class ClientSession:
 
585
    class ClientSession(object):
608
586
        def __init__(self, socket, credentials=None):
609
587
            self._c_object = gnutls.session_t()
610
588
            gnutls_flags = gnutls.CLIENT
611
 
            if gnutls.check_version(b"3.5.6"):
 
589
            if gnutls.check_version("3.5.6"):
612
590
                gnutls_flags |= gnutls.NO_TICKETS
613
591
            if gnutls.has_rawpk:
614
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
816
794
                                                    ctypes.c_size_t)]
817
795
        openpgp_crt_get_fingerprint.restype = _error_code
818
796
 
819
 
    if check_version(b"3.6.4"):
 
797
    if check_version("3.6.4"):
820
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
821
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
822
800
        certificate_type_get2.restype = _error_code
836
814
    connection.close()
837
815
 
838
816
 
839
 
class Client:
 
817
class Client(object):
840
818
    """A representation of a client host served by this server.
841
819
 
842
820
    Attributes:
843
821
    approved:   bool(); 'None' if not yet approved/disapproved
844
822
    approval_delay: datetime.timedelta(); Time to wait for approval
845
823
    approval_duration: datetime.timedelta(); Duration of one approval
846
 
    checker: multiprocessing.Process(); a running checker process used
847
 
             to see if the client lives. 'None' if no process is
848
 
             running.
 
824
    checker:    subprocess.Popen(); a running checker process used
 
825
                                    to see if the client lives.
 
826
                                    'None' if no process is running.
849
827
    checker_callback_tag: a GLib event source tag, or None
850
828
    checker_command: string; External command which is run to check
851
829
                     if client lives.  %() expansions are done at
1045
1023
        if self.checker_initiator_tag is not None:
1046
1024
            GLib.source_remove(self.checker_initiator_tag)
1047
1025
        self.checker_initiator_tag = GLib.timeout_add(
1048
 
            random.randrange(int(self.interval.total_seconds() * 1000
1049
 
                                 + 1)),
 
1026
            int(self.interval.total_seconds() * 1000),
1050
1027
            self.start_checker)
1051
1028
        # Schedule a disable() when 'timeout' has passed
1052
1029
        if self.disable_initiator_tag is not None:
1059
1036
    def checker_callback(self, source, condition, connection,
1060
1037
                         command):
1061
1038
        """The checker has completed, so take appropriate actions."""
 
1039
        self.checker_callback_tag = None
 
1040
        self.checker = None
1062
1041
        # Read return code from connection (see call_pipe)
1063
1042
        returncode = connection.recv()
1064
1043
        connection.close()
1065
 
        if self.checker is not None:
1066
 
            self.checker.join()
1067
 
        self.checker_callback_tag = None
1068
 
        self.checker = None
1069
1044
 
1070
1045
        if returncode >= 0:
1071
1046
            self.last_checker_status = returncode
1160
1135
                kwargs=popen_args)
1161
1136
            self.checker.start()
1162
1137
            self.checker_callback_tag = GLib.io_add_watch(
1163
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1164
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1138
                pipe[0].fileno(), GLib.IO_IN,
1165
1139
                self.checker_callback, pipe[0], command)
1166
1140
        # Re-run this periodically if run by GLib.timeout_add
1167
1141
        return True
1422
1396
                raise ValueError("Byte arrays not supported for non-"
1423
1397
                                 "'ay' signature {!r}"
1424
1398
                                 .format(prop._dbus_signature))
1425
 
            value = dbus.ByteArray(bytes(value))
 
1399
            value = dbus.ByteArray(b''.join(chr(byte)
 
1400
                                            for byte in value))
1426
1401
        prop(value)
1427
1402
 
1428
1403
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2233
2208
    del _interface
2234
2209
 
2235
2210
 
2236
 
class ProxyClient:
 
2211
class ProxyClient(object):
2237
2212
    def __init__(self, child_pipe, key_id, fpr, address):
2238
2213
        self._pipe = child_pipe
2239
2214
        self._pipe.send(('init', key_id, fpr, address))
2312
2287
            approval_required = False
2313
2288
            try:
2314
2289
                if gnutls.has_rawpk:
2315
 
                    fpr = b""
 
2290
                    fpr = ""
2316
2291
                    try:
2317
2292
                        key_id = self.key_id(
2318
2293
                            self.peer_certificate(session))
2322
2297
                    logger.debug("Key ID: %s", key_id)
2323
2298
 
2324
2299
                else:
2325
 
                    key_id = b""
 
2300
                    key_id = ""
2326
2301
                    try:
2327
2302
                        fpr = self.fingerprint(
2328
2303
                            self.peer_certificate(session))
2512
2487
        return hex_fpr
2513
2488
 
2514
2489
 
2515
 
class MultiprocessingMixIn:
 
2490
class MultiprocessingMixIn(object):
2516
2491
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2517
2492
 
2518
2493
    def sub_process_main(self, request, address):
2530
2505
        return proc
2531
2506
 
2532
2507
 
2533
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2534
2509
    """ adds a pipe to the MixIn """
2535
2510
 
2536
2511
    def process_request(self, request, client_address):
2551
2526
 
2552
2527
 
2553
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2554
 
                     socketserver.TCPServer):
 
2529
                     socketserver.TCPServer, object):
2555
2530
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2556
2531
 
2557
2532
    Attributes:
2690
2665
    def add_pipe(self, parent_pipe, proc):
2691
2666
        # Call "handle_ipc" for both data and EOF events
2692
2667
        GLib.io_add_watch(
2693
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2694
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2668
            parent_pipe.fileno(),
 
2669
            GLib.IO_IN | GLib.IO_HUP,
2695
2670
            functools.partial(self.handle_ipc,
2696
2671
                              parent_pipe=parent_pipe,
2697
2672
                              proc=proc))
2735
2710
                return False
2736
2711
 
2737
2712
            GLib.io_add_watch(
2738
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2739
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2713
                parent_pipe.fileno(),
 
2714
                GLib.IO_IN | GLib.IO_HUP,
2740
2715
                functools.partial(self.handle_ipc,
2741
2716
                                  parent_pipe=parent_pipe,
2742
2717
                                  proc=proc,
2757
2732
        if command == 'getattr':
2758
2733
            attrname = request[1]
2759
2734
            if isinstance(client_object.__getattribute__(attrname),
2760
 
                          collections.abc.Callable):
 
2735
                          collections.Callable):
2761
2736
                parent_pipe.send(('function', ))
2762
2737
            else:
2763
2738
                parent_pipe.send((
2774
2749
def rfc3339_duration_to_delta(duration):
2775
2750
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2776
2751
 
2777
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2778
 
    True
2779
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2780
 
    True
2781
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2782
 
    True
2783
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2784
 
    True
2785
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2786
 
    True
2787
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2788
 
    True
2789
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2790
 
    True
 
2752
    >>> rfc3339_duration_to_delta("P7D")
 
2753
    datetime.timedelta(7)
 
2754
    >>> rfc3339_duration_to_delta("PT60S")
 
2755
    datetime.timedelta(0, 60)
 
2756
    >>> rfc3339_duration_to_delta("PT60M")
 
2757
    datetime.timedelta(0, 3600)
 
2758
    >>> rfc3339_duration_to_delta("PT24H")
 
2759
    datetime.timedelta(1)
 
2760
    >>> rfc3339_duration_to_delta("P1W")
 
2761
    datetime.timedelta(7)
 
2762
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2763
    datetime.timedelta(0, 330)
 
2764
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2765
    datetime.timedelta(1, 200)
2791
2766
    """
2792
2767
 
2793
2768
    # Parsing an RFC 3339 duration with regular expressions is not
2873
2848
def string_to_delta(interval):
2874
2849
    """Parse a string and return a datetime.timedelta
2875
2850
 
2876
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2877
 
    True
2878
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2879
 
    True
2880
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2881
 
    True
2882
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2883
 
    True
2884
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2885
 
    True
2886
 
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2887
 
    True
 
2851
    >>> string_to_delta('7d')
 
2852
    datetime.timedelta(7)
 
2853
    >>> string_to_delta('60s')
 
2854
    datetime.timedelta(0, 60)
 
2855
    >>> string_to_delta('60m')
 
2856
    datetime.timedelta(0, 3600)
 
2857
    >>> string_to_delta('24h')
 
2858
    datetime.timedelta(1)
 
2859
    >>> string_to_delta('1w')
 
2860
    datetime.timedelta(7)
 
2861
    >>> string_to_delta('5m 30s')
 
2862
    datetime.timedelta(0, 330)
2888
2863
    """
2889
2864
 
2890
2865
    try:
2992
2967
 
2993
2968
    options = parser.parse_args()
2994
2969
 
 
2970
    if options.check:
 
2971
        import doctest
 
2972
        fail_count, test_count = doctest.testmod()
 
2973
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2974
 
2995
2975
    # Default values for config file for server-global settings
2996
2976
    if gnutls.has_rawpk:
2997
2977
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3017
2997
    del priority
3018
2998
 
3019
2999
    # Parse config file for server-global settings
3020
 
    server_config = configparser.ConfigParser(server_defaults)
 
3000
    server_config = configparser.SafeConfigParser(server_defaults)
3021
3001
    del server_defaults
3022
3002
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3023
 
    # Convert the ConfigParser object to a dict
 
3003
    # Convert the SafeConfigParser object to a dict
3024
3004
    server_settings = server_config.defaults()
3025
3005
    # Use the appropriate methods on the non-string config options
3026
3006
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3098
3078
                                  server_settings["servicename"])))
3099
3079
 
3100
3080
    # Parse config file with clients
3101
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3081
    client_config = configparser.SafeConfigParser(Client
 
3082
                                                  .client_defaults)
3102
3083
    client_config.read(os.path.join(server_settings["configdir"],
3103
3084
                                    "clients.conf"))
3104
3085
 
3175
3156
        # Close all input and output, do double fork, etc.
3176
3157
        daemon()
3177
3158
 
3178
 
    if gi.version_info < (3, 10, 2):
3179
 
        # multiprocessing will use threads, so before we use GLib we
3180
 
        # need to inform GLib that threads will be used.
3181
 
        GLib.threads_init()
 
3159
    # multiprocessing will use threads, so before we use GLib we need
 
3160
    # to inform GLib that threads will be used.
 
3161
    GLib.threads_init()
3182
3162
 
3183
3163
    global main_loop
3184
3164
    # From the Avahi example code
3260
3240
                             if isinstance(s, bytes)
3261
3241
                             else s) for s in
3262
3242
                            value["client_structure"]]
3263
 
                        # .name, .host, and .checker_command
3264
 
                        for k in ("name", "host", "checker_command"):
 
3243
                        # .name & .host
 
3244
                        for k in ("name", "host"):
3265
3245
                            if isinstance(value[k], bytes):
3266
3246
                                value[k] = value[k].decode("utf-8")
3267
 
                        if "key_id" not in value:
 
3247
                        if not value.has_key("key_id"):
3268
3248
                            value["key_id"] = ""
3269
 
                        elif "fingerprint" not in value:
 
3249
                        elif not value.has_key("fingerprint"):
3270
3250
                            value["fingerprint"] = ""
3271
3251
                    #  old_client_settings
3272
3252
                    # .keys()
3277
3257
                        for key, value in
3278
3258
                        bytes_old_client_settings.items()}
3279
3259
                    del bytes_old_client_settings
3280
 
                    # .host and .checker_command
 
3260
                    # .host
3281
3261
                    for value in old_client_settings.values():
3282
 
                        for attribute in ("host", "checker_command"):
3283
 
                            if isinstance(value[attribute], bytes):
3284
 
                                value[attribute] = (value[attribute]
3285
 
                                                    .decode("utf-8"))
 
3262
                        if isinstance(value["host"], bytes):
 
3263
                            value["host"] = (value["host"]
 
3264
                                             .decode("utf-8"))
3286
3265
            os.remove(stored_state_path)
3287
3266
        except IOError as e:
3288
3267
            if e.errno == errno.ENOENT:
3613
3592
                sys.exit(1)
3614
3593
            # End of Avahi example code
3615
3594
 
3616
 
        GLib.io_add_watch(
3617
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3618
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3619
 
            lambda *args, **kwargs: (tcp_server.handle_request
3620
 
                                     (*args[2:], **kwargs) or True))
 
3595
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3596
                          lambda *args, **kwargs:
 
3597
                          (tcp_server.handle_request
 
3598
                           (*args[2:], **kwargs) or True))
3621
3599
 
3622
3600
        logger.debug("Starting main loop")
3623
3601
        main_loop.run()
3633
3611
    # Must run before the D-Bus bus name gets deregistered
3634
3612
    cleanup()
3635
3613
 
3636
 
 
3637
 
def should_only_run_tests():
3638
 
    parser = argparse.ArgumentParser(add_help=False)
3639
 
    parser.add_argument("--check", action='store_true')
3640
 
    args, unknown_args = parser.parse_known_args()
3641
 
    run_tests = args.check
3642
 
    if run_tests:
3643
 
        # Remove --check argument from sys.argv
3644
 
        sys.argv[1:] = unknown_args
3645
 
    return run_tests
3646
 
 
3647
 
# Add all tests from doctest strings
3648
 
def load_tests(loader, tests, none):
3649
 
    import doctest
3650
 
    tests.addTests(doctest.DocTestSuite())
3651
 
    return tests
3652
3614
 
3653
3615
if __name__ == '__main__':
3654
 
    try:
3655
 
        if should_only_run_tests():
3656
 
            # Call using ./mandos --check [--verbose]
3657
 
            unittest.main()
3658
 
        else:
3659
 
            main()
3660
 
    finally:
3661
 
        logging.shutdown()
 
3616
    main()