/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: 2020-02-09 03:38:33 UTC
  • Revision ID: teddy@recompile.se-20200209033833-2la1pujrnv2m0so4
Use reallocarray() if available, or check for overflow

* dracut-module/password-agent.c (add_to_queue): Check for overflow.
  (test_add_to_queue_overflow): New test.
* plugin-runner.c (add_to_char_array, main): Use reallocarray().
* plugins.d/plymouth.c (exec_and_wait): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8 -*-
 
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 -*-
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
import shlex
80
83
 
81
84
import dbus
82
85
import dbus.service
88
91
import xml.dom.minidom
89
92
import inspect
90
93
 
 
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
 
91
118
# Try to find the value of SO_BINDTODEVICE:
92
119
try:
93
120
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
113
140
            # No value found
114
141
            SO_BINDTODEVICE = None
115
142
 
116
 
if sys.version_info.major == 2:
117
 
    str = unicode
118
 
 
119
143
if sys.version_info < (3, 2):
120
144
    configparser.Configparser = configparser.SafeConfigParser
121
145
 
122
 
version = "1.8.6"
 
146
version = "1.8.9"
123
147
stored_state_file = "clients.pickle"
124
148
 
125
149
logger = logging.getLogger()
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
126
151
syslogger = None
127
152
 
128
153
try:
183
208
    pass
184
209
 
185
210
 
186
 
class PGPEngine(object):
 
211
class PGPEngine:
187
212
    """A simple class for OpenPGP symmetric encryption & decryption"""
188
213
 
189
214
    def __init__(self):
193
218
            output = subprocess.check_output(["gpgconf"])
194
219
            for line in output.splitlines():
195
220
                name, text, path = line.split(b":")
196
 
                if name == "gpg":
 
221
                if name == b"gpg":
197
222
                    self.gpg = path
198
223
                    break
199
224
        except OSError as e:
204
229
                          '--force-mdc',
205
230
                          '--quiet']
206
231
        # Only GPG version 1 has the --no-use-agent option.
207
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
208
233
            self.gnupgargs.append("--no-use-agent")
209
234
 
210
235
    def __enter__(self):
279
304
 
280
305
 
281
306
# Pretend that we have an Avahi module
282
 
class avahi(object):
 
307
class avahi:
283
308
    """This isn't so much a class as it is a module-like namespace."""
284
309
    IF_UNSPEC = -1               # avahi-common/address.h
285
310
    PROTO_UNSPEC = -1            # avahi-common/address.h
319
344
    pass
320
345
 
321
346
 
322
 
class AvahiService(object):
 
347
class AvahiService:
323
348
    """An Avahi (Zeroconf) service.
324
349
 
325
350
    Attributes:
507
532
 
508
533
 
509
534
# Pretend that we have a GnuTLS module
510
 
class gnutls(object):
 
535
class gnutls:
511
536
    """This isn't so much a class as it is a module-like namespace."""
512
537
 
513
538
    library = ctypes.util.find_library("gnutls")
576
601
        pass
577
602
 
578
603
    # Classes
579
 
    class Credentials(object):
 
604
    class Credentials:
580
605
        def __init__(self):
581
606
            self._c_object = gnutls.certificate_credentials_t()
