/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: 2018-02-08 10:23:55 UTC
  • Revision ID: teddy@recompile.se-20180208102355-3ent7sf87i9h9kka
Update copyright year to 2018

* DBUS-API: Update copyright year to 2018.
* debian/copyright: - '' -
* initramfs-unpack: - '' -
* intro.xml: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-ctl: - '' -
* mandos-ctl.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos-monitor: - '' -
* mandos-monitor.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* network-hooks.d/bridge: - '' -
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -
* plugin-helpers/mandos-client-iprouteadddel.c: - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml: - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml: - '' -

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-2018 Teddy Hogeborn
 
15
# Copyright © 2008-2018 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.7.16"
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,
 
499
        ret = super(AvahiServiceToSyslog, self).rename(self, *args,
528
500
                                                       **kwargs)
529
501
        syslogger.setFormatter(logging.Formatter(
530
502
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
533
505
 
534
506
 
535
507
# 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."""
 
508
class GnuTLS(object):
 
509
    """This isn't so much a class as it is a module-like namespace.
 
510
    It is instantiated once, and simulates having a GnuTLS module."""
538
511
 
539
512
    library = ctypes.util.find_library("gnutls")
540
513
    if library is None:
541
514
        library = ctypes.util.find_library("gnutls-deb0")
542
515
    _library = ctypes.cdll.LoadLibrary(library)
543
516
    del library
 
517
    _need_version = b"3.3.0"
 
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.
550
531
    E_INTERRUPTED = -52
551
532
    E_AGAIN = -28
552
533
    CRT_OPENPGP = 2
553
 
    CRT_RAWPK = 3
554
534
    CLIENT = 2
555
535
    SHUT_RDWR = 0
556
536
    CRD_CERTIFICATE = 1
557
537
    E_NO_CERTIFICATE_FOUND = -49
558
 
    X509_FMT_DER = 0
559
 
    NO_TICKETS = 1<<10
560
 
    ENABLE_RAWPK = 1<<18
561
 
    CTYPE_PEERS = 3
562
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
563
538
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
564
539
 
565
540
    # Types
588
563
 
589
564
    # Exceptions
590
565
    class Error(Exception):
 
566
        # We need to use the class name "GnuTLS" here, since this
 
567
        # exception might be raised from within GnuTLS.__init__,
 
568
        # which is called before the assignment to the "gnutls"
 
569
        # global variable has happened.
591
570
        def __init__(self, message=None, code=None, args=()):
592
571
            # Default usage is by a message string, but if a return
593
572
            # code is passed, convert it to a string with
594
573
            # gnutls.strerror()
595
574
            self.code = code
596
575
            if message is None and code is not None:
597
 
                message = gnutls.strerror(code)
598
 
            return super(gnutls.Error, self).__init__(
 
576
                message = GnuTLS.strerror(code)
 
577
            return super(GnuTLS.Error, self).__init__(
599
578
                message, *args)
600
579
 
601
580
    class CertificateSecurityError(Error):
602
581
        pass
603
582
 
604
583
    # Classes
605
 
    class Credentials:
 
584
    class Credentials(object):
606
585
        def __init__(self):
607
586
            self._c_object = gnutls.certificate_credentials_t()
608
587
            gnutls.certificate_allocate_credentials(
612
591
        def __del__(self):
613
592
            gnutls.certificate_free_credentials(self._c_object)
614
593
 
615
 
    class ClientSession:
 
594
    class ClientSession(object):
616
595
        def __init__(self, socket, credentials=None):
617
596
            self._c_object = gnutls.session_t()
618
 
            gnutls_flags = gnutls.CLIENT
619
 
            if gnutls.check_version(b"3.5.6"):
620
 
                gnutls_flags |= gnutls.NO_TICKETS
621
 
            if gnutls.has_rawpk:
622
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
623
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
624
 
            del gnutls_flags
 
597
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
625
598
            gnutls.set_default_priority(self._c_object)
626
599
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
627
600
            gnutls.handshake_set_private_extensions(self._c_object,
661
634
            raise gnutls.CertificateSecurityError(code=result)
662
635
        raise gnutls.Error(code=result)
663
636
 
664
 
    def _retry_on_error(result, func, arguments,
665
 
                        _error_code=_error_code):
 
637
    def _retry_on_error(result, func, arguments):
666
638
        """A function to retry on some errors, suitable
667
639
        for the 'errcheck' attribute on ctypes functions"""
668
640
        while result < 0:
760
732
    check_version.argtypes = [ctypes.c_char_p]
761
733
    check_version.restype = ctypes.c_char_p
762
734
 
763
 
    _need_version = b"3.3.0"
764
 
    if check_version(_need_version) is None:
765
 
        raise self.Error("Needs GnuTLS {} or later"
766
 
                         .format(_need_version))
767
 
 
768
 
    _tls_rawpk_version = b"3.6.6"
769
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
770
 
 
771
 
    if has_rawpk:
772
 
        # Types
773
 
        class pubkey_st(ctypes.Structure):
774
 
            _fields = []
775
 
        pubkey_t = ctypes.POINTER(pubkey_st)
776
 
 
777
 
        x509_crt_fmt_t = ctypes.c_int
778
 
 
779
 
        # All the function declarations below are from
780
 
        # gnutls/abstract.h
781
 
        pubkey_init = _library.gnutls_pubkey_init
782
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
783
 
        pubkey_init.restype = _error_code
784
 
 
785
 
        pubkey_import = _library.gnutls_pubkey_import
786
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
787
 
                                  x509_crt_fmt_t]
788
 
        pubkey_import.restype = _error_code
789
 
 
790
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
791
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
792
 
                                      ctypes.POINTER(ctypes.c_ubyte),
793
 
                                      ctypes.POINTER(ctypes.c_size_t)]
794
 
        pubkey_get_key_id.restype = _error_code
795
 
 
796
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
797
 
        pubkey_deinit.argtypes = [pubkey_t]
798
 
        pubkey_deinit.restype = None
799
 
    else:
800
 
        # All the function declarations below are from
801
 
        # gnutls/openpgp.h
802
 
 
803
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
804
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
805
 
        openpgp_crt_init.restype = _error_code
806
 
 
807
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
808
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
809
 
                                       ctypes.POINTER(datum_t),
810
 
                                       openpgp_crt_fmt_t]
811
 
        openpgp_crt_import.restype = _error_code
812
 
 
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
 
        ]
820
 
        openpgp_crt_verify_self.restype = _error_code
821
 
 
822
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
823
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
824
 
        openpgp_crt_deinit.restype = None
825
 
 
826
 
        openpgp_crt_get_fingerprint = (
827
 
            _library.gnutls_openpgp_crt_get_fingerprint)
828
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
829
 
                                                ctypes.c_void_p,
830
 
                                                ctypes.POINTER(
831
 
                                                    ctypes.c_size_t)]
