/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-04-08 19:15:13 UTC
  • mfrom: (237.4.130 release)
  • Revision ID: teddy@recompile.se-20200408191513-n0ke303478rw1g0b
Merge from release branch

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-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
16
 
#
17
 
# This program is free software: you can redistribute it and/or modify
18
 
# it under the terms of the GNU General Public License as published by
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
15
# Copyright © 2008-2019 Björn Påhlsson
 
16
#
 
17
# This file is part of Mandos.
 
18
#
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
21
23
#
22
 
#     This program is distributed in the hope that it will be useful,
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
25
27
#     GNU General Public License for more details.
26
28
#
27
29
# You should have received a copy of the GNU General Public License
28
 
# along with this program.  If not, see
29
 
# <http://www.gnu.org/licenses/>.
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
30
31
#
31
32
# Contact the authors at <mandos@recompile.se>.
32
33
#
76
77
import itertools
77
78
import collections
78
79
import codecs
 
80
import unittest
 
81
import random
 
82
import shlex
79
83
 
80
84
import dbus
81
85
import dbus.service
 
86
import gi
82
87
from gi.repository import GLib
83
88
from dbus.mainloop.glib import DBusGMainLoop
84
89
import ctypes
86
91
import xml.dom.minidom
87
92
import inspect
88
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
 
89
118
# Try to find the value of SO_BINDTODEVICE:
90
119
try:
91
120
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
111
140
            # No value found
112
141
            SO_BINDTODEVICE = None
113
142
 
114
 
if sys.version_info.major == 2:
115
 
    str = unicode
 
143
if sys.version_info < (3, 2):
 
144
    configparser.Configparser = configparser.SafeConfigParser
116
145
 
117
 
version = "1.7.10"
 
146
version = "1.8.11"
118
147
stored_state_file = "clients.pickle"
119
148
 
120
149
logger = logging.getLogger()
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
121
151
syslogger = None
122
152
 
123
153
try:
178
208
    pass
179
209
 
180
210
 
181
 
class PGPEngine(object):
 
211
class PGPEngine:
182
212
    """A simple class for OpenPGP symmetric encryption & decryption"""
183
213
 
184
214
    def __init__(self):
188
218
            output = subprocess.check_output(["gpgconf"])
189
219
            for line in output.splitlines():
190
220
                name, text, path = line.split(b":")
191
 
                if name == "gpg":
 
221
                if name == b"gpg":
192
222
                    self.gpg = path
193
223
                    break
194
224
        except OSError as e:
199
229
                          '--force-mdc',
200
230
                          '--quiet']
201
231
        # Only GPG version 1 has the --no-use-agent option.
202
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
203
233
            self.gnupgargs.append("--no-use-agent")
204
234
 
205
235
    def __enter__(self):
274
304
 
275
305
 
276
306
# Pretend that we have an Avahi module
277
 
class Avahi(object):
278
 
    """This isn't so much a class as it is a module-like namespace.
279
 
    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."""
280
309
    IF_UNSPEC = -1               # avahi-common/address.h
281
310
    PROTO_UNSPEC = -1            # avahi-common/address.h
282
311
    PROTO_INET = 0               # avahi-common/address.h
286
315
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
316
    DBUS_PATH_SERVER = "/"
288
317
 
289
 
    def string_array_to_txt_array(self, t):
 
318
    @staticmethod
 
319
    def string_array_to_txt_array(t):
290
320
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
321
                           for s in t), signature="ay")
292
322
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
297
327
    SERVER_RUNNING = 2           # avahi-common/defs.h
298
328
    SERVER_COLLISION = 3         # avahi-common/defs.h
299
329
    SERVER_FAILURE = 4           # avahi-common/defs.h
300
 
avahi = Avahi()
301
330
 
302
331
 
303
332
class AvahiError(Exception):
315
344
    pass
316
345
 
317
346
 
318
 
class AvahiService(object):
 
347
class AvahiService:
319
348
    """An Avahi (Zeroconf) service.
320
349
 
321
350
    Attributes:
495
524
class AvahiServiceToSyslog(AvahiService):
496
525
    def rename(self, *args, **kwargs):
497
526
        """Add the new name to the syslog messages"""
498
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
528
        syslogger.setFormatter(logging.Formatter(
500
529
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
530
            .format(self.name)))
503
532
 
504
533
 
505
534
# Pretend that we have a GnuTLS module
506
 
class GnuTLS(object):
507
 
    """This isn't so much a class as it is a module-like namespace.
