/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-02-11 05:14:10 UTC
  • Revision ID: teddy@recompile.se-20190211051410-43fmzhy0vlafw2pc
Fix warnings from -Wimplicit-fallthrough

* plugin-runner.c (main/parse_opt): Add __builtin_unreachable() after
                                    calls to argp_state_help().
* plugins.d/askpass-fifo.c (error_plus): Add __builtin_unreachable()
                                         after calls to error().
* plugins.d/mandos-client.c (main/parse_opt) Add
                                             __builtin_unreachable()
                                             after calls to
                                             argp_state_help().
* plugins.d/password-prompt.c: - '' -

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
#
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
86
 
import gi
87
83
from gi.repository import GLib
88
84
from dbus.mainloop.glib import DBusGMainLoop
89
85
import ctypes
91
87
import xml.dom.minidom
92
88
import inspect
93
89
 
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
90
# Try to find the value of SO_BINDTODEVICE:
119
91
try:
120
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
112
            # No value found
141
113
            SO_BINDTODEVICE = None
142
114
 
143
 
if sys.version_info < (3, 2):
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
145
117
 
146
 
version = "1.8.12"
 
118
version = "1.8.2"
147
119
stored_state_file = "clients.pickle"
148
120
 
149
121
logger = logging.getLogger()
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
122
syslogger = None
152
123
 
153
124
try:
208
179
    pass
209
180
 
210
181
 
211
 
class PGPEngine:
 
182
class PGPEngine(object):
212
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
184
 
214
185
    def __init__(self):
218
189
            output = subprocess.check_output(["gpgconf"])
219
190
            for line in output.splitlines():
220
191
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
192
                if name == "gpg":
222
193
                    self.gpg = path
223
194
                    break
224
195
        except OSError as e:
229
200
                          '--force-mdc',
230
201
                          '--quiet']
231
202
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
204
            self.gnupgargs.append("--no-use-agent")
234
205
 
235
206
    def __enter__(self):
304
275
 
305
276
 
306
277
# Pretend that we have an Avahi module
307
 
class avahi:
308
 
    """This isn't so much a class as it is a module-like namespace."""
 
278
class Avahi(object):
 
279
    """This isn't so much a class as it is a module-like namespace.
 
280
    It is instantiated once, and simulates having an Avahi module."""
309
281
    IF_UNSPEC = -1               # avahi-common/address.h
310
282
    PROTO_UNSPEC = -1            # avahi-common/address.h
311
283
    PROTO_INET = 0               # avahi-common/address.h
315
287
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
288
    DBUS_PATH_SERVER = "/"
317
289
 
318
 
    @staticmethod
319
 
    def string_array_to_txt_array(t):
 
290
    def string_array_to_txt_array(self, t):
320
291
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
292
                           for s in t), signature="ay")
322
293
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
327
298
    SERVER_RUNNING = 2           # avahi-common/defs.h
328
299
    SERVER_COLLISION = 3         # avahi-common/defs.h
329
300
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
301
avahi = Avahi()
330
302
 
331
303
 
332
304
class AvahiError(Exception):
344
316
    pass
345
317
 
346
318
 
347
 
class AvahiService:
 
319
class AvahiService(object):
348
320
    """An Avahi (Zeroconf) service.
349
321
 
350
322
    Attributes:
524
496
class AvahiServiceToSyslog(AvahiService):
525
497
    def rename(self, *args, **kwargs):
526
498
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
499
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
500
        syslogger.setFormatter(logging.Formatter(
530
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
502
            .format(self.name)))
533
504
 
534
505
 
535
506
# Pretend that we have a GnuTLS module
536
 
class gnutls:
537
 
    """This isn't so much a class as it is a module-like namespace."""
 
507
class GnuTLS(object):
 
508
    """This isn't so much a class as it is a module-like namespace.
 
509
    It is instantiated once, and simulates having a GnuTLS module."""
538
510
 
539
511
    library = ctypes.util.find_library("gnutls")
540
512
    if library is None:
541
513
        library = ctypes.util.find_library("gnutls-deb0")
542
514
    _library = ctypes.cdll.LoadLibrary(library)
543
515
    del library
 
516
    _need_version = b"3.3.0"
 
517
    _tls_rawpk_version = b"3.6.6"
 
518
 
 
519
    def __init__(self):
 
520
        # Need to use "self" here, since this method is called before
 
