/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-07 20:50:21 UTC
  • Revision ID: teddy@recompile.se-20190707205021-t1yscpsoobk2v29f
plugin-runner.c: Use a statement attribute only for GCC 7 or later.

* plugin-runner.c (main/parse_opt): Use __attribute__((fallthrough))
                                    only on GCC 7 or later; otherwise
                                    use the old comment syntax.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
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
 
# Show warnings by default
98
 
if not sys.warnoptions:
99
 
    import warnings
100
 
    warnings.simplefilter("default")
101
 
 
102
90
# Try to find the value of SO_BINDTODEVICE:
103
91
try:
104
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
124
112
            # No value found
125
113
            SO_BINDTODEVICE = None
126
114
 
127
 
if sys.version_info < (3, 2):
128
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
129
117
 
130
 
version = "1.8.9"
 
118
version = "1.8.4"
131
119
stored_state_file = "clients.pickle"
132
120
 
133
121
logger = logging.getLogger()
134
 
logging.captureWarnings(True)   # Show warnings via the logging system
135
122
syslogger = None
136
123
 
137
124
try:
192
179
    pass
193
180
 
194
181
 
195
 
class PGPEngine:
 
182
class PGPEngine(object):
196
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
197
184
 
198
185
    def __init__(self):
202
189
            output = subprocess.check_output(["gpgconf"])
203
190
            for line in output.splitlines():
204
191
                name, text, path = line.split(b":")
205
 
                if name == b"gpg":
 
192
                if name == "gpg":
206
193
                    self.gpg = path
207
194
                    break
208
195
        except OSError as e:
213
200
                          '--force-mdc',
214
201
                          '--quiet']
215
202
        # Only GPG version 1 has the --no-use-agent option.
216
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
217
204
            self.gnupgargs.append("--no-use-agent")
218
205
 
219
206
    def __enter__(self):
288
275
 
289
276
 
290
277
# Pretend that we have an Avahi module
291
 
class avahi:
 
278
class avahi(object):
292
279
    """This isn't so much a class as it is a module-like namespace."""
293
280
    IF_UNSPEC = -1               # avahi-common/address.h
294
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
328
315
    pass
329
316
 
330
317
 
331
 
class AvahiService:
 
318
class AvahiService(object):
332
319
    """An Avahi (Zeroconf) service.
333
320
 
334
321
    Attributes:
516
503
 
517
504
 
518
505
# Pretend that we have a GnuTLS module
519
 
class gnutls:
 
506
class gnutls(object):
520
507
    """This isn't so much a class as it is a module-like namespace."""
521
508
 
522
509
    library = ctypes.util.find_library("gnutls")
585
572
        pass
586
573
 
587
574
    # Classes
588
 
    class Credentials:
 
575
    class Credentials(object):
589
576
        def __init__(self):
590
577
            self._c_object = gnutls.certificate_credentials_t()
591
578
            gnutls.certificate_allocate_credentials(
595
582
        def __del__(self):
596
583
            gnutls.certificate_free_credentials(self._c_object)
597
584
 
598
 
    class ClientSession:
 
585
    class ClientSession(object):
599
586
        def __init__(self, socket, credentials=None):
600
587
            self._c_object = gnutls.session_t()
601
588
            gnutls_flags = gnutls.CLIENT
602
 
            if gnutls.check_version(b"3.5.6"):
 
589
            if gnutls.check_version("3.5.6"):
603
590
                gnutls_flags |= gnutls.NO_TICKETS
604
591
            if gnutls.has_rawpk:
605
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
807
794
                                                    ctypes.c_size_t)]
808
795
        openpgp_crt_get_fingerprint.restype = _error_code
809
796
 
810
 
    if check_version(b"3.6.4"):
 
797
    if check_version("3.6.4"):
811
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
812
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
813
800
        certificate_type_get2.restype = _error_code
827
814
    connection.close()
828
815
 
829
816
 
830
 
class Client:
 