832
 
        openpgp_crt_get_fingerprint.restype = _error_code
833
 
 
834
 
    if check_version(b"3.6.4"):
835
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
836
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
837
 
        certificate_type_get2.restype = _error_code
 
735
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
 
737
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
738
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
739
    openpgp_crt_init.restype = _error_code
 
740
 
 
741
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
742
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
743
                                   ctypes.POINTER(datum_t),
 
744
                                   openpgp_crt_fmt_t]
 
745
    openpgp_crt_import.restype = _error_code
 
746
 
 
747
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
748
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
749
                                        ctypes.POINTER(ctypes.c_uint)]
 
750
    openpgp_crt_verify_self.restype = _error_code
 
751
 
 
752
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
753
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
754
    openpgp_crt_deinit.restype = None
 
755
 
 
756
    openpgp_crt_get_fingerprint = (
 
757
        _library.gnutls_openpgp_crt_get_fingerprint)
 
758
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
759
                                            ctypes.c_void_p,
 
760
                                            ctypes.POINTER(
 
761
                                                ctypes.c_size_t)]
 
762
    openpgp_crt_get_fingerprint.restype = _error_code
838
763
 
839
764
    # Remove non-public functions
840
765
    del _error_code, _retry_on_error
 
766
# Create the global "gnutls" object, simulating a module
 
767
gnutls = GnuTLS()
841
768
 
842
769
 