582
607
            gnutls.certificate_allocate_credentials(
586
611
        def __del__(self):
587
612
            gnutls.certificate_free_credentials(self._c_object)
588
613
 
589
 
    class ClientSession(object):
 
614
    class ClientSession:
590
615
        def __init__(self, socket, credentials=None):
591
616
            self._c_object = gnutls.session_t()
592
617
            gnutls_flags = gnutls.CLIENT
818
843
    connection.close()
819
844
 
820
845
 
821
 
class Client(object):
 
846
class Client:
822
847
    """A representation of a client host served by this server.
823
848
 
824
849
    Attributes:
1027
1052
        if self.checker_initiator_tag is not None:
1028
1053
            GLib.source_remove(self.checker_initiator_tag)
1029
1054
        self.checker_initiator_tag = GLib.timeout_add(
1030
 
            int(self.interval.total_seconds() * 1000),
 
1055
            random.randrange(int(self.interval.total_seconds() * 1000
 
1056
                                 + 1)),
1031
1057
            self.start_checker)
1032
1058
        # Schedule a disable() when 'timeout' has passed
1033
1059
        if self.disable_initiator_tag is not None:
1043
1069
        # Read return code from connection (see call_pipe)
1044
1070
        returncode = connection.recv()
1045
1071
        connection.close()
1046
 
        self.checker.join()
 
1072
        if self.checker is not None:
 
1073
            self.checker.join()
1047
1074
        self.checker_callback_tag = None
1048
1075
        self.checker = None
1049
1076
 
1107
1134
        if self.checker is None:
1108
1135
            # Escape attributes for the shell
1109
1136
            escaped_attrs = {
1110
 
                attr: re.escape(str(getattr(self, attr)))
 
1137
                attr: shlex.quote(str(getattr(self, attr)))
1111
1138
                for attr in self.runtime_expansions}
1112
1139
            try:
1113
1140
                command = self.checker_command % escaped_attrs
1140
1167
                kwargs=popen_args)
1141
1168
            self.checker.start()
1142
1169
            self.checker_callback_tag = GLib.io_add_watch(
1143
 
                pipe[0].fileno(), GLib.IO_IN,
 
1170
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1171
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1144
1172
                self.checker_callback, pipe[0], command)
1145
1173
        # Re-run this periodically if run by GLib.timeout_add
1146
1174
        return True
1401
1429
                raise ValueError("Byte arrays not supported for non-"
1402
1430
                                 "'ay' signature {!r}"
1403
1431
                                 .format(prop._dbus_signature))
1404
 
            value = dbus.ByteArray(b''.join(chr(byte)
1405
 
                                            for byte in value))
 
1432
            value = dbus.ByteArray(bytes(value))
1406
1433
        prop(value)
1407
1434
 
1408
1435
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2213
2240
    del _interface
2214
2241
 
2215
2242
 
2216
 
class ProxyClient(object):
 
2243
class ProxyClient:
2217
2244
    def __init__(self, child_pipe, key_id, fpr, address):
2218
2245
        self._pipe = child_pipe
2219
2246
        self._pipe.send(('init', key_id, fpr, address))
2492
2519
        return hex_fpr
2493
2520
 
2494
2521
 
2495
 
class MultiprocessingMixIn(object):
 
2522
class MultiprocessingMixIn:
2496
2523
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2497
2524
 
2498
2525
    def sub_process_main(self, request, address):
2510
2537
        return proc
2511
2538
 
2512
2539
 
2513
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2540
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2514
2541
    """ adds a pipe to the MixIn """
2515
2542
 
2516
2543
    def process_request(self, request, client_address):
2531
2558
 
2532
2559
 
2533
2560
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2534
 
                     socketserver.TCPServer, object):
 
2561
                     socketserver.TCPServer):
2535
2562
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2536
2563
 
2537
2564
    Attributes:
2670
2697
    def add_pipe(self, parent_pipe, proc):
2671
2698
        # Call "handle_ipc" for both data and EOF events
2672
2699
        GLib.io_add_watch(
2673
 
            parent_pipe.fileno(),
2674
 
            GLib.IO_IN | GLib.IO_HUP,
 
2700
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2701
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2675
2702
            functools.partial(self.handle_ipc,
2676
2703
                              parent_pipe=parent_pipe,
2677
2704
                              proc=proc))
2715
2742
                return False
2716
2743
 
2717
2744
            GLib.io_add_watch(
2718
 
                parent_pipe.fileno(),
2719
 
                GLib.IO_IN | GLib.IO_HUP,
 
2745
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2746
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2720
2747
                functools.partial(self.handle_ipc,
2721
2748
                                  parent_pipe=parent_pipe,
2722
2749
                                  proc=proc,
2737
2764
        if command == 'getattr':
2738
2765
            attrname = request[1]
2739
2766
            if isinstance(client_object.__getattribute__(attrname),
2740
 
                          collections.Callable):
 
2767
                          collections.abc.Callable):
2741
2768
                parent_pipe.send(('function', ))
2742
2769
            else:
2743
2770
                parent_pipe.send((
2754
2781
def rfc3339_duration_to_delta(duration):
2755
2782
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2756
2783
 
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)
 
2784
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2785
    True
 
2786
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2787
    True
 
2788
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2789
    True
 
2790
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2791
    True
 
2792
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2793
    True
 
2794
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2795
    True
 
2796
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2797
    True
2771
2798
    """
2772
2799
 
2773
2800
    # Parsing an RFC 3339 duration with regular expressions is not
2853
2880
def string_to_delta(interval):
2854
2881
    """Parse a string and return a datetime.timedelta
2855
2882
 
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)
 
2883
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2884
    True
 
2885
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2886
    True
 
2887
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2888
    True
 
2889
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2890
    True
 
2891
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2892
    True
 
2893
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
2894
    True
2868
2895
    """
2869
2896
 
2870
2897
    try:
2972
2999
 
2973
3000
    options = parser.parse_args()
2974
3001
 
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
 
 
2980
3002
    # Default values for config file for server-global settings
2981
3003
    if gnutls.has_rawpk:
2982
3004
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3245
3267
                             if isinstance(s, bytes)
3246
3268
                             else s) for s in