508
 
    It is instantiated once, and simulates having a GnuTLS module."""
509
 
 
510
 
    _library = ctypes.cdll.LoadLibrary(
511
 
        ctypes.util.find_library("gnutls"))
512
 
    _need_version = b"3.3.0"
513
 
 
514
 
    def __init__(self):
515
 
        # Need to use class name "GnuTLS" here, since this method is
516
 
        # called before the assignment to the "gnutls" global variable
517
 
        # happens.
518
 
        if GnuTLS.check_version(self._need_version) is None:
519
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
520
 
                               .format(self._need_version))
 
535
class gnutls:
 
536
    """This isn't so much a class as it is a module-like namespace."""
 
537
 
 
538
    library = ctypes.util.find_library("gnutls")
 
539
    if library is None:
 
540
        library = ctypes.util.find_library("gnutls-deb0")
 
541
    _library = ctypes.cdll.LoadLibrary(library)
 
542
    del library
521
543
 
522
544
    # Unless otherwise indicated, the constants and types below are
523
545
    # all from the gnutls/gnutls.h C header file.
527
549
    E_INTERRUPTED = -52
528
550
    E_AGAIN = -28
529
551
    CRT_OPENPGP = 2
 
552
    CRT_RAWPK = 3
530
553
    CLIENT = 2
531
554
    SHUT_RDWR = 0
532
555
    CRD_CERTIFICATE = 1
533
556
    E_NO_CERTIFICATE_FOUND = -49
 
557
    X509_FMT_DER = 0
 
558
    NO_TICKETS = 1<<10
 
559
    ENABLE_RAWPK = 1<<18
 
560
    CTYPE_PEERS = 3
 
561
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
534
562
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
535
563
 
536
564
    # Types
559
587
 
560
588
    # Exceptions
561
589
    class Error(Exception):
562
 
        # We need to use the class name "GnuTLS" here, since this
563
 
        # exception might be raised from within GnuTLS.__init__,
564
 
        # which is called before the assignment to the "gnutls"
565
 
        # global variable has happened.
566
590
        def __init__(self, message=None, code=None, args=()):
567
591
            # Default usage is by a message string, but if a return
568
592
            # code is passed, convert it to a string with
569
593
            # gnutls.strerror()
570
594
            self.code = code
571
595
            if message is None and code is not None:
572
 
                message = GnuTLS.strerror(code)
573
 
            return super(GnuTLS.Error, self).__init__(
 
596
                message = gnutls.strerror(code)
 
597
            return super(gnutls.Error, self).__init__(
574
598
                message, *args)
575
599
 
576
600
    class CertificateSecurityError(Error):
577
601
        pass
578
602
 
579
603
    # Classes
580
 
    class Credentials(object):
 
604
    class Credentials:
581
605
        def __init__(self):
582
606
            self._c_object = gnutls.certificate_credentials_t()
583
607
            gnutls.certificate_allocate_credentials(
587
611
        def __del__(self):
588
612
            gnutls.certificate_free_credentials(self._c_object)
589
613
 
590
 
    class ClientSession(object):
 
614
    class ClientSession:
591
615
        def __init__(self, socket, credentials=None):
592
616
            self._c_object = gnutls.session_t()
593
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
617
            gnutls_flags = gnutls.CLIENT
 
618
            if gnutls.check_version(b"3.5.6"):
 
619
                gnutls_flags |= gnutls.NO_TICKETS
 
620
            if gnutls.has_rawpk:
 
621
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
622
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
623
            del gnutls_flags
594
624
            gnutls.set_default_priority(self._c_object)
595
625
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
596
626
            gnutls.handshake_set_private_extensions(self._c_object,
728
758
    check_version.argtypes = [ctypes.c_char_p]
729
759
    check_version.restype = ctypes.c_char_p
730
760
 
731
 
    # All the function declarations below are from gnutls/openpgp.h
732
 
 
733
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
734
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
735
 
    openpgp_crt_init.restype = _error_code
736
 
 
737
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
738
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
739
 
                                   ctypes.POINTER(datum_t),
740
 
                                   openpgp_crt_fmt_t]
741
 
    openpgp_crt_import.restype = _error_code
742
 
 
743
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
744
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
745
 
                                        ctypes.POINTER(ctypes.c_uint)]
746
 
    openpgp_crt_verify_self.restype = _error_code
747
 
 
748
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
749
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
750
 
    openpgp_crt_deinit.restype = None
751
 
 
752
 
    openpgp_crt_get_fingerprint = (
753
 
        _library.gnutls_openpgp_crt_get_fingerprint)
754
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
755
 
                                            ctypes.c_void_p,
756
 
                                            ctypes.POINTER(
757
 
                                                ctypes.c_size_t)]