843
770
def call_pipe(connection,       # : multiprocessing.Connection
851
778
    connection.close()
852
779
 
853
780
 
854
 
class Client:
 
781
class Client(object):
855
782
    """A representation of a client host served by this server.
856
783
 
857
784
    Attributes:
858
785
    approved:   bool(); 'None' if not yet approved/disapproved
859
786
    approval_delay: datetime.timedelta(); Time to wait for approval
860
787
    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.
 
788
    checker:    subprocess.Popen(); a running checker process used
 
789
                                    to see if the client lives.
 
790
                                    'None' if no process is running.
864
791
    checker_callback_tag: a GLib event source tag, or None
865
792
    checker_command: string; External command which is run to check
866
793
                     if client lives.  %() expansions are done at
874
801
    disable_initiator_tag: a GLib event source tag, or None
875
802
    enabled:    bool()
876
803
    fingerprint: string (40 or 32 hexadecimal digits); used to
877
 
                 uniquely identify an OpenPGP client
878
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
879
 
            a client using raw public keys
 
804
                 uniquely identify the client
880
805
    host:       string; available for use by the checker command
881
806
    interval:   datetime.timedelta(); How often to start a new checker
882
807
    last_approval_request: datetime.datetime(); (UTC) or None
900
825
    """
901
826
 
902
827
    runtime_expansions = ("approval_delay", "approval_duration",
903
 
                          "created", "enabled", "expires", "key_id",
 
828
                          "created", "enabled", "expires",
904
829
                          "fingerprint", "host", "interval",
905
830
                          "last_approval_request", "last_checked_ok",
906
831
                          "last_enabled", "name", "timeout")
936
861
            client["enabled"] = config.getboolean(client_name,
937
862
                                                  "enabled")
938
863
 
939
 
            # Uppercase and remove spaces from key_id and fingerprint
940
 
            # for later comparison purposes with return value from the
941
 
            # key_id() and fingerprint() functions
942
 
            client["key_id"] = (section.get("key_id", "").upper()
943
 
                                .replace(" ", ""))
 
864
            # Uppercase and remove spaces from fingerprint for later
 
865
            # comparison purposes with return value from the
 
866
            # fingerprint() function
944
867
            client["fingerprint"] = (section["fingerprint"].upper()
945
868
                                     .replace(" ", ""))
946
869
            if "secret" in section:
990
913
            self.expires = None
991
914
 
992
915
        logger.debug("Creating client %r", self.name)
993
 
        logger.debug("  Key ID: %s", self.key_id)
994
916
        logger.debug("  Fingerprint: %s", self.fingerprint)
995
917
        self.created = settings.get("created",
996
918
                                    datetime.datetime.utcnow())
1060
982
        if self.checker_initiator_tag is not None:
1061
983
            GLib.source_remove(self.checker_initiator_tag)
1062
984
        self.checker_initiator_tag = GLib.timeout_add(
1063
 
            random.randrange(int(self.interval.total_seconds() * 1000
1064
 
                                 + 1)),
 
985
            int(self.interval.total_seconds() * 1000),
1065
986
            self.start_checker)
1066
987
        # Schedule a disable() when 'timeout' has passed
1067
988
        if self.disable_initiator_tag is not None:
1074
995
    def checker_callback(self, source, condition, connection,
1075
996
                         command):
1076
997
        """The checker has completed, so take appropriate actions."""
 
998
        self.checker_callback_tag = None
 
999
        self.checker = None
1077
1000
        # Read return code from connection (see call_pipe)
1078
1001
        returncode = connection.recv()
1079
1002
        connection.close()
1080
 
        if self.checker is not None:
1081
 
            self.checker.join()
1082
 
        self.checker_callback_tag = None
1083
 
        self.checker = None
1084
1003
 
1085
1004
        if returncode >= 0:
1086
1005
            self.last_checker_status = returncode
1142
1061
        if self.checker is None:
1143
1062
            # Escape attributes for the shell
1144
1063
            escaped_attrs = {
1145
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1064
                attr: re.escape(str(getattr(self, attr)))
1146
1065
                for attr in self.runtime_expansions}
1147
1066
            try:
1148
1067
                command = self.checker_command % escaped_attrs
1175
1094
                kwargs=popen_args)
1176
1095
            self.checker.start()
