/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-27 10:11:45 UTC
  • Revision ID: teddy@recompile.se-20190727101145-jnpbpf8220gldbcd
Add dracut(8) support

Add support for the dracut(8) system for generating initramfs image
files; dracut is an alternative to the "initramfs-tools" package.

* .bzrignore (dracut-module/password-agent): Ignore new binary file.
* dracut-module: New directory for the dracut module.
* INSTALL (Prerequisites/Libraries/Mandos Client): Add dracut as an
                                                   alternative to
                                                   initramfs-tools,
                                                   and also add GLib.
* Makefile (DRACUTMODULE, GLIB_CFLAGS, GLIB_LIBS): New.
  (CPROGS): Add "dracut-module/password-agent".
  (DOCS): Add "dracut-module/password-agent.8mandos".
  (dracut-module/password-agent.8mandos): New.
  (dracut-module/password-agent.8mandos.xhtml): - '' -
  (dracut-module/password-agent): - '' -
  (check): Add command to run tests of password-agent(8mandos).
  (install-client-nokey): Also install the dracut module directory,
                          its files, and the password-agent(8mandos)
                          manual page.
  (install-client): To update the initramfs image file, run
                    update-initramfs or dracut depending on what is
                    installed.
  (uninstall-client): - '' - and also uninstall the the files in the
                      dracut module directory, that directory itself,
                      and the password-agent(8mandos) manual page.
* debian/control (Build-Depends): Add "libglib2.0-dev (>=2.40)".
  (Package: mandos-client/Depends): Add "dracut (>= 044+241-3)" as an
                                    alternative dependency to
                                    initramfs-tools.
  (Package: mandos-client/Conflicts): New; set to
                                      "dracut-config-generic".
  (debian/mandos-client.README.Debian): Document alternative commands
                                        to update the initramfs image
                                        for when dracut is used.
* debian/mandos-client.postinst (update_initramfs): Use alternative
                                                    commands to update
                                                    the initramfs
                                                    image for when
                                                    dracut is used.
* debian/tests/control (password-agent, password-agent-suid): Add two
                                                              new tests.
* dracut-module/ask-password-mandos.path: New.
* dracut-module/ask-password-mandos.service: - '' -
* dracut-module/cmdline-mandos.sh: - '' -
* dracut-module/module-setup.sh: - '' -
* dracut-module/password-agent.c: - '' -
* dracut-module/password-agent.xml: - '' -
* initramfs-unpack: Use the dracut "skipcpio" command, if available.
                    Also be more flexible and try hard to detect where
                    compressed data starts.
* plugins.d/mandos-client.xml (SECURITY): Be more precise that the
                                          mandos-client binary might
                                          not always be setuid, but
                                          that the program assumes
                                          that it has been started
                                          that way.
* plugins.d/password-prompt.c: Add new "--prompt" option.
  (conflict_detection): First try to detect the new PID file of
                        plymouth.
  (main): Define and use new "prompt" variable.
* plugins.d/password-prompt.xml (SYNOPSIS): Show new --prompt option.
  (DESCRIPTION): Describe new behavior of looking for plymouth PID
                 file.
  (OPTIONS): Document new "--prompt" option.
  (ENVIRONMENT): Clarify that the CRYPTTAB_SOURCE and CRYPTTAB_NAME
                 environment variables are not used if the --prompt
                 option is used.  Remove unnecessarily specific
                 details about where the CRYPTTAB_SOURCE and
                 CRYPTTAB_NAME comes from, since this can now be
                 either initramfs-tools or dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference, and add commas
              to separate the other references.
* plugins.d/plymouth.c: Add new "--prompt" and "--debug" options.
  (debug): New global flag.
  (fprintf_plus): New function, used for debug output.
  (exec_and_wait): Add extra "const" to "argv" argument.
  (main): Define and use new "prompt" variable.  Add debug output.
  (main/options, main/parse_opt): New; used to parse options.