817
class Client(object):
831
818
    """A representation of a client host served by this server.
832
819
 
833
820
    Attributes:
834
821
    approved:   bool(); 'None' if not yet approved/disapproved
835
822
    approval_delay: datetime.timedelta(); Time to wait for approval
836
823
    approval_duration: datetime.timedelta(); Duration of one approval
837
 
    checker: multiprocessing.Process(); a running checker process used
838
 
             to see if the client lives. 'None' if no process is
839
 
             running.
 
824
    checker:    subprocess.Popen(); a running checker process used
 
825
                                    to see if the client lives.
 
826
                                    'None' if no process is running.
840
827
    checker_callback_tag: a GLib event source tag, or None
841
828
    checker_command: string; External command which is run to check
842
829
                     if client lives.  %() expansions are done at
1036
1023
        if self.checker_initiator_tag is not None:
1037
1024
            GLib.source_remove(self.checker_initiator_tag)
1038
1025
        self.checker_initiator_tag = GLib.timeout_add(
1039
 
            random.randrange(int(self.interval.total_seconds() * 1000
1040
 
                                 + 1)),
 
1026
            int(self.interval.total_seconds() * 1000),
1041
1027
            self.start_checker)
1042
1028
        # Schedule a disable() when 'timeout' has passed
1043
1029
        if self.disable_initiator_tag is not None:
1050
1036
    def checker_callback(self, source, condition, connection,
1051
1037
                         command):
1052
1038
        """The checker has completed, so take appropriate actions."""
 
1039
        self.checker_callback_tag = None
 
1040
        self.checker = None
1053
1041
        # Read return code from connection (see call_pipe)
1054
1042
        returncode = connection.recv()
1055
1043
        connection.close()
1056
 
        if self.checker is not None:
1057
 
            self.checker.join()
1058
 
        self.checker_callback_tag = None
1059
 
        self.checker = None
1060
1044
 
1061
1045
        if returncode >= 0:
1062
1046
            self.last_checker_status = returncode
1151
1135
                kwargs=popen_args)
1152
1136
            self.checker.start()
1153
1137
            self.checker_callback_tag = GLib.io_add_watch(
1154
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1155
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1138
                pipe[0].fileno(), GLib.IO_IN,
1156
1139
                self.checker_callback, pipe[0], command)
1157
1140
        # Re-run this periodically if run by GLib.timeout_add
1158
1141
        return True
1413
1396
                raise ValueError("Byte arrays not supported for non-"
1414
1397
                                 "'ay' signature {!r}"
1415
1398
                                 .format(prop._dbus_signature))
1416
 
            value = dbus.ByteArray(bytes(value))
 
1399
            value = dbus.ByteArray(b''.join(chr(byte)
 
1400
                                            for byte in value))
1417
1401
        prop(value)
1418
1402
 
1419
1403
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2224
2208
    del _interface
2225
2209
 
2226
2210
 
2227
 
class ProxyClient:
 
2211
class ProxyClient(object):
2228
2212
    def __init__(self, child_pipe, key_id, fpr, address):
2229
2213
        self._pipe = child_pipe
2230
2214
        self._pipe.send(('init', key_id, fpr, address))
2303
2287
            approval_required = False
2304
2288
            try:
2305
2289
                if gnutls.has_rawpk:
2306
 
                    fpr = b""
 
2290
                    fpr = ""
2307
2291
                    try:
2308
2292
                        key_id = self.key_id(
2309
2293
                            self.peer_certificate(session))
2313
2297
                    logger.debug("Key ID: %s", key_id)
2314
2298
 
2315
2299
                else:
2316
 
                    key_id = b""
 
2300
                    key_id = ""
2317
2301
                    try:
2318
2302
                        fpr = self.fingerprint(
2319
2303
                            self.peer_certificate(session))
2503
2487
        return hex_fpr
2504
2488
 
2505
2489
 
2506
 
class MultiprocessingMixIn:
 
2490
class MultiprocessingMixIn(object):
2507
2491
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2508
2492
 
2509
2493
    def sub_process_main(self, request, address):
2521
2505
        return proc
2522
2506
 
2523
2507
 
2524
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2525
2509
    """ adds a pipe to the MixIn """
2526
2510
 
2527
2511
    def process_request(self, request, client_address):
2542
2526
 
2543
2527
 
2544
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2545
 
                     socketserver.TCPServer):
 
2529
                     socketserver.TCPServer, object):
2546
2530
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2547
2531
 
2548
2532
    Attributes:
2621
2605
                    raise
2622
2606
        # Only bind(2) the socket if we really need to.
2623
2607
        if self.server_address[0] or self.server_address[1]:
2624
 
            if self.server_address[1]:
2625
 
                self.allow_reuse_address = True
2626
2608
            if not self.server_address[0]:
2627
2609
                if self.address_family == socket.AF_INET6:
2628
2610
                    any_address = "::"  # in6addr_any
2681
2663
    def add_pipe(self, parent_pipe, proc):
2682
2664
        # Call "handle_ipc" for both data and EOF events
2683
2665
        GLib.io_add_watch(
2684
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2666
            parent_pipe.fileno(),
 
2667
            GLib.IO_IN | GLib.IO_HUP,
2686
2668
            functools.partial(self.handle_ipc,
2687
2669
                              parent_pipe=parent_pipe,
2688
2670
                              proc=proc))
2726
2708
                return False
2727
2709
 
2728
2710
            GLib.io_add_watch(
2729
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2711
                parent_pipe.fileno(),
 
2712
                GLib.IO_IN | GLib.IO_HUP,
2731
2713
                functools.partial(self.handle_ipc,
2732
2714
                                  parent_pipe=parent_pipe,
2733
2715
                                  proc=proc,
2765
2747
def rfc3339_duration_to_delta(duration):
2766
2748
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2767
2749
 
2768
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2769
 
    True
2770
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2771
 
    True
2772
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2773
 
    True
2774
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2775
 
    True
2776
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2777
 
    True
2778
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2779
 
    True
2780
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2781
 
    True
 
2750
    >>> rfc3339_duration_to_delta("P7D")
 
2751
    datetime.timedelta(7)
 
2752
    >>> rfc3339_duration_to_delta("PT60S")
 
2753
    datetime.timedelta(0, 60)
 
2754
    >>> rfc3339_duration_to_delta("PT60M")
 
2755
    datetime.timedelta(0, 3600)
 
2756
    >>> rfc3339_duration_to_delta("PT24H")
 
2757
    datetime.timedelta(1)
 
2758
    >>> rfc3339_duration_to_delta("P1W")
 
2759
    datetime.timedelta(7)
 
2760
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2761
    datetime.timedelta(0, 330)
 
2762
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2763
    datetime.timedelta(1, 200)
2782
2764
    """