1177
1096
            self.checker_callback_tag = GLib.io_add_watch(
1178
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1179
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1097
                pipe[0].fileno(), GLib.IO_IN,
1180
1098
                self.checker_callback, pipe[0], command)
1181
1099
        # Re-run this periodically if run by GLib.timeout_add
1182
1100
        return True
1437
1355
                raise ValueError("Byte arrays not supported for non-"
1438
1356
                                 "'ay' signature {!r}"
1439
1357
                                 .format(prop._dbus_signature))
1440
 
            value = dbus.ByteArray(bytes(value))
 
1358
            value = dbus.ByteArray(b''.join(chr(byte)
 
1359
                                            for byte in value))
1441
1360
        prop(value)
1442
1361
 
1443
1362
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2081
2000
    def Name_dbus_property(self):
2082
2001
        return dbus.String(self.name)
2083
2002
 
2084
 
    # KeyID - property
2085
 
    @dbus_annotations(
2086
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2087
 
    @dbus_service_property(_interface, signature="s", access="read")
2088
 
    def KeyID_dbus_property(self):
2089
 
        return dbus.String(self.key_id)
2090
 
 
2091
2003
    # Fingerprint - property
2092
2004
    @dbus_annotations(
2093
2005
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2248
2160
    del _interface
2249
2161
 
2250
2162
 
2251
 
class ProxyClient:
2252
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
2163
class ProxyClient(object):
 
2164
    def __init__(self, child_pipe, fpr, address):
2253
2165
        self._pipe = child_pipe
2254
 
        self._pipe.send(('init', key_id, fpr, address))
 
2166
        self._pipe.send(('init', fpr, address))
2255
2167
        if not self._pipe.recv():
2256
 
            raise KeyError(key_id or fpr)
 
2168
            raise KeyError(fpr)
2257
2169
 
2258
2170
    def __getattribute__(self, name):
2259
2171
        if name == '_pipe':
2326
2238
 
2327
2239
            approval_required = False
2328
2240
            try:
2329
 
                if gnutls.has_rawpk:
2330
 
                    fpr = b""
2331
 
                    try:
2332
 
                        key_id = self.key_id(
2333
 
                            self.peer_certificate(session))
2334
 
                    except (TypeError, gnutls.Error) as error:
2335
 
                        logger.warning("Bad certificate: %s", error)
2336
 
                        return
2337
 
                    logger.debug("Key ID: %s", key_id)
2338
 
 
2339
 
                else:
2340
 
                    key_id = b""
2341
 
                    try:
2342
 
                        fpr = self.fingerprint(
2343
 
                            self.peer_certificate(session))
2344
 
                    except (TypeError, gnutls.Error) as error:
2345
 
                        logger.warning("Bad certificate: %s", error)
2346
 
                        return
2347
 
                    logger.debug("Fingerprint: %s", fpr)
2348
 
 
2349
 
                try:
2350
 
                    client = ProxyClient(child_pipe, key_id, fpr,
 
2241
                try:
 
2242
                    fpr = self.fingerprint(
 
2243
                        self.peer_certificate(session))
 
2244
                except (TypeError, gnutls.Error) as error:
 
2245
                    logger.warning("Bad certificate: %s", error)
 
2246
                    return
 
2247
                logger.debug("Fingerprint: %s", fpr)
 
2248
 
 
2249
                try:
 
2250
                    client = ProxyClient(child_pipe, fpr,
2351
2251
                                         self.client_address)
2352
2252
                except KeyError:
2353
2253
                    return
2430
2330
 
2431
2331
    @staticmethod
2432
2332
    def peer_certificate(session):
2433
 
        "Return the peer's certificate as a bytestring"
2434
 
        try:
2435
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
2436
 
                                                     gnutls.CTYPE_PEERS)
2437
 
        except AttributeError:
2438
 
            cert_type = gnutls.certificate_type_get(session._c_object)
2439
 
        if gnutls.has_rawpk:
2440
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2441
 
        else:
2442
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2443
 
        # If not a valid certificate type...
2444
 
        if cert_type not in valid_cert_types:
2445
 
            logger.info("Cert type %r not in %r", cert_type,
2446
 
                        valid_cert_types)
 
2333
        "Return the peer's OpenPGP certificate as a bytestring"
 
2334
        # If not an OpenPGP certificate...
 
2335
        if (gnutls.certificate_type_get(session._c_object)
 
2336
            != gnutls.CRT_OPENPGP):
2447
2337
            # ...return invalid data
2448
2338
            return b""
2449
2339
        list_size = ctypes.c_uint(1)
2457
2347
        return ctypes.string_at(cert.data, cert.size)
2458
2348
 
2459
2349
    @staticmethod
2460
 
    def key_id(certificate):
2461
 
        "Convert a certificate bytestring to a hexdigit key ID"
2462
 
        # New GnuTLS "datum" with the public key
2463
 
        datum = gnutls.datum_t(
2464
 
            ctypes.cast(ctypes.c_char_p(certificate),
2465
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2466
 
            ctypes.c_uint(len(certificate)))
2467
 
        # XXX all these need to be created in the gnutls "module"
2468
 
        # New empty GnuTLS certificate
2469
 
        pubkey = gnutls.pubkey_t()
2470
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
2471
 
        # Import the raw public key into the certificate
2472
 
        gnutls.pubkey_import(pubkey,
2473
 
                             ctypes.byref(datum),
2474
 
                             gnutls.X509_FMT_DER)
2475
 
        # New buffer for the key ID
2476
 
        buf = ctypes.create_string_buffer(32)
2477
 
        buf_len = ctypes.c_size_t(len(buf))
2478
 
        # 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))
2485
 
        # Deinit the certificate
2486
 
        gnutls.pubkey_deinit(pubkey)
2487
 
 
2488
 
        # Convert the buffer to a Python bytestring
2489
 
        key_id = ctypes.string_at(buf, buf_len.value)
2490
 
        # Convert the bytestring to hexadecimal notation
2491
 
        hex_key_id = binascii.hexlify(key_id).upper()
2492
 
        return hex_key_id
2493
 
 
2494
 
    @staticmethod
2495
2350
    def fingerprint(openpgp):
2496
2351
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2497
2352
        # New GnuTLS "datum" with the OpenPGP public key
2511
2366
                                       ctypes.byref(crtverify))
2512
2367
        if crtverify.value != 0:
2513
2368
            gnutls.openpgp_crt_deinit(crt)
2514
 
            raise gnutls.CertificateSecurityError(code
2515
 
                                                  =crtverify.value)
 
2369
            raise gnutls.CertificateSecurityError("Verify failed")
2516
2370
        # New buffer for the fingerprint
2517
2371
        buf = ctypes.create_string_buffer(20)
2518
2372
        buf_len = ctypes.c_size_t()
2528
2382
        return hex_fpr
2529
2383
 
2530
2384
 
2531
 
class MultiprocessingMixIn:
 
2385
class MultiprocessingMixIn(object):
2532
2386
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2533
2387
 
2534
2388
    def sub_process_main(self, request, address):
2546
2400
        return proc
2547
2401
 
2548
2402
 
2549
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2403
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2550
2404
    """ adds a pipe to the MixIn """
2551
2405
 
2552
2406
    def process_request(self, request, client_address):
2567
2421
 
2568
2422
 
2569
2423
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2570
 
                     socketserver.TCPServer):
 
2424
                     socketserver.TCPServer, object):