* plugins.d/plymouth.xml (SYNOPSIS): Show new options.
  (OPTIONS): Document new options.
  (ENVIRONMENT): Clarify that the cryptsource and crypttarget
                 environment variables are not used if the --prompt
                 option is used.  Remove unnecessarily specific
                 details about where the cryptsource and crypttarget
                 comes from, since this can now be either
                 initramfs-tools or dracut.
  (EXAMPLE): Add an example using an option.
  (SEE ALSO): Remove superfluous crypttab(5) reference.
* plugins.d/splashy.xml (ENVIRONMENT): Clarify that the cryptsource
                                       and crypttarget environment
                                       variables are not used if the
                                       --prompt option is used.
                                       Remove unnecessarily specific
                                       details about where the
                                       cryptsource and crypttarget
                                       comes from, since this can now
                                       be either initramfs-tools or
                                       dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference.
* plugins.d/usplash.xml (ENVIRONMENT): Clarify that the cryptsource
                                       and crypttarget environment
                                       variables are not used if the
                                       --prompt option is used.
                                       Remove unnecessarily specific
                                       details about where the
                                       cryptsource and crypttarget
                                       comes from, since this can now
                                       be either initramfs-tools or
                                       dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference.

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.14"
 
118
version = "1.8.4"
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:
 
278
class avahi(object):
308
279
    """This isn't so much a class as it is a module-like namespace."""
309
280
    IF_UNSPEC = -1               # avahi-common/address.h
310
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
344
315
    pass
345
316
 
346
317
 
347
 
class AvahiService:
 
318
class AvahiService(object):
348
319
    """An Avahi (Zeroconf) service.
349
320
 
350
321
    Attributes:
524
495
class AvahiServiceToSyslog(AvahiService):
525
496
    def rename(self, *args, **kwargs):
526
497
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
498
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
499
        syslogger.setFormatter(logging.Formatter(
530
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
501
            .format(self.name)))
533
503
 
534
504
 
535
505
# Pretend that we have a GnuTLS module
536
 
class gnutls:
 
506
class gnutls(object):
537
507
    """This isn't so much a class as it is a module-like namespace."""
538
508
 
539
509
    library = ctypes.util.find_library("gnutls")
602
572
        pass
603
573
 
604
574
    # Classes
605
 
    class Credentials:
 
575
    class Credentials(object):
606
576
        def __init__(self):
607
577
            self._c_object = gnutls.certificate_credentials_t()
608
578
            gnutls.certificate_allocate_credentials(
612
582
        def __del__(self):
613
583
            gnutls.certificate_free_credentials(self._c_object)
614
584
 
615
 
    class ClientSession:
 
585
    class ClientSession(object):
616
586
        def __init__(self, socket, credentials=None):
617
587
            self._c_object = gnutls.session_t()
618
588
            gnutls_flags = gnutls.CLIENT
619
 
            if gnutls.check_version(b"3.5.6"):
 
589
            if gnutls.check_version("3.5.6"):
620
590
                gnutls_flags |= gnutls.NO_TICKETS
621
591
            if gnutls.has_rawpk:
622
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
661
631
            raise gnutls.CertificateSecurityError(code=result)
662
632
        raise gnutls.Error(code=result)
663
633
 
664
 
    def _retry_on_error(result, func, arguments,
665
 
                        _error_code=_error_code):
 
634
    def _retry_on_error(result, func, arguments):
666
635
        """A function to retry on some errors, suitable
667
636
        for the 'errcheck' attribute on ctypes functions"""
668
637
        while result < 0:
776
745
 
777
746
        x509_crt_fmt_t = ctypes.c_int
778
747
 
779
 
        # All the function declarations below are from
780
 
        # gnutls/abstract.h
 
748
        # All the function declarations below are from gnutls/abstract.h
781
749
        pubkey_init = _library.gnutls_pubkey_init
782
750
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
783
751
        pubkey_init.restype = _error_code
797
765
        pubkey_deinit.argtypes = [pubkey_t]
798
766
        pubkey_deinit.restype = None
799
767
    else:
800
 
        # All the function declarations below are from
801
 
        # gnutls/openpgp.h
 
768
        # All the function declarations below are from gnutls/openpgp.h
802
769
 
803
770
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
804
771
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
810
777
                                       openpgp_crt_fmt_t]