2783
2765
 
2784
2766
    # Parsing an RFC 3339 duration with regular expressions is not
2864
2846
def string_to_delta(interval):
2865
2847
    """Parse a string and return a datetime.timedelta
2866
2848
 
2867
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2868
 
    True
2869
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2870
 
    True
2871
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2872
 
    True
2873
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2874
 
    True
2875
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2876
 
    True
2877
 
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2878
 
    True
 
2849
    >>> string_to_delta('7d')
 
2850
    datetime.timedelta(7)
 
2851
    >>> string_to_delta('60s')
 
2852
    datetime.timedelta(0, 60)
 
2853
    >>> string_to_delta('60m')
 
2854
    datetime.timedelta(0, 3600)
 
2855
    >>> string_to_delta('24h')
 
2856
    datetime.timedelta(1)
 
2857
    >>> string_to_delta('1w')
 
2858
    datetime.timedelta(7)
 
2859
    >>> string_to_delta('5m 30s')
 
2860
    datetime.timedelta(0, 330)
2879
2861
    """
2880
2862
 
2881
2863
    try:
2983
2965
 
2984
2966
    options = parser.parse_args()
2985
2967
 
 
2968
    if options.check:
 
2969
        import doctest
 
2970
        fail_count, test_count = doctest.testmod()
 
2971
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2972
 
2986
2973
    # Default values for config file for server-global settings
2987
2974
    if gnutls.has_rawpk:
2988
2975
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3008
2995
    del priority
3009
2996
 
3010
2997
    # Parse config file for server-global settings
3011
 
    server_config = configparser.ConfigParser(server_defaults)
 
2998
    server_config = configparser.SafeConfigParser(server_defaults)
3012
2999
    del server_defaults
3013
3000
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3014
 
    # Convert the ConfigParser object to a dict
 
3001
    # Convert the SafeConfigParser object to a dict
3015
3002
    server_settings = server_config.defaults()
3016
3003
    # Use the appropriate methods on the non-string config options
3017
3004
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3089
3076
                                  server_settings["servicename"])))
3090
3077
 