2571
2425
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2572
2426
 
2573
2427
    Attributes:
2646
2500
                    raise
2647
2501
        # Only bind(2) the socket if we really need to.
2648
2502
        if self.server_address[0] or self.server_address[1]:
2649
 
            if self.server_address[1]:
2650
 
                self.allow_reuse_address = True
2651
2503
            if not self.server_address[0]:
2652
2504
                if self.address_family == socket.AF_INET6:
2653
2505
                    any_address = "::"  # in6addr_any
2706
2558
    def add_pipe(self, parent_pipe, proc):
2707
2559
        # Call "handle_ipc" for both data and EOF events
2708
2560
        GLib.io_add_watch(
2709
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2710
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2561
            parent_pipe.fileno(),
 
2562
            GLib.IO_IN | GLib.IO_HUP,
2711
2563
            functools.partial(self.handle_ipc,
2712
2564
                              parent_pipe=parent_pipe,
2713
2565
                              proc=proc))
2727
2579
        command = request[0]
2728
2580
 
2729
2581
        if command == 'init':
2730
 
            key_id = request[1].decode("ascii")
2731
 
            fpr = request[2].decode("ascii")
2732
 
            address = request[3]
 
2582
            fpr = request[1].decode("ascii")
 
2583
            address = request[2]
2733
2584
 