521
        # the assignment to the "gnutls" global variable happens.
 
522
        if self.check_version(self._need_version) is None:
 
523
            raise self.Error("Needs GnuTLS {} or later"
 
524
                             .format(self._need_version))
544
525
 
545
526
    # Unless otherwise indicated, the constants and types below are
546
527
    # all from the gnutls/gnutls.h C header file.
588
569
 
589
570
    # Exceptions
590
571
    class Error(Exception):
 
572
        # We need to use the class name "GnuTLS" here, since this
 
573
        # exception might be raised from within GnuTLS.__init__,
 
574
        # which is called before the assignment to the "gnutls"
 
575
        # global variable has happened.
591
576
        def __init__(self, message=None, code=None, args=()):
592
577
            # Default usage is by a message string, but if a return
593
578
            # code is passed, convert it to a string with
594
579
            # gnutls.strerror()
595
580
            self.code = code
596
581
            if message is None and code is not None:
597
 
                message = gnutls.strerror(code)
598
 
            return super(gnutls.Error, self).__init__(
 
582
                message = GnuTLS.strerror(code)
 
583
            return super(GnuTLS.Error, self).__init__(
599
584
                message, *args)
600
585
 
601
586
    class CertificateSecurityError(Error):
602
587
        pass
603
588
 
604
589
    # Classes
605
 
    class Credentials:
 
590
    class Credentials(object):
606
591
        def __init__(self):
607
592
            self._c_object = gnutls.certificate_credentials_t()
608
593
            gnutls.certificate_allocate_credentials(
612
597
        def __del__(self):
613
598
            gnutls.certificate_free_credentials(self._c_object)
614
599
 
615
 
    class ClientSession:
 
600
    class ClientSession(object):
616
601
        def __init__(self, socket, credentials=None):
617
602
            self._c_object = gnutls.session_t()
618
603
            gnutls_flags = gnutls.CLIENT
619
 
            if gnutls.check_version(b"3.5.6"):
 
604
            if gnutls.check_version("3.5.6"):
620
605
                gnutls_flags |= gnutls.NO_TICKETS
621
606
            if gnutls.has_rawpk:
622
607
                gnutls_flags |= gnutls.ENABLE_RAWPK
759
744
    check_version.argtypes = [ctypes.c_char_p]
760
745
    check_version.restype = ctypes.c_char_p
761
746
 
762
 
    _need_version = b"3.3.0"
763
 
    if check_version(_need_version) is None:
764
 
        raise self.Error("Needs GnuTLS {} or later"
765
 
                         .format(_need_version))
766
 
 
767
 
    _tls_rawpk_version = b"3.6.6"
768
747
    has_rawpk = bool(check_version(_tls_rawpk_version))
769
748
 
770
749
    if has_rawpk:
775
754
 
776
755
        x509_crt_fmt_t = ctypes.c_int
777
756
 
778
 
        # All the function declarations below are from
779
 
        # gnutls/abstract.h
 
757
        # All the function declarations below are from gnutls/abstract.h
780
758
        pubkey_init = _library.gnutls_pubkey_init
781
759
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
782
760
        pubkey_init.restype = _error_code
796
774
        pubkey_deinit.argtypes = [pubkey_t]
797
775
        pubkey_deinit.restype = None
798
776
    else:
799
 
        # All the function declarations below are from
800
 
        # gnutls/openpgp.h
 
777
        # All the function declarations below are from gnutls/openpgp.h
801
778
 
802
779
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
803
780
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
809
786
                                       openpgp_crt_fmt_t]
810
787
        openpgp_crt_import.restype = _error_code
811
788
 
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
 
        ]
 
789
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
790
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
791
                                            ctypes.POINTER(ctypes.c_uint)]
819
792
        openpgp_crt_verify_self.restype = _error_code
820
793
 
821
794
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
830
803
                                                    ctypes.c_size_t)]
831
804
        openpgp_crt_get_fingerprint.restype = _error_code
832
805
 
833
 
    if check_version(b"3.6.4"):
 
806
    if check_version("3.6.4"):
834
807
        certificate_type_get2 = _library.gnutls_certificate_type_get2
835
808
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
836
809
        certificate_type_get2.restype = _error_code
837
810
 
838
811
    # Remove non-public functions
839
812
    del _error_code, _retry_on_error
 
813
# Create the global "gnutls" object, simulating a module
 
