/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: 2019-12-04 23:46:59 UTC
  • Revision ID: teddy@recompile.se-20191204234659-m4u7bxnjrns6d3fc
Simplification of Python 3 compatibility code

Apply previously-made change in mandos and mandos-ctl also to
mandos-monitor.

* mandos-monitor: Set "__metaclass__ = type" globally for Python 2,
  and remove inheriting from "object" in all places possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
80
81
 
81
82
import dbus
82
83
import dbus.service
90
91
 
91
92
if sys.version_info.major == 2:
92
93
    __metaclass__ = type
 
94
    str = unicode
 
95
 
 
96
# Show warnings by default
 
97
if not sys.warnoptions:
 
98
    import warnings
 
99
    warnings.simplefilter("default")
93
100
 
94
101
# Try to find the value of SO_BINDTODEVICE:
95
102
try:
116
123
            # No value found
117
124
            SO_BINDTODEVICE = None
118
125
 
119
 
if sys.version_info.major == 2:
120
 
    str = unicode
121
 
 
122
126
if sys.version_info < (3, 2):
123
127
    configparser.Configparser = configparser.SafeConfigParser
124
128
 
125
 
version = "1.8.7"
 
129
version = "1.8.9"
126
130
stored_state_file = "clients.pickle"
127
131
 
128
132
logger = logging.getLogger()
 
133
logging.captureWarnings(True)   # Show warnings via the logging system
129
134
syslogger = None
130
135
 
131
136
try:
196
201
            output = subprocess.check_output(["gpgconf"])
197
202
            for line in output.splitlines():
198
203
                name, text, path = line.split(b":")
199
 
                if name == "gpg":
 
204
                if name == b"gpg":
200
205
                    self.gpg = path
201
206
                    break
202
207
        except OSError as e:
207
212
                          '--force-mdc',
208
213
                          '--quiet']
209
214
        # Only GPG version 1 has the --no-use-agent option.
210
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
215
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
211
216
            self.gnupgargs.append("--no-use-agent")
212
217
 
213
218
    def __enter__(self):
1046
1051
        # Read return code from connection (see call_pipe)
1047
1052
        returncode = connection.recv()
1048
1053
        connection.close()
1049
 
        self.checker.join()
 
1054
        if self.checker is not None:
 
1055
            self.checker.join()
1050
1056
        self.checker_callback_tag = None
1051
1057
        self.checker = None
1052
1058
 
1143
1149
                kwargs=popen_args)
1144
1150
            self.checker.start()
1145
1151
            self.checker_callback_tag = GLib.io_add_watch(
1146
 
                pipe[0].fileno(), GLib.IO_IN,
 
1152
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1153
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1147
1154
                self.checker_callback, pipe[0], command)
1148
1155
        # Re-run this periodically if run by GLib.timeout_add
1149
1156
        return True
1404
1411
                raise ValueError("Byte arrays not supported for non-"
1405
1412
                                 "'ay' signature {!r}"
1406
1413
                                 .format(prop._dbus_signature))
1407
 
            value = dbus.ByteArray(b''.join(chr(byte)
1408
 
                                            for byte in value))
 
1414
            value = dbus.ByteArray(bytes(value))
1409
1415
        prop(value)
1410
1416
 
1411
1417
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2673
2679
    def add_pipe(self, parent_pipe, proc):
2674
2680
        # Call "handle_ipc" for both data and EOF events
2675
2681
        GLib.io_add_watch(
2676
 
            parent_pipe.fileno(),
2677
 
            GLib.IO_IN | GLib.IO_HUP,
 
2682
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2683
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2678
2684
            functools.partial(self.handle_ipc,
2679
2685
                              parent_pipe=parent_pipe,
2680
2686
                              proc=proc))
2718
2724
                return False
2719
2725
 