2734
2585
            for c in self.clients.values():
2735
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2736
 
                              "27AE41E4649B934CA495991B7852B855"):
2737
 
                    continue
2738
 
                if key_id and c.key_id == key_id:
2739
 
                    client = c
2740
 
                    break
2741
 
                if fpr and c.fingerprint == fpr:
 
2586
                if c.fingerprint == fpr:
2742
2587
                    client = c
2743
2588
                    break
2744
2589
            else:
2745
 
                logger.info("Client not found for key ID: %s, address"
2746
 
                            ": %s", key_id or fpr, address)
 
2590
                logger.info("Client not found for fingerprint: %s, ad"
 
2591
                            "dress: %s", fpr, address)
2747
2592
                if self.use_dbus:
2748
2593
                    # Emit D-Bus signal
2749
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2594
                    mandos_dbus_service.ClientNotFound(fpr,
2750
2595
                                                       address[0])
2751
2596
                parent_pipe.send(False)
2752
2597
                return False
2753
2598
 
2754
2599
            GLib.io_add_watch(
2755
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2756
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2600
                parent_pipe.fileno(),
 
2601
                GLib.IO_IN | GLib.IO_HUP,
2757
2602
                functools.partial(self.handle_ipc,
2758
2603
                                  parent_pipe=parent_pipe,
2759
2604
                                  proc=proc,
2774
2619
        if command == 'getattr':
2775
2620
            attrname = request[1]
2776
2621
            if isinstance(client_object.__getattribute__(attrname),
2777
 
                          collections.abc.Callable):
 
2622
                          collections.Callable):
2778
2623
                parent_pipe.send(('function', ))
2779
2624
            else:
2780
2625
                parent_pipe.send((
2791
2636
def rfc3339_duration_to_delta(duration):
2792
2637
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2793
2638
 
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
 
2639
    >>> rfc3339_duration_to_delta("P7D")
 
2640
    datetime.timedelta(7)
 
2641
    >>> rfc3339_duration_to_delta("PT60S")
 
2642
    datetime.timedelta(0, 60)
 
2643
    >>> rfc3339_duration_to_delta("PT60M")
 
2644
    datetime.timedelta(0, 3600)
 
2645
    >>> rfc3339_duration_to_delta("PT24H")
 
2646
    datetime.timedelta(1)
 
2647
    >>> rfc3339_duration_to_delta("P1W")
 
2648
    datetime.timedelta(7)
 
2649
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2650
    datetime.timedelta(0, 330)
 
2651
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2652
    datetime.timedelta(1, 200)
2810
2653
    """
2811
2654
 
2812
2655
    # Parsing an RFC 3339 duration with regular expressions is not
2892
2735
def string_to_delta(interval):
2893
2736
    """Parse a string and return a datetime.timedelta
2894
2737
 
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
 
2738
    >>> string_to_delta('7d')
 
2739
    datetime.timedelta(7)
 
2740
    >>> string_to_delta('60s')
 
2741
    datetime.timedelta(0, 60)
 
2742
    >>> string_to_delta('60m')
 
2743
    datetime.timedelta(0, 3600)
 
2744
    >>> string_to_delta('24h')
 
2745
    datetime.timedelta(1)
 
2746
    >>> string_to_delta('1w')
 
2747
    datetime.timedelta(7)
 
2748
    >>> string_to_delta('5m 30s')
 
2749
    datetime.timedelta(0, 330)
2907
2750
    """
2908
2751
 
2909
2752
    try:
3011
2854
 
3012
2855
    options = parser.parse_args()
3013
2856
 
 
2857
    if options.check:
 
2858
        import doctest
 
2859
        fail_count, test_count = doctest.testmod()
 
2860
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2861
 
3014
2862
    # Default values for config file for server-global settings
3015
 
    if gnutls.has_rawpk:
3016
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3017
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3018
 
    else:
3019
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3020
 
                    ":+SIGN-DSA-SHA256")
3021
2863
    server_defaults = {"interface": "",
3022
2864
                       "address": "",
3023
2865
                       "port": "",
3024
2866
                       "debug": "False",
3025
 
                       "priority": priority,
 
2867
                       "priority":
 
2868
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2869
                       ":+SIGN-DSA-SHA256",
3026
2870
                       "servicename": "Mandos",
3027
2871
                       "use_dbus": "True",
3028
2872
                       "use_ipv6": "True",
3033
2877
                       "foreground": "False",
3034
2878
                       "zeroconf": "True",
3035
2879
                       }
3036
 
    del priority
3037
2880
 
3038
2881
    # Parse config file for server-global settings
3039
 
    server_config = configparser.ConfigParser(server_defaults)
 
2882
    server_config = configparser.SafeConfigParser(server_defaults)
3040
2883
    del server_defaults
3041
2884
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3042
 
    # Convert the ConfigParser object to a dict
 
2885
    # Convert the SafeConfigParser object to a dict
3043
2886
    server_settings = server_config.defaults()
3044
2887
    # Use the appropriate methods on the non-string config options
3045
2888
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3117
2960
                                  server_settings["servicename"])))
3118
2961
 
3119
2962
    # Parse config file with clients
3120
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2963
    client_config = configparser.SafeConfigParser(Client
 
2964
                                                  .client_defaults)
3121
2965
    client_config.read(os.path.join(server_settings["configdir"],
3122
2966
                                    "clients.conf"))
3123
2967
 
3194
3038
        # Close all input and output, do double fork, etc.
3195
3039
        daemon()
3196
3040
 
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()
 
3041
    # multiprocessing will use threads, so before we use GLib we need
 
3042
    # to inform GLib that threads will be used.
 
3043
    GLib.threads_init()
3201
3044
 
3202
3045
    global main_loop
3203
3046
    # From the Avahi example code
3279
3122
                             if isinstance(s, bytes)
3280
3123
                             else s) for s in
3281
3124
                            value["client_structure"]]
3282
 
                        # .name, .host, and .checker_command
3283
 
                        for k in ("name", "host", "checker_command"):
 
3125
                        # .name & .host
 
3126
                        for k in ("name", "host"):
3284
3127
                            if isinstance(value[k], bytes):
3285
3128
                                value[k] = value[k].decode("utf-8")
3286
 
                        if "key_id" not in value:
3287
 
                            value["key_id"] = ""
3288
 
                        elif "fingerprint" not in value:
3289
 
                            value["fingerprint"] = ""
3290
3129
                    #  old_client_settings
3291
3130
                    # .keys()
3292
3131
                    old_client_settings = {
3296
3135
                        for key, value in
3297
3136
                        bytes_old_client_settings.items()}
3298
3137
                    del bytes_old_client_settings
3299
 
                    # .host and .checker_command
 
3138
                    # .host
3300
3139
                    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"))
 
3140
                        if isinstance(value["host"], bytes):
 
3141
                            value["host"] = (value["host"]
 
3142
                                             .decode("utf-8"))
3305
3143
            os.remove(stored_state_path)
3306
3144
        except IOError as e:
3307
3145
            if e.errno == errno.ENOENT:
3430
3268
                pass
3431
3269
 
3432
3270
            @dbus.service.signal(_interface, signature="ss")
3433
 
            def ClientNotFound(self, key_id, address):
 
3271
            def ClientNotFound(self, fingerprint, address):
3434
3272
                "D-Bus signal"
3435
3273
                pass
3436
3274
 
3632
3470
                sys.exit(1)
3633
3471
            # End of Avahi example code
3634
3472
 
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))
 
3473
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3474
                          lambda *args, **kwargs:
 
3475
                          (tcp_server.handle_request
 
3476
                           (*args[2:], **kwargs) or True))
3640
3477
 
3641
3478
        logger.debug("Starting main loop")
3642
3479
        main_loop.run()
3652
3489
    # Must run before the D-Bus bus name gets deregistered
3653
3490
    cleanup()
3654
3491
 
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
3492
 
3672
3493
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()
 
3494
    main()