814
gnutls = GnuTLS()
840
815
 
841
816
 
842
817
def call_pipe(connection,       # : multiprocessing.Connection
850
825
    connection.close()
851
826
 
852
827
 
853
 
class Client:
 
828
class Client(object):
854
829
    """A representation of a client host served by this server.
855
830
 
856
831
    Attributes:
857
832
    approved:   bool(); 'None' if not yet approved/disapproved
858
833
    approval_delay: datetime.timedelta(); Time to wait for approval
859
834
    approval_duration: datetime.timedelta(); Duration of one approval
860
 
    checker: multiprocessing.Process(); a running checker process used
861
 
             to see if the client lives. 'None' if no process is
862
 
             running.
 
835
    checker:    subprocess.Popen(); a running checker process used
 
836
                                    to see if the client lives.
 
837
                                    'None' if no process is running.
863
838
    checker_callback_tag: a GLib event source tag, or None
864
839
    checker_command: string; External command which is run to check
865
840
                     if client lives.  %() expansions are done at
1059
1034
        if self.checker_initiator_tag is not None:
1060
1035
            GLib.source_remove(self.checker_initiator_tag)
1061
1036
        self.checker_initiator_tag = GLib.timeout_add(
1062
 
            random.randrange(int(self.interval.total_seconds() * 1000
1063
 
                                 + 1)),
 
1037
            int(self.interval.total_seconds() * 1000),
1064
1038
            self.start_checker)
1065
1039
        # Schedule a disable() when 'timeout' has passed
1066
1040
        if self.disable_initiator_tag is not None:
1073
1047
    def checker_callback(self, source, condition, connection,
1074
1048
                         command):
1075
1049
        """The checker has completed, so take appropriate actions."""
 
1050
        self.checker_callback_tag = None
 
1051
        self.checker = None
1076
1052
        # Read return code from connection (see call_pipe)
1077
1053
        returncode = connection.recv()
1078
1054
        connection.close()
1079
 
        if self.checker is not None:
1080
 
            self.checker.join()
1081
 
        self.checker_callback_tag = None
1082
 
        self.checker = None
1083
1055
 
1084
1056
        if returncode >= 0:
1085
1057
            self.last_checker_status = returncode
1141
1113
        if self.checker is None:
1142
1114
            # Escape attributes for the shell
1143
1115
            escaped_attrs = {
1144
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1116
                attr: re.escape(str(getattr(self, attr)))
1145
1117
                for attr in self.runtime_expansions}
1146
1118
            try:
1147
1119
                command = self.checker_command % escaped_attrs
1174
1146
                kwargs=popen_args)
1175
1147
            self.checker.start()
1176
1148
            self.checker_callback_tag = GLib.io_add_watch(
1177
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1178
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1149
                pipe[0].fileno(), GLib.IO_IN,
1179
1150
                self.checker_callback, pipe[0], command)
1180
1151
        # Re-run this periodically if run by GLib.timeout_add
1181
1152
        return True
1436
1407
                raise ValueError("Byte arrays not supported for non-"
1437
1408
                                 "'ay' signature {!r}"
1438
1409
                                 .format(prop._dbus_signature))
1439
 
            value = dbus.ByteArray(bytes(value))
 
1410
            value = dbus.ByteArray(b''.join(chr(byte)
 
1411
                                            for byte in value))
1440
1412
        prop(value)
1441
1413
 
1442
1414
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2247
2219
    del _interface
2248
2220
 
2249
2221
 
2250
 
class ProxyClient:
 
2222
class ProxyClient(object):
2251
2223
    def __init__(self, child_pipe, key_id, fpr, address):
2252
2224
        self._pipe = child_pipe
2253
2225
        self._pipe.send(('init', key_id, fpr, address))
2326
2298
            approval_required = False
2327
2299
            try:
2328
2300
                if gnutls.has_rawpk:
2329
 
                    fpr = b""
 
2301
                    fpr = ""
2330
2302
                    try:
2331
2303
                        key_id = self.key_id(
2332
2304
                            self.peer_certificate(session))
2336
2308
                    logger.debug("Key ID: %s", key_id)
2337
2309
 
2338
2310
                else:
2339
 
                    key_id = b""
 
2311
                    key_id = ""
2340
2312
                    try:
2341
2313
                        fpr = self.fingerprint(
2342
2314
                            self.peer_certificate(session))
2475
2447
        buf = ctypes.create_string_buffer(32)
2476
2448
        buf_len = ctypes.c_size_t(len(buf))
2477
2449
        # 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))
 
2450
        gnutls.pubkey_get_key_id(pubkey,
 
2451
                                 gnutls.KEYID_USE_SHA256,
 
2452
                                 ctypes.cast(ctypes.byref(buf),
 
2453
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2454
                                 ctypes.byref(buf_len))
2484
2455
        # Deinit the certificate
2485
2456
        gnutls.pubkey_deinit(pubkey)
2486
2457
 
2527
2498
        return hex_fpr
2528
2499
 
2529
2500
 
2530
 
class MultiprocessingMixIn:
 
2501
class MultiprocessingMixIn(object):
2531
2502
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2532
2503
 
2533
2504
    def sub_process_main(self, request, address):
2545
2516
        return proc
2546
2517
 
2547
2518
 
2548
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2519
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2549
2520
    """ adds a pipe to the MixIn """
2550
2521
 
2551
2522
    def process_request(self, request, client_address):
2566
2537
 
2567
2538
 
2568
2539
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2569
 
                     socketserver.TCPServer):
 
2540
                     socketserver.TCPServer, object):
2570
2541
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2571
2542
 
2572
2543
    Attributes:
2645
2616
                    raise
2646
2617
        # Only bind(2) the socket if we really need to.
2647
2618
        if self.server_address[0] or self.server_address[1]:
2648
 
            if self.server_address[1]:
2649
 
                self.allow_reuse_address = True
2650
2619
            if not self.server_address[0]:
2651
2620
                if self.address_family == socket.AF_INET6:
2652
2621
                    any_address = "::"  # in6addr_any
2705
2674
    def add_pipe(self, parent_pipe, proc):
2706
2675
        # Call "handle_ipc" for both data and EOF events
2707
2676
        GLib.io_add_watch(
2708
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2709
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2677
            parent_pipe.fileno(),
 
2678
            GLib.IO_IN | GLib.IO_HUP,
2710
2679
            functools.partial(self.handle_ipc,
2711
2680
                              parent_pipe=parent_pipe,
2712
2681
                              proc=proc))
2731
2700
            address = request[3]
2732
2701
 
2733
2702
            for c in self.clients.values():
2734
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2735
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2703
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2736
2704
                    continue
2737
2705
                if key_id and c.key_id == key_id:
2738
2706
                    client = c
2751
2719
                return False
2752
2720
 
2753
2721
            GLib.io_add_watch(
2754
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2755
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2722
                parent_pipe.fileno(),
 
2723
                GLib.IO_IN | GLib.IO_HUP,
2756
2724
                functools.partial(self.handle_ipc,
2757
2725
                                  parent_pipe=parent_pipe,
2758
2726
                                  proc=proc,
2773
2741
        if command == 'getattr':
2774
2742
            attrname = request[1]
2775
2743
            if isinstance(client_object.__getattribute__(attrname),
2776
 
                          collections.abc.Callable):
 
2744
                          collections.Callable):
2777
2745
                parent_pipe.send(('function', ))
2778
2746
            else:
2779
2747
                parent_pipe.send((
2790
2758
def rfc3339_duration_to_delta(duration):
2791
2759
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2792
2760
 
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
 
2761
    >>> rfc3339_duration_to_delta("P7D")
 
2762
    datetime.timedelta(7)
 
2763
    >>> rfc3339_duration_to_delta("PT60S")
 
2764
    datetime.timedelta(0, 60)
 
2765
    >>> rfc3339_duration_to_delta("PT60M")
 
2766
    datetime.timedelta(0, 3600)
 
2767
    >>> rfc3339_duration_to_delta("PT24H")
 
2768
    datetime.timedelta(1)
 
2769
    >>> rfc3339_duration_to_delta("P1W")
 
2770
    datetime.timedelta(7)
 
2771
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2772
    datetime.timedelta(0, 330)
 
2773
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2774
    datetime.timedelta(1, 200)
2809
2775
    """
2810
2776
 
2811
2777
    # Parsing an RFC 3339 duration with regular expressions is not
2891
2857
def string_to_delta(interval):
2892
2858
    """Parse a string and return a datetime.timedelta
2893
2859
 
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
 
2860
    >>> string_to_delta('7d')
 
2861
    datetime.timedelta(7)
 
2862
    >>> string_to_delta('60s')
 
2863
    datetime.timedelta(0, 60)
 
2864
    >>> string_to_delta('60m')
 
2865
    datetime.timedelta(0, 3600)
 
2866
    >>> string_to_delta('24h')
 
2867
    datetime.timedelta(1)
 
2868
    >>> string_to_delta('1w')
 
2869
    datetime.timedelta(7)
 
2870
    >>> string_to_delta('5m 30s')
 
2871
    datetime.timedelta(0, 330)
2906
2872
    """
2907
2873
 
2908
2874
    try:
3010
2976
 
3011
2977
    options = parser.parse_args()
3012
2978
 
 
2979
    if options.check:
 
2980
        import doctest
 
2981
        fail_count, test_count = doctest.testmod()
 
2982
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2983
 
3013
2984
    # Default values for config file for server-global settings
3014
2985
    if gnutls.has_rawpk:
3015
2986
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3035
3006
    del priority
3036
3007
 
3037
3008
    # Parse config file for server-global settings
3038
 
    server_config = configparser.ConfigParser(server_defaults)
 
3009
    server_config = configparser.SafeConfigParser(server_defaults)
3039
3010
    del server_defaults
3040
3011
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3041
 
    # Convert the ConfigParser object to a dict
 
3012
    # Convert the SafeConfigParser object to a dict
3042
3013
    server_settings = server_config.defaults()
3043
3014
    # Use the appropriate methods on the non-string config options
3044
3015
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3116
3087
                                  server_settings["servicename"])))