811
778
        openpgp_crt_import.restype = _error_code
812
779
 
813
 
        openpgp_crt_verify_self = \
814
 
            _library.gnutls_openpgp_crt_verify_self
815
 
        openpgp_crt_verify_self.argtypes = [
816
 
            openpgp_crt_t,
817
 
            ctypes.c_uint,
818
 
            ctypes.POINTER(ctypes.c_uint),
819
 
        ]
 
780
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
781
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
782
                                            ctypes.POINTER(ctypes.c_uint)]
820
783
        openpgp_crt_verify_self.restype = _error_code
821
784
 
822
785
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
831
794
                                                    ctypes.c_size_t)]
832
795
        openpgp_crt_get_fingerprint.restype = _error_code
833
796
 
834
 
    if check_version(b"3.6.4"):
 
797
    if check_version("3.6.4"):
835
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
836
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
837
800
        certificate_type_get2.restype = _error_code
851
814
    connection.close()
852
815
 
853
816
 
854
 
class Client:
 
817
class Client(object):
855
818
    """A representation of a client host served by this server.
856
819
 
857
820
    Attributes:
858
821
    approved:   bool(); 'None' if not yet approved/disapproved
859
822
    approval_delay: datetime.timedelta(); Time to wait for approval
860
823
    approval_duration: datetime.timedelta(); Duration of one approval
861
 
    checker: multiprocessing.Process(); a running checker process used
862
 
             to see if the client lives. 'None' if no process is
863
 
             running.
 
824
    checker:    subprocess.Popen(); a running checker process used
 
825
                                    to see if the client lives.
 
826
                                    'None' if no process is running.
864
827
    checker_callback_tag: a GLib event source tag, or None
865
828
    checker_command: string; External command which is run to check
866
829
                     if client lives.  %() expansions are done at
1060
1023
        if self.checker_initiator_tag is not None:
1061
1024
            GLib.source_remove(self.checker_initiator_tag)
1062
1025
        self.checker_initiator_tag = GLib.timeout_add(
1063
 
            random.randrange(int(self.interval.total_seconds() * 1000
1064
 
                                 + 1)),
 
1026
            int(self.interval.total_seconds() * 1000),
1065
1027
            self.start_checker)
1066
1028
        # Schedule a disable() when 'timeout' has passed
1067
1029
        if self.disable_initiator_tag is not None:
1074
1036
    def checker_callback(self, source, condition, connection,
1075
1037
                         command):
1076
1038
        """The checker has completed, so take appropriate actions."""
 
1039
        self.checker_callback_tag = None
 
1040
        self.checker = None
1077
1041
        # Read return code from connection (see call_pipe)
1078
1042
        returncode = connection.recv()
1079
1043
        connection.close()
1080
 
        if self.checker is not None:
1081
 
            self.checker.join()
1082
 
        self.checker_callback_tag = None
1083
 
        self.checker = None
1084
1044
 
1085
1045
        if returncode >= 0:
1086
1046
            self.last_checker_status = returncode
1142
1102
        if self.checker is None:
1143
1103
            # Escape attributes for the shell
1144
1104
            escaped_attrs = {
1145
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1105
                attr: re.escape(str(getattr(self, attr)))
1146
1106
                for attr in self.runtime_expansions}
1147
1107
            try:
1148
1108
                command = self.checker_command % escaped_attrs
1175
1135
                kwargs=popen_args)
1176
1136
            self.checker.start()
1177
1137
            self.checker_callback_tag = GLib.io_add_watch(
1178
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1179
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1138
                pipe[0].fileno(), GLib.IO_IN,
1180
1139
                self.checker_callback, pipe[0], command)
1181
1140
        # Re-run this periodically if run by GLib.timeout_add
1182
1141
        return True
1437
1396
                raise ValueError("Byte arrays not supported for non-"
1438
1397
                                 "'ay' signature {!r}"
1439
1398
                                 .format(prop._dbus_signature))
1440
 
            value = dbus.ByteArray(bytes(value))
 
1399
            value = dbus.ByteArray(b''.join(chr(byte)
 
1400
                                            for byte in value))
1441
1401
        prop(value)
1442
1402
 
1443
1403
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2248
2208
    del _interface
2249
2209
 
2250
2210
 
2251
 
class ProxyClient:
 
2211
class ProxyClient(object):
2252
2212
    def __init__(self, child_pipe, key_id, fpr, address):
2253
2213
        self._pipe = child_pipe
2254
2214
        self._pipe.send(('init', key_id, fpr, address))
2327
2287
            approval_required = False
2328
2288
            try:
2329
2289
                if gnutls.has_rawpk:
2330
 
                    fpr = b""
 
2290
                    fpr = ""
2331
2291
                    try:
2332
2292
                        key_id = self.key_id(
2333
2293
                            self.peer_certificate(session))
2337
2297
                    logger.debug("Key ID: %s", key_id)
2338
2298
 
2339
2299
                else:
2340
 
                    key_id = b""
 
2300
                    key_id = ""
2341
2301
                    try:
2342
2302
                        fpr = self.fingerprint(
2343
2303
                            self.peer_certificate(session))
2476
2436
        buf = ctypes.create_string_buffer(32)
2477
2437
        buf_len = ctypes.c_size_t(len(buf))
2478
2438
        # Get the key ID from the raw public key into the buffer
2479
 
        gnutls.pubkey_get_key_id(
2480
 
            pubkey,
2481
 
            gnutls.KEYID_USE_SHA256,
2482
 
            ctypes.cast(ctypes.byref(buf),
2483
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2484
 
            ctypes.byref(buf_len))
 
2439
        gnutls.pubkey_get_key_id(pubkey,
 
2440
                                 gnutls.KEYID_USE_SHA256,
 
2441
                                 ctypes.cast(ctypes.byref(buf),
 
2442
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2443
                                 ctypes.byref(buf_len))
2485
2444
        # Deinit the certificate
2486
2445
        gnutls.pubkey_deinit(pubkey)
2487
2446
 
2528
2487
        return hex_fpr
2529
2488
 
2530
2489
 
2531
 
class MultiprocessingMixIn:
 
2490
class MultiprocessingMixIn(object):
2532
2491
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2533
2492
 
2534
2493
    def sub_process_main(self, request, address):
2546
2505
        return proc
2547
2506
 
2548
2507
 
2549
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2550
2509
    """ adds a pipe to the MixIn """
2551
2510
 
2552
2511
    def process_request(self, request, client_address):
2567
2526
 
2568
2527
 
2569
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2570
 
                     socketserver.TCPServer):
 
2529
                     socketserver.TCPServer, object):
2571
2530
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2572
2531
 
2573
2532
    Attributes:
2706
2665
    def add_pipe(self, parent_pipe, proc):
2707
2666
        # Call "handle_ipc" for both data and EOF events
2708
2667
        GLib.io_add_watch(
2709
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2710
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2668
            parent_pipe.fileno(),
 
2669
            GLib.IO_IN | GLib.IO_HUP,
2711
2670
            functools.partial(self.handle_ipc,
2712
2671
                              parent_pipe=parent_pipe,
2713
2672
                              proc=proc))
2732
2691
            address = request[3]
2733
2692
 
2734
2693
            for c in self.clients.values():
2735
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2736
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2694
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2737
2695
                    continue
2738
2696
                if key_id and c.key_id == key_id:
2739
2697
                    client = c
2752
2710
                return False
2753
2711
 
2754
2712
            GLib.io_add_watch(
2755
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2756
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2713
                parent_pipe.fileno(),
 
2714
                GLib.IO_IN | GLib.IO_HUP,
2757
2715
                functools.partial(self.handle_ipc,
2758
2716
                                  parent_pipe=parent_pipe,
2759
2717
                                  proc=proc,
2774
2732
        if command == 'getattr':
2775
2733
            attrname = request[1]
2776
2734
            if isinstance(client_object.__getattribute__(attrname),
2777
 
                          collections.abc.Callable):
 
2735
                          collections.Callable):
2778
2736
                parent_pipe.send(('function', ))
2779
2737
            else:
2780
2738
                parent_pipe.send((
2791
2749
def rfc3339_duration_to_delta(duration):
2792
2750
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2793
2751
 
2794
 
    >>> timedelta = datetime.timedelta
2795
 
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2796
 
    True
2797
 
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2798
 
    True
2799
 
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2800
 
    True
2801
 
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2802
 
    True
2803
 
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2804
 
    True
2805
 
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2806
 
    True
2807
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2808
 
    True
2809
 
    >>> del timedelta
 
2752
    >>> rfc3339_duration_to_delta("P7D")
 
2753
    datetime.timedelta(7)
 
2754
    >>> rfc3339_duration_to_delta("PT60S")
 
2755
    datetime.timedelta(0, 60)
 
2756
    >>> rfc3339_duration_to_delta("PT60M")
 
2757
    datetime.timedelta(0, 3600)
 
2758
    >>> rfc3339_duration_to_delta("PT24H")
 
2759
    datetime.timedelta(1)
 
2760
    >>> rfc3339_duration_to_delta("P1W")
 
2761
    datetime.timedelta(7)
 
2762
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2763
    datetime.timedelta(0, 330)
 
2764
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2765
    datetime.timedelta(1, 200)
2810
2766
    """