3247
3269
                            value["client_structure"]]
3248
 
                        # .name & .host
3249
 
                        for k in ("name", "host"):
 
3270
                        # .name, .host, and .checker_command
 
3271
                        for k in ("name", "host", "checker_command"):
3250
3272
                            if isinstance(value[k], bytes):
3251
3273
                                value[k] = value[k].decode("utf-8")
3252
3274
                        if "key_id" not in value:
3262
3284
                        for key, value in
3263
3285
                        bytes_old_client_settings.items()}
3264
3286
                    del bytes_old_client_settings
3265
 
                    # .host
 
3287
                    # .host and .checker_command
3266
3288
                    for value in old_client_settings.values():
3267
 
                        if isinstance(value["host"], bytes):
3268
 
                            value["host"] = (value["host"]
3269
 
                                             .decode("utf-8"))
 
3289
                        for attribute in ("host", "checker_command"):
 
3290
                            if isinstance(value[attribute], bytes):
 
3291
                                value[attribute] = (value[attribute]
 
3292
                                                    .decode("utf-8"))
3270
3293
            os.remove(stored_state_path)
3271
3294
        except IOError as e:
3272
3295
            if e.errno == errno.ENOENT:
3597
3620
                sys.exit(1)
3598
3621
            # End of Avahi example code
3599
3622
 
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))
 
3623
        GLib.io_add_watch(
 
3624
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3625
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3626
            lambda *args, **kwargs: (tcp_server.handle_request
 
3627
                                     (*args[2:], **kwargs) or True))
3604
3628
 
3605
3629
        logger.debug("Starting main loop")
3606
3630
        main_loop.run()
3616
3640
    # Must run before the D-Bus bus name gets deregistered
3617
3641
    cleanup()
3618
3642
 
 
3643
 
 
3644
def should_only_run_tests():
 
3645
    parser = argparse.ArgumentParser(add_help=False)
 
3646
    parser.add_argument("--check", action='store_true')
 
3647
    args, unknown_args = parser.parse_known_args()
 
3648
    run_tests = args.check
 
3649
    if run_tests:
 
3650
        # Remove --check argument from sys.argv
 
3651
        sys.argv[1:] = unknown_args
 
3652
    return run_tests
 
3653
 
 
3654
# Add all tests from doctest strings
 
3655
def load_tests(loader, tests, none):
 
3656
    import doctest
 
3657
    tests.addTests(doctest.DocTestSuite())
 
3658
    return tests
3619
3659
 
3620
3660
if __name__ == '__main__':
3621
 
    main()
 
3661
    try:
 
3662
        if should_only_run_tests():
 
3663
            # Call using ./mandos --check [--verbose]
 
3664
            unittest.main()
 
3665
        else:
 
3666
            main()
 
3667
    finally:
 
3668
        logging.shutdown()