3117
3088
 
3118
3089
    # Parse config file with clients
3119
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3090
    client_config = configparser.SafeConfigParser(Client
 
3091
                                                  .client_defaults)
3120
3092
    client_config.read(os.path.join(server_settings["configdir"],
3121
3093
                                    "clients.conf"))
3122
3094
 
3193
3165
        # Close all input and output, do double fork, etc.
3194
3166
        daemon()
3195
3167
 
3196
 
    if gi.version_info < (3, 10, 2):
3197
 
        # multiprocessing will use threads, so before we use GLib we
3198
 
        # need to inform GLib that threads will be used.
3199
 
        GLib.threads_init()
 
3168
    # multiprocessing will use threads, so before we use GLib we need
 
3169
    # to inform GLib that threads will be used.
 
3170
    GLib.threads_init()
3200
3171
 
3201
3172
    global main_loop
3202
3173
    # From the Avahi example code
3278
3249
                             if isinstance(s, bytes)
3279
3250
                             else s) for s in
3280
3251
                            value["client_structure"]]
3281
 
                        # .name, .host, and .checker_command
3282
 
                        for k in ("name", "host", "checker_command"):
 
3252
                        # .name & .host
 
3253
                        for k in ("name", "host"):
3283
3254
                            if isinstance(value[k], bytes):