2811
2767
 
2812
2768
    # Parsing an RFC 3339 duration with regular expressions is not
2892
2848
def string_to_delta(interval):
2893
2849
    """Parse a string and return a datetime.timedelta
2894
2850
 
2895
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2896
 
    True
2897
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2898
 
    True
2899
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2900
 
    True
2901
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2902
 
    True
2903
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2904
 
    True
2905
 
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2906
 
    True
 
2851
    >>> string_to_delta('7d')
 
2852
    datetime.timedelta(7)
 
2853
    >>> string_to_delta('60s')
 
2854
    datetime.timedelta(0, 60)
 
2855
    >>> string_to_delta('60m')
 
2856
    datetime.timedelta(0, 3600)
 
2857
    >>> string_to_delta('24h')
 
2858
    datetime.timedelta(1)
 
2859
    >>> string_to_delta('1w')
 
2860
    datetime.timedelta(7)
 
2861
    >>> string_to_delta('5m 30s')
 
2862
    datetime.timedelta(0, 330)
2907
2863
    """
2908
2864
 
2909
2865
    try:
3011
2967
 
3012
2968
    options = parser.parse_args()
3013
2969
 
 
2970
    if options.check:
 
2971
        import doctest
 
2972
        fail_count, test_count = doctest.testmod()
 