758
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
761
    _need_version = b"3.3.0"
 
762
    if check_version(_need_version) is None:
 
763
        raise self.Error("Needs GnuTLS {} or later"
 
764
                         .format(_need_version))
 
765
 
 
766
    _tls_rawpk_version = b"3.6.6"
 
767
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
768
 
 
769
    if has_rawpk:
 
770
        # Types
 
771
        class pubkey_st(ctypes.Structure):
 
772
            _fields = []
 
773
        pubkey_t = ctypes.POINTER(pubkey_st)
 
774
 
 
775
        x509_crt_fmt_t = ctypes.c_int
 
776
 
 
777
        # All the function declarations below are from gnutls/abstract.h
 
778
        pubkey_init = _library.gnutls_pubkey_init
 
779
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
780
        pubkey_init.restype = _error_code
 
781
 
 
782
        pubkey_import = _library.gnutls_pubkey_import
 
783
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
784
                                  x509_crt_fmt_t]
 
785
        pubkey_import.restype = _error_code
 
786
 
 
787
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
788
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
789
                                      ctypes.POINTER(ctypes.c_ubyte),
 
790
                                      ctypes.POINTER(ctypes.c_size_t)]
 
791
        pubkey_get_key_id.restype = _error_code
 
792
 
 
793
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
794
        pubkey_deinit.argtypes = [pubkey_t]
 
795
        pubkey_deinit.restype = None
 
796
    else:
 
797
        # All the function declarations below are from gnutls/openpgp.h
 
798
 
 
799
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
800
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
801
        openpgp_crt_init.restype = _error_code
 
802
 
 
803
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
804
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
805
                                       ctypes.POINTER(datum_t),
 
806
                                       openpgp_crt_fmt_t]
 
807
        openpgp_crt_import.restype = _error_code
 
808
 
 
809
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
810
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
811
                                            ctypes.POINTER(ctypes.c_uint)]
 
812
        openpgp_crt_verify_self.restype = _error_code
 
813
 
 
814
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
815
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
816
        openpgp_crt_deinit.restype = None
 
817
 
 
818
        openpgp_crt_get_fingerprint = (
 
819
            _library.gnutls_openpgp_crt_get_fingerprint)
 
820
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
821
                                                ctypes.c_void_p,
 
822
                                                ctypes.POINTER(
 
823
                                                    ctypes.c_size_t)]
 
824
        openpgp_crt_get_fingerprint.restype = _error_code
 
825
 
 
826
    if check_version(b"3.6.4"):
 
827
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
828
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
829
        certificate_type_get2.restype = _error_code
759
830
 
760
831
    # Remove non-public functions
761
832
    del _error_code, _retry_on_error
762
 
# Create the global "gnutls" object, simulating a module
763
 
gnutls = GnuTLS()
764
833
 
765
834
 
