/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-11-29 21:54:00 UTC
  • Revision ID: teddy@recompile.se-20201129215400-1zkzmiadisa8whx2
Change URL of systemd "Password Agents" specification

The URL of the systemd "Password Agents" specification changed from
<https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents> to
<https://systemd.io/PASSWORD_AGENTS/>.

* dracut-module/password-agent.c: Change URL in code comments.
* dracut-module/password-agent.xml: Change URL.
* intro.xml (SYSTEMD): - '' -

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