2973
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2974
 
3014
2975
    # Default values for config file for server-global settings
3015
2976
    if gnutls.has_rawpk:
3016
2977
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3036
2997
    del priority
3037
2998
 
3038
2999
    # Parse config file for server-global settings
3039
 
    server_config = configparser.ConfigParser(server_defaults)
 
3000
    server_config = configparser.SafeConfigParser(server_defaults)
3040
3001
    del server_defaults
3041
3002
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3042
 
    # Convert the ConfigParser object to a dict
 
3003
    # Convert the SafeConfigParser object to a dict
3043
3004
    server_settings = server_config.defaults()
3044
3005
    # Use the appropriate methods on the non-string config options
3045
3006
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3117
3078
                                  server_settings["servicename"])))
3118
3079
 
3119
3080
    # Parse config file with clients
3120
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3081
    client_config = configparser.SafeConfigParser(Client
 
3082
                                                  .client_defaults)
3121
3083
    client_config.read(os.path.join(server_settings["configdir"],
3122
3084
                                    "clients.conf"))
3123
3085
 
3194
3156
        # Close all input and output, do double fork, etc.
3195
3157
        daemon()
3196
3158
 
3197
 
    if gi.version_info < (3, 10, 2):
3198
 
        # multiprocessing will use threads, so before we use GLib we