766
835
def call_pipe(connection,       # : multiprocessing.Connection
774
843
    connection.close()
775
844
 
776
845
 
777
 
class Client(object):
 
846
class Client:
778
847
    """A representation of a client host served by this server.
779
848
 
780
849
    Attributes:
781
850
    approved:   bool(); 'None' if not yet approved/disapproved
782
851
    approval_delay: datetime.timedelta(); Time to wait for approval
783
852
    approval_duration: datetime.timedelta(); Duration of one approval
784
 
    checker:    subprocess.Popen(); a running checker process used
785
 
                                    to see if the client lives.
786
 
                                    'None' if no process is running.
 
853
    checker: multiprocessing.Process(); a running checker process used
 
854
             to see if the client lives. 'None' if no process is
 
855
             running.
787
856
    checker_callback_tag: a GLib event source tag, or None
788
857
    checker_command: string; External command which is run to check
789
858
                     if client lives.  %() expansions are done at
797
866
    disable_initiator_tag: a GLib event source tag, or None
798
867
    enabled:    bool()
799
868
    fingerprint: string (40 or 32 hexadecimal digits); used to
800
 
                 uniquely identify the client
 
869
                 uniquely identify an OpenPGP client
 
870
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
871
            a client using raw public keys
801
872
    host:       string; available for use by the checker command
802
873
    interval:   datetime.timedelta(); How often to start a new checker
803
874
    last_approval_request: datetime.datetime(); (UTC) or None
821
892
    """
822
893
 
823
894
    runtime_expansions = ("approval_delay", "approval_duration",
824
 
                          "created", "enabled", "expires",
 
895
                          "created", "enabled", "expires", "key_id",
825
896
                          "fingerprint", "host", "interval",
826
897
                          "last_approval_request", "last_checked_ok",
827
898
                          "last_enabled", "name", "timeout")
857
928
            client["enabled"] = config.getboolean(client_name,
858
929
                                                  "enabled")
859
930
 
860
 
            # Uppercase and remove spaces from fingerprint for later
861
 
            # comparison purposes with return value from the
862
 
            # fingerprint() function
 
931
            # Uppercase and remove spaces from key_id and fingerprint
 
932
            # for later comparison purposes with return value from the
 
933
            # key_id() and fingerprint() functions
 
934
            client["key_id"] = (section.get("key_id", "").upper()
 
935
                                .replace(" ", ""))
863
936
            client["fingerprint"] = (section["fingerprint"].upper()
864
937
                                     .replace(" ", ""))
865
938
            if "secret" in section:
909
982
            self.expires = None
910
983
 
911
984
        logger.debug("Creating client %r", self.name)
 
985
        logger.debug("  Key ID: %s", self.key_id)
912
986
        logger.debug("  Fingerprint: %s", self.fingerprint)
913
987
        self.created = settings.get("created",
914
988
                                    datetime.datetime.utcnow())
978
1052
        if self.checker_initiator_tag is not None:
979
1053
            GLib.source_remove(self.checker_initiator_tag)
980
1054
        self.checker_initiator_tag = GLib.timeout_add(
981
 
            int(self.interval.total_seconds() * 1000),
 
1055
            random.randrange(int(self.interval.total_seconds() * 1000
 
1056
                                 + 1)),
982
1057
            self.start_checker)
983
1058
        # Schedule a disable() when 'timeout' has passed
984
1059
        if self.disable_initiator_tag is not None:
991
1066
    def checker_callback(self, source, condition, connection,
992
1067
                         command):
993
1068
        """The checker has completed, so take appropriate actions."""
994
 
        self.checker_callback_tag = None
995
 
        self.checker = None
996
1069
        # Read return code from connection (see call_pipe)
997
1070
        returncode = connection.recv()
998
1071
        connection.close()
 
1072
        if self.checker is not None:
 
1073
            self.checker.join()
 
1074
        self.checker_callback_tag = None
 
1075
        self.checker = None
999
1076
 
1000
1077
        if returncode >= 0:
1001
1078
            self.last_checker_status = returncode
1057
1134
        if self.checker is None:
1058
1135
            # Escape attributes for the shell
1059
1136
            escaped_attrs = {
1060
 
                attr: re.escape(str(getattr(self, attr)))
 
1137
                attr: shlex.quote(str(getattr(self, attr)))
1061
1138
                for attr in self.runtime_expansions}
1062
1139
            try:
1063
1140
                command = self.checker_command % escaped_attrs
1090
1167
                kwargs=popen_args)
1091
1168
            self.checker.start()
1092
1169
            self.checker_callback_tag = GLib.io_add_watch(
1093
 
                pipe[0].fileno(), GLib.IO_IN,
 
1170
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1171
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1094
1172
                self.checker_callback, pipe[0], command)
1095
1173
        # Re-run this periodically if run by GLib.timeout_add
1096
1174
        return True
1351
1429
                raise ValueError("Byte arrays not supported for non-"
1352
1430
                                 "'ay' signature {!r}"
1353
1431
                                 .format(prop._dbus_signature))
1354
 
            value = dbus.ByteArray(b''.join(chr(byte)
1355
 
                                            for byte in value))
 
1432
            value = dbus.ByteArray(bytes(value))
1356
1433
        prop(value)
1357
1434
 
1358
1435
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1458
1535
                         exc_info=error)
1459
1536
        return xmlstring
1460
1537
 
 
1538
 
1461
1539
try:
1462
1540
    dbus.OBJECT_MANAGER_IFACE
1463
1541
except AttributeError:
1995
2073
    def Name_dbus_property(self):
1996
2074
        return dbus.String(self.name)
1997
2075
 
 
2076
    # KeyID - property
 