3091
3078
    # Parse config file with clients
3092
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3079
    client_config = configparser.SafeConfigParser(Client
 
3080
                                                  .client_defaults)
3093
3081
    client_config.read(os.path.join(server_settings["configdir"],
3094
3082
                                    "clients.conf"))
3095
3083
 
3166
3154
        # Close all input and output, do double fork, etc.
3167
3155
        daemon()
3168
3156
 
3169
 
    if gi.version_info < (3, 10, 2):
3170
 
        # multiprocessing will use threads, so before we use GLib we
3171
 
        # need to inform GLib that threads will be used.
3172
 
        GLib.threads_init()
 
3157
    # multiprocessing will use threads, so before we use GLib we need
 
3158
    # to inform GLib that threads will be used.
 
3159
    GLib.threads_init()
3173
3160
 
3174
3161
    global main_loop
3175
3162
    # From the Avahi example code
3251
3238
                             if isinstance(s, bytes)
3252
3239
                             else s) for s in
3253
3240
                            value["client_structure"]]
3254
 
                        # .name, .host, and .checker_command
3255
 
                        for k in ("name", "host", "checker_command"):
 
3241
                        # .name & .host
 
3242
                        for k in ("name", "host"):
3256
3243
                            if isinstance(value[k], bytes):
3257
3244
                                value[k] = value[k].decode("utf-8")
3258
 
                        if "key_id" not in value:
 
3245
                        if not value.has_key("key_id"):
3259
3246
                            value["key_id"] = ""
3260
 
                        elif "fingerprint" not in value:
 
3247
                        elif not value.has_key("fingerprint"):
3261
3248
                            value["fingerprint"] = ""
3262
3249
                    #  old_client_settings
3263
3250
                    # .keys()
3268
3255
                        for key, value in
3269
3256
                        bytes_old_client_settings.items()}
3270
3257
                    del bytes_old_client_settings
3271
 
                    # .host and .checker_command
 
3258
                    # .host
3272
3259
                    for value in old_client_settings.values():
3273
 
                        for attribute in ("host", "checker_command"):
3274
 
                            if isinstance(value[attribute], bytes):
3275
 
                                value[attribute] = (value[attribute]
3276
 
                                                    .decode("utf-8"))
 
3260
                        if isinstance(value["host"], bytes):
 
3261
                            value["host"] = (value["host"]
 
3262
                                             .decode("utf-8"))
3277
3263
            os.remove(stored_state_path)
3278
3264
        except IOError as e:
3279
3265
            if e.errno == errno.ENOENT:
3604
3590
                sys.exit(1)
3605
3591
            # End of Avahi example code
3606
3592
 
3607
 
        GLib.io_add_watch(
3608
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3609
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3610
 
            lambda *args, **kwargs: (tcp_server.handle_request
3611
 
                                     (*args[2:], **kwargs) or True))
 
3593
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3594
                          lambda *args, **kwargs:
 
3595
                          (tcp_server.handle_request
 
3596
                           (*args[2:], **kwargs) or True))
3612
3597
 
3613
3598
        logger.debug("Starting main loop")
3614
3599
        main_loop.run()
3624
3609
    # Must run before the D-Bus bus name gets deregistered
3625
3610
    cleanup()
3626
3611
 
3627
 
 
3628
 
def should_only_run_tests():
3629
 
    parser = argparse.ArgumentParser(add_help=False)
3630
 
    parser.add_argument("--check", action='store_true')
3631
 
    args, unknown_args = parser.parse_known_args()
3632
 
    run_tests = args.check
3633
 
    if run_tests:
3634
 
        # Remove --check argument from sys.argv
3635
 
        sys.argv[1:] = unknown_args
3636
 
    return run_tests
3637
 
 
3638
 
# Add all tests from doctest strings
3639
 
def load_tests(loader, tests, none):
3640
 
    import doctest
3641
 
    tests.addTests(doctest.DocTestSuite())
3642
 
    return tests
3643
3612
 
3644
3613
if __name__ == '__main__':
3645
 
    try:
3646
 
        if should_only_run_tests():
3647
 
            # Call using ./mandos --check [--verbose]
3648
 
            unittest.main()
3649
 
        else:
3650
 
            main()
3651
 
    finally:
3652
 
        logging.shutdown()
 
3614
    main()