3199
 
        # need to inform GLib that threads will be used.
3200
 
        GLib.threads_init()
 
3159
    # multiprocessing will use threads, so before we use GLib we need
 
3160
    # to inform GLib that threads will be used.
 
3161
    GLib.threads_init()
3201
3162
 
3202
3163
    global main_loop
3203
3164
    # From the Avahi example code
3279
3240
                             if isinstance(s, bytes)
3280
3241
                             else s) for s in
3281
3242
                            value["client_structure"]]
3282
 
                        # .name, .host, and .checker_command
3283
 
                        for k in ("name", "host", "checker_command"):
 
3243
                        # .name & .host
 
3244
                        for k in ("name", "host"):
3284
3245
                            if isinstance(value[k], bytes):
3285
3246
                                value[k] = value[k].decode("utf-8")
3286
 
                        if "key_id" not in value:
 
3247
                        if not value.has_key("key_id"):
3287
3248
                            value["key_id"] = ""
3288
 
                        elif "fingerprint" not in value:
 
3249
                        elif not value.has_key("fingerprint"):
3289
3250
                            value["fingerprint"] = ""
3290
3251
                    #  old_client_settings
3291
3252
                    # .keys()
3296
3257
                        for key, value in
3297
3258
                        bytes_old_client_settings.items()}
3298
3259
                    del bytes_old_client_settings
3299
 
                    # .host and .checker_command
 
3260
                    # .host
3300
3261
                    for value in old_client_settings.values():
3301
 
                        for attribute in ("host", "checker_command"):
3302
 
                            if isinstance(value[attribute], bytes):
3303
 
                                value[attribute] = (value[attribute]
3304
 
                                                    .decode("utf-8"))
 
3262
                        if isinstance(value["host"], bytes):
 
3263
                            value["host"] = (value["host"]
 
3264
                                             .decode("utf-8"))
3305
3265
            os.remove(stored_state_path)
3306
3266
        except IOError as e:
3307
3267
            if e.errno == errno.ENOENT:
3632
3592
                sys.exit(1)
3633
3593
            # End of Avahi example code
3634
3594
 
3635
 
        GLib.io_add_watch(
3636
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3637
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3638
 
            lambda *args, **kwargs: (tcp_server.handle_request
3639
 
                                     (*args[2:], **kwargs) or True))
 
3595
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3596
                          lambda *args, **kwargs:
 
3597
                          (tcp_server.handle_request
 
3598
                           (*args[2:], **kwargs) or True))
3640
3599
 
3641
3600
        logger.debug("Starting main loop")
3642
3601
        main_loop.run()
3652
3611
    # Must run before the D-Bus bus name gets deregistered
3653
3612
    cleanup()
3654
3613
 
3655
 
 
3656
 
def should_only_run_tests():
3657
 
    parser = argparse.ArgumentParser(add_help=False)
3658
 
    parser.add_argument("--check", action='store_true')
3659
 
    args, unknown_args = parser.parse_known_args()
3660
 
    run_tests = args.check
3661
 
    if run_tests:
3662
 
        # Remove --check argument from sys.argv
3663
 
        sys.argv[1:] = unknown_args
3664
 
    return run_tests
3665
 
 
3666
 
# Add all tests from doctest strings
3667
 
def load_tests(loader, tests, none):
3668
 
    import doctest
3669
 
    tests.addTests(doctest.DocTestSuite())
3670
 
    return tests
3671
3614
 
3672
3615
if __name__ == '__main__':
3673
 
    try:
3674
 
        if should_only_run_tests():
3675
 
            # Call using ./mandos --check [--verbose]
3676
 
            unittest.main()
3677
 
        else:
3678
 
            main()
3679
 
    finally:
3680
 
        logging.shutdown()
 
3616
    main()