2077
    @dbus_annotations(
 
2078
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2079
    @dbus_service_property(_interface, signature="s", access="read")
 
2080
    def KeyID_dbus_property(self):
 
2081
        return dbus.String(self.key_id)
 
2082
 
1998
2083
    # Fingerprint - property
1999
2084
    @dbus_annotations(
2000
2085
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2155
2240
    del _interface
2156
2241
 
2157
2242
 
2158
 
class ProxyClient(object):
2159
 
    def __init__(self, child_pipe, fpr, address):
 
2243
class ProxyClient:
 
2244
    def __init__(self, child_pipe, key_id, fpr, address):
2160
2245
        self._pipe = child_pipe
2161
 
        self._pipe.send(('init', fpr, address))
 
2246
        self._pipe.send(('init', key_id, fpr, address))
2162
2247
        if not self._pipe.recv():
2163
 
            raise KeyError(fpr)
 
2248
            raise KeyError(key_id or fpr)
2164
2249
 
2165
2250
    def __getattribute__(self, name):
2166
2251
        if name == '_pipe':
2233
2318
 
2234
2319
            approval_required = False
2235
2320
            try:
2236
 
                try:
2237
 
                    fpr = self.fingerprint(
2238
 
                        self.peer_certificate(session))
2239
 
                except (TypeError, gnutls.Error) as error:
2240
 
                    logger.warning("Bad certificate: %s", error)
2241
 
                    return
2242
 
                logger.debug("Fingerprint: %s", fpr)
2243
 
 
2244
 
                try:
2245
 
                    client = ProxyClient(child_pipe, fpr,
 
2321
                if gnutls.has_rawpk:
 
2322
                    fpr = b""
 
2323
                    try:
 
2324
                        key_id = self.key_id(
 
2325
                            self.peer_certificate(session))
 
2326
                    except (TypeError, gnutls.Error) as error:
 
2327
                        logger.warning("Bad certificate: %s", error)
 
2328
                        return
 
2329
                    logger.debug("Key ID: %s", key_id)
 
2330
 
 
2331
                else:
 
2332
                    key_id = b""
 
2333
                    try:
 
2334
                        fpr = self.fingerprint(
 
2335
                            self.peer_certificate(session))
 
2336
                    except (TypeError, gnutls.Error) as error:
 
2337
                        logger.warning("Bad certificate: %s", error)
 
2338
                        return
 
2339
                    logger.debug("Fingerprint: %s", fpr)
 
2340
 
 
2341
                try:
 
2342
                    client = ProxyClient(child_pipe, key_id, fpr,
2246
2343
                                         self.client_address)
2247
2344
                except KeyError:
2248
2345
                    return
2325
2422
 
2326
2423
    @staticmethod
2327
2424
    def peer_certificate(session):
2328
 
        "Return the peer's OpenPGP certificate as a bytestring"
2329
 
        # If not an OpenPGP certificate...
2330
 
        if (gnutls.certificate_type_get(session._c_object)
2331
 
            != gnutls.CRT_OPENPGP):
 
2425
        "Return the peer's certificate as a bytestring"
 
2426
        try:
 
2427
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2428
                                                     gnutls.CTYPE_PEERS)
 
2429
        except AttributeError:
 
2430
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2431
        if gnutls.has_rawpk:
 
2432
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2433
        else:
 
2434
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2435
        # If not a valid certificate type...
 
2436
        if cert_type not in valid_cert_types:
 
2437
            logger.info("Cert type %r not in %r", cert_type,
 
2438
                        valid_cert_types)
2332
2439
            # ...return invalid data
2333
2440
            return b""
2334
2441
        list_size = ctypes.c_uint(1)
2342
2449
        return ctypes.string_at(cert.data, cert.size)
2343
2450
 
2344
2451
    @staticmethod
 
2452
    def key_id(certificate):
 
2453
        "Convert a certificate bytestring to a hexdigit key ID"
 
2454
        # New GnuTLS "datum" with the public key
 
2455
        datum = gnutls.datum_t(
 
2456
            ctypes.cast(ctypes.c_char_p(certificate),
 
2457
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2458
            ctypes.c_uint(len(certificate)))
 
2459
        # XXX all these need to be created in the gnutls "module"
 
2460
        # New empty GnuTLS certificate
 
2461
        pubkey = gnutls.pubkey_t()
 
2462
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2463
        # Import the raw public key into the certificate
 
2464
        gnutls.pubkey_import(pubkey,
 
2465
                             ctypes.byref(datum),
 
2466
                             gnutls.X509_FMT_DER)
 
2467
        # New buffer for the key ID
 
2468
        buf = ctypes.create_string_buffer(32)
 
2469
        buf_len = ctypes.c_size_t(len(buf))
 
2470
        # Get the key ID from the raw public key into the buffer
 
2471
        gnutls.pubkey_get_key_id(pubkey,
 
2472
                                 gnutls.KEYID_USE_SHA256,
 
2473
                                 ctypes.cast(ctypes.byref(buf),
 
2474
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2475
                                 ctypes.byref(buf_len))
 
2476
        # Deinit the certificate
 
2477
        gnutls.pubkey_deinit(pubkey)
 
2478
 
 
2479
        # Convert the buffer to a Python bytestring
 
2480
        key_id = ctypes.string_at(buf, buf_len.value)
 
2481
        # Convert the bytestring to hexadecimal notation
 
2482
        hex_key_id = binascii.hexlify(key_id).upper()
 
2483
        return hex_key_id
 
2484
 
 
2485
    @staticmethod
2345
2486
    def fingerprint(openpgp):
2346
2487
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2347
2488
        # New GnuTLS "datum" with the OpenPGP public key
2361
2502
                                       ctypes.byref(crtverify))
2362
2503
        if crtverify.value != 0:
2363
2504
            gnutls.openpgp_crt_deinit(crt)
2364
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2505
            raise gnutls.CertificateSecurityError(code
 
2506
                                                  =crtverify.value)
2365
2507
        # New buffer for the fingerprint
2366
2508
        buf = ctypes.create_string_buffer(20)
2367
2509
        buf_len = ctypes.c_size_t()
2377
2519
        return hex_fpr
2378
2520
 
2379
2521
 
2380
 
class MultiprocessingMixIn(object):
 
2522
class MultiprocessingMixIn:
2381
2523
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2382
2524
 
2383
2525
    def sub_process_main(self, request, address):
2395
2537
        return proc
2396
2538
 
2397
2539
 
2398
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2540
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2399
2541
    """ adds a pipe to the MixIn """
2400
2542
 
2401
2543
    def process_request(self, request, client_address):
2416
2558
 
2417
2559
 
2418
2560
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2419
 
                     socketserver.TCPServer, object):
 
2561
                     socketserver.TCPServer):
2420
2562
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2421
2563
 
2422
2564
    Attributes:
2495
2637
                    raise
2496
2638
        # Only bind(2) the socket if we really need to.
2497
2639
        if self.server_address[0] or self.server_address[1]:
 
2640
            if self.server_address[1]:
 
2641
                self.allow_reuse_address = True
2498
2642
            if not self.server_address[0]:
2499
2643
                if self.address_family == socket.AF_INET6:
2500
2644
                    any_address = "::"  # in6addr_any
2553
2697
    def add_pipe(self, parent_pipe, proc):
2554
2698
        # Call "handle_ipc" for both data and EOF events
2555
2699
        GLib.io_add_watch(
2556
 
            parent_pipe.fileno(),
2557
 
            GLib.IO_IN | GLib.IO_HUP,
 
2700
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2701
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2558
2702
            functools.partial(self.handle_ipc,
2559
2703
                              parent_pipe=parent_pipe,
2560
2704
                              proc=proc))
2574
2718
        command = request[0]
2575
2719
 
2576
2720
        if command == 'init':
2577
 
            fpr = request[1]
2578
 
            address = request[2]
 
2721
            key_id = request[1].decode("ascii")
 
2722
            fpr = request[2].decode("ascii")
 
2723
            address = request[3]
2579
2724
 
2580
2725
            for c in self.clients.values():
2581
 
                if c.fingerprint == fpr:
 
2726
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2727
                    continue
 
2728
                if key_id and c.key_id == key_id:
 
2729
                    client = c
 
2730
                    break
 
2731
                if fpr and c.fingerprint == fpr:
2582
2732
                    client = c
2583
2733
                    break
2584
2734
            else:
2585
 
                logger.info("Client not found for fingerprint: %s, ad"
2586
 
                            "dress: %s", fpr, address)
 
2735
                logger.info("Client not found for key ID: %s, address"
 
2736
                            ": %s", key_id or fpr, address)
2587
2737
                if self.use_dbus:
2588
2738
                    # Emit D-Bus signal
2589
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2739
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2590
2740
                                                       address[0])