2720
2726
            GLib.io_add_watch(
2721
 
                parent_pipe.fileno(),
2722
 
                GLib.IO_IN | GLib.IO_HUP,
 
2727
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2728
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2723
2729
                functools.partial(self.handle_ipc,
2724
2730
                                  parent_pipe=parent_pipe,
2725
2731
                                  proc=proc,
2757
2763
def rfc3339_duration_to_delta(duration):
2758
2764
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2759
2765
 
2760
 
    >>> rfc3339_duration_to_delta("P7D")
2761
 
    datetime.timedelta(7)
2762
 
    >>> rfc3339_duration_to_delta("PT60S")
2763
 
    datetime.timedelta(0, 60)
2764
 
    >>> rfc3339_duration_to_delta("PT60M")
2765
 
    datetime.timedelta(0, 3600)
2766
 
    >>> rfc3339_duration_to_delta("PT24H")
2767
 
    datetime.timedelta(1)
2768
 
    >>> rfc3339_duration_to_delta("P1W")
2769
 
    datetime.timedelta(7)
2770
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2771
 
    datetime.timedelta(0, 330)
2772
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2773
 
    datetime.timedelta(1, 200)
 
2766
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2767
    True
 
2768
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2769
    True
 
2770
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2771
    True
 
2772
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2773
    True
 
2774
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2775
    True
 
2776
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2777
    True
 
2778
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2779
    True
2774
2780
    """
2775
2781
 
2776
2782
    # Parsing an RFC 3339 duration with regular expressions is not
2856
2862
def string_to_delta(interval):
2857
2863
    """Parse a string and return a datetime.timedelta
2858
2864
 
2859
 
    >>> string_to_delta('7d')
2860
 
    datetime.timedelta(7)
2861
 
    >>> string_to_delta('60s')
2862
 
    datetime.timedelta(0, 60)
2863
 
    >>> string_to_delta('60m')
2864
 
    datetime.timedelta(0, 3600)
2865
 
    >>> string_to_delta('24h')
2866
 
    datetime.timedelta(1)
2867
 
    >>> string_to_delta('1w')
2868
 
    datetime.timedelta(7)
2869
 
    >>> string_to_delta('5m 30s')
2870
 
    datetime.timedelta(0, 330)
 
2865
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2866
    True
 
2867
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2868
    True
 
2869
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2870
    True
 
2871
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2872
    True
 
2873
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2874
    True
 
2875
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
2876
    True
2871
2877
    """
2872
2878
 
2873
2879
    try:
2975
2981
 
2976
2982
    options = parser.parse_args()
2977
2983
 
2978
 
    if options.check:
2979
 
        import doctest
2980
 
        fail_count, test_count = doctest.testmod()
2981
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2982
 
 
2983
2984
    # Default values for config file for server-global settings
2984
2985
    if gnutls.has_rawpk:
2985
2986
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3248
3249
                             if isinstance(s, bytes)
3249
3250
                             else s) for s in
3250
3251
                            value["client_structure"]]
3251
 
                        # .name & .host
3252
 
                        for k in ("name", "host"):
 
3252
                        # .name, .host, and .checker_command
 
3253
                        for k in ("name", "host", "checker_command"):
3253
3254
                            if isinstance(value[k], bytes):
3254
3255
                                value[k] = value[k].decode("utf-8")
3255
3256
                        if "key_id" not in value:
3265
3266
                        for key, value in
3266
3267
                        bytes_old_client_settings.items()}
3267
3268
                    del bytes_old_client_settings
3268
 
                    # .host
 
3269
                    # .host and .checker_command
3269
3270
                    for value in old_client_settings.values():
3270
 
                        if isinstance(value["host"], bytes):
3271
 
                            value["host"] = (value["host"]
3272
 
                                             .decode("utf-8"))
 
3271
                        for attribute in ("host", "checker_command"):
 
3272
                            if isinstance(value[attribute], bytes):
 
3273
                                value[attribute] = (value[attribute]
 
3274
                                                    .decode("utf-8"))
3273
3275
            os.remove(stored_state_path)
3274
3276
        except IOError as e:
3275
3277
            if e.errno == errno.ENOENT:
3600
3602
                sys.exit(1)
3601
3603
            # End of Avahi example code
3602
3604
 
3603
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3604
 
                          lambda *args, **kwargs:
3605
 
                          (tcp_server.handle_request
3606
 
                           (*args[2:], **kwargs) or True))
 
3605
        GLib.io_add_watch(
 
3606
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3607
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3608
            lambda *args, **kwargs: (tcp_server.handle_request
 
3609
                                     (*args[2:], **kwargs) or True))
3607
3610
 
3608
3611
        logger.debug("Starting main loop")
3609
3612
        main_loop.run()
3619
3622
    # Must run before the D-Bus bus name gets deregistered
3620
3623
    cleanup()
3621
3624
 
 
3625
 
 
3626
def should_only_run_tests():
 
3627
    parser = argparse.ArgumentParser(add_help=False)
 
3628
    parser.add_argument("--check", action='store_true')
 
3629
    args, unknown_args = parser.parse_known_args()
 
3630
    run_tests = args.check
 
3631
    if run_tests:
 
3632
        # Remove --check argument from sys.argv
 
3633
        sys.argv[1:] = unknown_args
 
3634
    return run_tests
 
3635
 
 
3636
# Add all tests from doctest strings
 
3637
def load_tests(loader, tests, none):
 
3638
    import doctest
 
3639
    tests.addTests(doctest.DocTestSuite())
 
3640
    return tests
3622
3641
 
3623
3642
if __name__ == '__main__':
3624
 
    main()
 
3643
    try:
 
3644
        if should_only_run_tests():
 
3645
            # Call using ./mandos --check [--verbose]
 
3646
            unittest.main()
 
3647
        else:
 
3648
            main()
 
3649
    finally:
 
3650
        logging.shutdown()