3284
3255
                                value[k] = value[k].decode("utf-8")
3285
 
                        if "key_id" not in value:
 
3256
                        if not value.has_key("key_id"):
3286
3257
                            value["key_id"] = ""
3287
 
                        elif "fingerprint" not in value:
 
3258
                        elif not value.has_key("fingerprint"):
3288
3259
                            value["fingerprint"] = ""
3289
3260
                    #  old_client_settings
3290
3261
                    # .keys()
3295
3266
                        for key, value in
3296
3267
                        bytes_old_client_settings.items()}
3297
3268
                    del bytes_old_client_settings
3298
 
                    # .host and .checker_command
 
3269
                    # .host
3299
3270
                    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"))
 
3271
                        if isinstance(value["host"], bytes):
 
3272
                            value["host"] = (value["host"]
 
3273
                                             .decode("utf-8"))
3304
3274
            os.remove(stored_state_path)
3305
3275
        except IOError as e:
3306
3276
            if e.errno == errno.ENOENT:
3631
3601
                sys.exit(1)
3632
3602
            # End of Avahi example code
3633
3603
 
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))
 
3604
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3605
                          lambda *args, **kwargs:
 
3606
                          (tcp_server.handle_request
 
3607
                           (*args[2:], **kwargs) or True))
3639
3608
 
3640
3609
        logger.debug("Starting main loop")
3641
3610
        main_loop.run()
3651
3620
    # Must run before the D-Bus bus name gets deregistered
3652
3621
    cleanup()
3653
3622
 
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
3623
 
3671
3624
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()
 
3625
    main()