2591
2741
                parent_pipe.send(False)
2592
2742
                return False
2593
2743
 
2594
2744
            GLib.io_add_watch(
2595
 
                parent_pipe.fileno(),
2596
 
                GLib.IO_IN | GLib.IO_HUP,
 
2745
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2746
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2597
2747
                functools.partial(self.handle_ipc,
2598
2748
                                  parent_pipe=parent_pipe,
2599
2749
                                  proc=proc,
2614
2764
        if command == 'getattr':
2615
2765
            attrname = request[1]
2616
2766
            if isinstance(client_object.__getattribute__(attrname),
2617
 
                          collections.Callable):
 
2767
                          collections.abc.Callable):
2618
2768
                parent_pipe.send(('function', ))
2619
2769
            else:
2620
2770
                parent_pipe.send((
2631
2781
def rfc3339_duration_to_delta(duration):
2632
2782
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2633
2783
 
2634
 
    >>> rfc3339_duration_to_delta("P7D")
2635
 
    datetime.timedelta(7)
2636
 
    >>> rfc3339_duration_to_delta("PT60S")
2637
 
    datetime.timedelta(0, 60)
2638
 
    >>> rfc3339_duration_to_delta("PT60M")
2639
 
    datetime.timedelta(0, 3600)
2640
 
    >>> rfc3339_duration_to_delta("PT24H")
2641
 
    datetime.timedelta(1)
2642
 
    >>> rfc3339_duration_to_delta("P1W")
2643
 
    datetime.timedelta(7)
2644
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2645
 
    datetime.timedelta(0, 330)
2646
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2647
 
    datetime.timedelta(1, 200)
 
2784
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2785
    True
 
2786
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2787
    True
 
2788
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2789
    True
 
2790
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2791
    True
 
2792
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2793
    True
 
2794
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2795
    True
 
2796
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2797
    True
2648
2798
    """
2649
2799
 
2650
2800
    # Parsing an RFC 3339 duration with regular expressions is not
2730
2880
def string_to_delta(interval):
2731
2881
    """Parse a string and return a datetime.timedelta
2732
2882
 
2733
 
    >>> string_to_delta('7d')
2734
 
    datetime.timedelta(7)
2735
 
    >>> string_to_delta('60s')
2736
 
    datetime.timedelta(0, 60)
2737
 
    >>> string_to_delta('60m')
2738
 
    datetime.timedelta(0, 3600)
2739
 
    >>> string_to_delta('24h')
2740
 
    datetime.timedelta(1)
2741
 
    >>> string_to_delta('1w')
2742
 
    datetime.timedelta(7)
2743
 
    >>> string_to_delta('5m 30s')
2744
 
    datetime.timedelta(0, 330)
 
2883
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2884
    True
 
2885
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2886
    True
 
2887
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2888
    True
 
2889
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2890
    True
 
2891
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2892
    True
 
2893
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
2894
    True
2745
2895
    """
2746
2896
 
2747
2897
    try:
2849
2999
 
2850
3000
    options = parser.parse_args()
2851
3001
 
2852
 
    if options.check:
2853
 
        import doctest
2854
 
        fail_count, test_count = doctest.testmod()
2855
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2856
 
 
2857
3002
    # Default values for config file for server-global settings
 
3003
    if gnutls.has_rawpk:
 
3004
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
3005
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
3006
    else:
 
3007
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
3008
                    ":+SIGN-DSA-SHA256")
2858
3009
    server_defaults = {"interface": "",
2859
3010
                       "address": "",
2860
3011
                       "port": "",
2861
3012
                       "debug": "False",
2862
 
                       "priority":
2863
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2864
 
                       ":+SIGN-DSA-SHA256",
 
3013
                       "priority": priority,
2865
3014
                       "servicename": "Mandos",
2866
3015
                       "use_dbus": "True",
2867
3016
                       "use_ipv6": "True",
2872
3021
                       "foreground": "False",
2873
3022
                       "zeroconf": "True",
2874
3023
                       }
 
3024
    del priority
2875
3025
 
2876
3026
    # Parse config file for server-global settings
2877
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
3027
    server_config = configparser.ConfigParser(server_defaults)
2878
3028
    del server_defaults
2879
3029
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2880
 
    # Convert the SafeConfigParser object to a dict
 
3030
    # Convert the ConfigParser object to a dict
2881
3031
    server_settings = server_config.defaults()
2882
3032
    # Use the appropriate methods on the non-string config options
2883
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
3033
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3034
                   "foreground", "zeroconf"):
2884
3035
        server_settings[option] = server_config.getboolean("DEFAULT",
2885
3036
                                                           option)
2886
3037
    if server_settings["port"]:
2954
3105
                                  server_settings["servicename"])))
2955
3106
 
2956
3107
    # Parse config file with clients
2957
 
    client_config = configparser.SafeConfigParser(Client
2958
 
                                                  .client_defaults)
 
3108
    client_config = configparser.ConfigParser(Client.client_defaults)
2959
3109
    client_config.read(os.path.join(server_settings["configdir"],
2960
3110
                                    "clients.conf"))
2961
3111
 
3032
3182
        # Close all input and output, do double fork, etc.
3033
3183
        daemon()
3034
3184
 
3035
 
    # multiprocessing will use threads, so before we use GLib we need
3036
 
    # to inform GLib that threads will be used.
3037
 
    GLib.threads_init()
 
3185
    if gi.version_info < (3, 10, 2):
 
3186
        # multiprocessing will use threads, so before we use GLib we
 
3187
        # need to inform GLib that threads will be used.
 
3188
        GLib.threads_init()
3038
3189
 
3039
3190
    global main_loop
3040
3191
    # From the Avahi example code
3116
3267
                             if isinstance(s, bytes)
3117
3268
                             else s) for s in
3118
3269
                            value["client_structure"]]
3119
 
                        # .name & .host
3120
 
                        for k in ("name", "host"):
 
3270
                        # .name, .host, and .checker_command
 
3271
                        for k in ("name", "host", "checker_command"):
3121
3272
                            if isinstance(value[k], bytes):
3122
3273
                                value[k] = value[k].decode("utf-8")
 
3274
                        if "key_id" not in value:
 
3275
                            value["key_id"] = ""
 
3276
                        elif "fingerprint" not in value:
 
3277
                            value["fingerprint"] = ""
3123
3278
                    #  old_client_settings
3124
3279
                    # .keys()
3125
3280
                    old_client_settings = {
3129
3284
                        for key, value in
3130
3285
                        bytes_old_client_settings.items()}
3131
3286
                    del bytes_old_client_settings
3132
 
                    # .host
 
3287
                    # .host and .checker_command
3133
3288
                    for value in old_client_settings.values():
3134
 
                        if isinstance(value["host"], bytes):
3135
 
                            value["host"] = (value["host"]
3136
 
                                             .decode("utf-8"))
 
3289
                        for attribute in ("host", "checker_command"):
 
3290
                            if isinstance(value[attribute], bytes):
 
3291
                                value[attribute] = (value[attribute]
 
3292
                                                    .decode("utf-8"))
3137
3293
            os.remove(stored_state_path)
3138
3294
        except IOError as e:
3139
3295
            if e.errno == errno.ENOENT:
3262
3418
                pass
3263
3419
 
3264
3420
            @dbus.service.signal(_interface, signature="ss")
3265
 
            def ClientNotFound(self, fingerprint, address):
 
3421
            def ClientNotFound(self, key_id, address):
3266
3422
                "D-Bus signal"
3267
3423
                pass
3268
3424
 
3464
3620
                sys.exit(1)
3465
3621
            # End of Avahi example code
3466
3622
 
3467
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3468
 
                          lambda *args, **kwargs:
3469
 
                          (tcp_server.handle_request
3470
 
                           (*args[2:], **kwargs) or True))
 
3623
        GLib.io_add_watch(
 
3624
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3625
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3626
            lambda *args, **kwargs: (tcp_server.handle_request
 
3627
                                     (*args[2:], **kwargs) or True))
3471
3628
 
3472
3629
        logger.debug("Starting main loop")
3473
3630
        main_loop.run()
3483
3640
    # Must run before the D-Bus bus name gets deregistered
3484
3641
    cleanup()
3485
3642
 
 
3643
 
 
3644
def should_only_run_tests():
 
3645
    parser = argparse.ArgumentParser(add_help=False)
 
3646
    parser.add_argument("--check", action='store_true')
 
3647
    args, unknown_args = parser.parse_known_args()
 
3648
    run_tests = args.check
 
3649
    if run_tests:
 
3650
        # Remove --check argument from sys.argv
 
3651
        sys.argv[1:] = unknown_args
 
3652
    return run_tests
 
3653
 
 
3654
# Add all tests from doctest strings
 
3655
def load_tests(loader, tests, none):
 
3656
    import doctest
 
3657
    tests.addTests(doctest.DocTestSuite())
 
3658
    return tests
3486
3659
 
3487
3660
if __name__ == '__main__':
3488
 
    main()
 
3661
    try:
 
3662
        if should_only_run_tests():
 
3663
            # Call using ./mandos --check [--verbose]
 
3664
            unittest.main()
 
3665
        else:
 
3666
            main()
 
3667
    finally:
 
3668
        logging.shutdown()