/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: 2021-01-31 21:40:15 UTC
  • Revision ID: teddy@recompile.se-20210131214015-yz7ogk2mqfdfflo6
Work around Debian bug #981302

* plugin-runner.c (main): If the /dev/fd symlink is missing, create
  it.
* plugins.d/mandos-client.c (main): - '' -

Reported-By: Eero Häkkinen <+debian-bts-2021@eero.xn--hkkinen-5wa.fi>
Suggested-by: Eero Häkkinen <+debian-bts-2021@eero.xn--hkkinen-5wa.fi>
Thanks: Eero Häkkinen for bug report and analysis

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-2020 Teddy Hogeborn
 
15
# Copyright © 2008-2020 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.13"
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,
 
528
                                                       **kwargs)
499
529
        syslogger.setFormatter(logging.Formatter(
500
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
531
            .format(self.name)))
503
533
 
504
534
 
505
535
# 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))
 
536
class gnutls:
 
537
    """This isn't so much a class as it is a module-like namespace."""
 
538
 
 
539
    library = ctypes.util.find_library("gnutls")
 
540
    if library is None:
 
541
        library = ctypes.util.find_library("gnutls-deb0")
 
542
    _library = ctypes.cdll.LoadLibrary(library)
 
543
    del library
521
544
 
522
545
    # Unless otherwise indicated, the constants and types below are
523
546
    # all from the gnutls/gnutls.h C header file.
527
550
    E_INTERRUPTED = -52
528
551
    E_AGAIN = -28
529
552
    CRT_OPENPGP = 2
 
553
    CRT_RAWPK = 3
530
554
    CLIENT = 2
531
555
    SHUT_RDWR = 0
532
556
    CRD_CERTIFICATE = 1
533
557
    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
534
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
535
564
 
536
565
    # Types
559
588
 
560
589
    # Exceptions
561
590
    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
591
        def __init__(self, message=None, code=None, args=()):
567
592
            # Default usage is by a message string, but if a return
568
593
            # code is passed, convert it to a string with
569
594
            # gnutls.strerror()
570
595
            self.code = code
571
596
            if message is None and code is not None:
572
 
                message = GnuTLS.strerror(code)
573
 
            return super(GnuTLS.Error, self).__init__(
 
597
                message = gnutls.strerror(code)
 
598
            return super(gnutls.Error, self).__init__(
574
599
                message, *args)
575
600
 
576
601
    class CertificateSecurityError(Error):
577
602
        pass
578
603
 
579
604
    # Classes
580
 
    class Credentials(object):
 
605
    class Credentials:
581
606
        def __init__(self):
582
607
            self._c_object = gnutls.certificate_credentials_t()
583
608
            gnutls.certificate_allocate_credentials(
587
612
        def __del__(self):
588
613
            gnutls.certificate_free_credentials(self._c_object)
589
614
 
590
 
    class ClientSession(object):
 
615
    class ClientSession:
591
616
        def __init__(self, socket, credentials=None):
592
617
            self._c_object = gnutls.session_t()
593
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
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
594
625
            gnutls.set_default_priority(self._c_object)
595
626
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
596
627
            gnutls.handshake_set_private_extensions(self._c_object,
728
759
    check_version.argtypes = [ctypes.c_char_p]
729
760
    check_version.restype = ctypes.c_char_p
730
761
 
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
 
762
    _need_version = b"3.3.0"
 
763
    if check_version(_need_version) is None:
 
764
        raise self.Error("Needs GnuTLS {} or later"
 
765
                         .format(_need_version))
 
766
 
 
767
    _tls_rawpk_version = b"3.6.6"
 
768
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
769
 
 
770
    if has_rawpk:
 
771
        # Types
 
772
        class pubkey_st(ctypes.Structure):
 
773
            _fields = []
 
774
        pubkey_t = ctypes.POINTER(pubkey_st)
 
775
 
 
776
        x509_crt_fmt_t = ctypes.c_int
 
777
 
 
778
        # All the function declarations below are from
 
779
        # gnutls/abstract.h
 
780
        pubkey_init = _library.gnutls_pubkey_init
 
781
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
782
        pubkey_init.restype = _error_code
 
783
 
 
784
        pubkey_import = _library.gnutls_pubkey_import
 
785
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
786
                                  x509_crt_fmt_t]
 
787
        pubkey_import.restype = _error_code
 
788
 
 
789
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
790
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
791
                                      ctypes.POINTER(ctypes.c_ubyte),
 
792
                                      ctypes.POINTER(ctypes.c_size_t)]
 
793
        pubkey_get_key_id.restype = _error_code
 
794
 
 
795
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
796
        pubkey_deinit.argtypes = [pubkey_t]
 
797
        pubkey_deinit.restype = None
 
798
    else:
 
799
        # All the function declarations below are from
 
800
        # gnutls/openpgp.h
 
801
 
 
802
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
803
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
804
        openpgp_crt_init.restype = _error_code
 
805
 
 
806
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
807
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
808
                                       ctypes.POINTER(datum_t),
 
809
                                       openpgp_crt_fmt_t]
 
810
        openpgp_crt_import.restype = _error_code
 
811
 
 
812
        openpgp_crt_verify_self = \
 
813
            _library.gnutls_openpgp_crt_verify_self
 
814
        openpgp_crt_verify_self.argtypes = [
 
815
            openpgp_crt_t,
 
816
            ctypes.c_uint,
 
817
            ctypes.POINTER(ctypes.c_uint),
 
818
        ]
 
819
        openpgp_crt_verify_self.restype = _error_code
 
820
 
 
821
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
822
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
823
        openpgp_crt_deinit.restype = None
 
824
 
 
825
        openpgp_crt_get_fingerprint = (
 
826
            _library.gnutls_openpgp_crt_get_fingerprint)
 
827
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
828
                                                ctypes.c_void_p,
 
829
                                                ctypes.POINTER(
 
830
                                                    ctypes.c_size_t)]
 
831
        openpgp_crt_get_fingerprint.restype = _error_code
 
832
 
 
833
    if check_version(b"3.6.4"):
 
834
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
835
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
836
        certificate_type_get2.restype = _error_code
759
837
 
760
838
    # Remove non-public functions
761
839
    del _error_code, _retry_on_error
762
 
# Create the global "gnutls" object, simulating a module
763
 
gnutls = GnuTLS()
764
840
 
765
841
 
766
842
def call_pipe(connection,       # : multiprocessing.Connection
774
850
    connection.close()
775
851
 
776
852
 
777
 
class Client(object):
 
853
class Client:
778
854
    """A representation of a client host served by this server.
779
855
 
780
856
    Attributes:
781
857
    approved:   bool(); 'None' if not yet approved/disapproved
782
858
    approval_delay: datetime.timedelta(); Time to wait for approval
783
859
    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.
 
860
    checker: multiprocessing.Process(); a running checker process used
 
861
             to see if the client lives. 'None' if no process is
 
862
             running.
787
863
    checker_callback_tag: a GLib event source tag, or None
788
864
    checker_command: string; External command which is run to check
789
865
                     if client lives.  %() expansions are done at
797
873
    disable_initiator_tag: a GLib event source tag, or None
798
874
    enabled:    bool()
799
875
    fingerprint: string (40 or 32 hexadecimal digits); used to
800
 
                 uniquely identify the client
 
876
                 uniquely identify an OpenPGP client
 
877
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
878
            a client using raw public keys
801
879
    host:       string; available for use by the checker command
802
880
    interval:   datetime.timedelta(); How often to start a new checker
803
881
    last_approval_request: datetime.datetime(); (UTC) or None
821
899
    """
822
900
 
823
901
    runtime_expansions = ("approval_delay", "approval_duration",
824
 
                          "created", "enabled", "expires",
 
902
                          "created", "enabled", "expires", "key_id",
825
903
                          "fingerprint", "host", "interval",
826
904
                          "last_approval_request", "last_checked_ok",
827
905
                          "last_enabled", "name", "timeout")
857
935
            client["enabled"] = config.getboolean(client_name,
858
936
                                                  "enabled")
859
937
 
860
 
            # Uppercase and remove spaces from fingerprint for later
861
 
            # comparison purposes with return value from the
862
 
            # fingerprint() function
 
938
            # Uppercase and remove spaces from key_id and fingerprint
 
939
            # for later comparison purposes with return value from the
 
940
            # key_id() and fingerprint() functions
 
941
            client["key_id"] = (section.get("key_id", "").upper()
 
942
                                .replace(" ", ""))
863
943
            client["fingerprint"] = (section["fingerprint"].upper()
864
944
                                     .replace(" ", ""))
865
945
            if "secret" in section:
909
989
            self.expires = None
910
990
 
911
991
        logger.debug("Creating client %r", self.name)
 
992
        logger.debug("  Key ID: %s", self.key_id)
912
993
        logger.debug("  Fingerprint: %s", self.fingerprint)
913
994
        self.created = settings.get("created",
914
995
                                    datetime.datetime.utcnow())
978
1059
        if self.checker_initiator_tag is not None:
979
1060
            GLib.source_remove(self.checker_initiator_tag)
980
1061
        self.checker_initiator_tag = GLib.timeout_add(
981
 
            int(self.interval.total_seconds() * 1000),
 
1062
            random.randrange(int(self.interval.total_seconds() * 1000
 
1063
                                 + 1)),
982
1064
            self.start_checker)
983
1065
        # Schedule a disable() when 'timeout' has passed
984
1066
        if self.disable_initiator_tag is not None:
991
1073
    def checker_callback(self, source, condition, connection,
992
1074
                         command):
993
1075
        """The checker has completed, so take appropriate actions."""
994
 
        self.checker_callback_tag = None
995
 
        self.checker = None
996
1076
        # Read return code from connection (see call_pipe)
997
1077
        returncode = connection.recv()
998
1078
        connection.close()
 
1079
        if self.checker is not None:
 
1080
            self.checker.join()
 
1081
        self.checker_callback_tag = None
 
1082
        self.checker = None
999
1083
 
1000
1084
        if returncode >= 0:
1001
1085
            self.last_checker_status = returncode
1057
1141
        if self.checker is None:
1058
1142
            # Escape attributes for the shell
1059
1143
            escaped_attrs = {
1060
 
                attr: re.escape(str(getattr(self, attr)))
 
1144
                attr: shlex.quote(str(getattr(self, attr)))
1061
1145
                for attr in self.runtime_expansions}
1062
1146
            try:
1063
1147
                command = self.checker_command % escaped_attrs
1090
1174
                kwargs=popen_args)
1091
1175
            self.checker.start()
1092
1176
            self.checker_callback_tag = GLib.io_add_watch(
1093
 
                pipe[0].fileno(), GLib.IO_IN,
 
1177
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1178
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1094
1179
                self.checker_callback, pipe[0], command)
1095
1180
        # Re-run this periodically if run by GLib.timeout_add
1096
1181
        return True
1351
1436
                raise ValueError("Byte arrays not supported for non-"
1352
1437
                                 "'ay' signature {!r}"
1353
1438
                                 .format(prop._dbus_signature))
1354
 
            value = dbus.ByteArray(b''.join(chr(byte)
1355
 
                                            for byte in value))
 
1439
            value = dbus.ByteArray(bytes(value))
1356
1440
        prop(value)
1357
1441
 
1358
1442
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1458
1542
                         exc_info=error)
1459
1543
        return xmlstring
1460
1544
 
 
1545
 
1461
1546
try:
1462
1547
    dbus.OBJECT_MANAGER_IFACE
1463
1548
except AttributeError:
1995
2080
    def Name_dbus_property(self):
1996
2081
        return dbus.String(self.name)
1997
2082
 
 
2083
    # KeyID - property
 
2084
    @dbus_annotations(
 
2085
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2086
    @dbus_service_property(_interface, signature="s", access="read")
 
2087
    def KeyID_dbus_property(self):
 
2088
        return dbus.String(self.key_id)
 
2089
 
1998
2090
    # Fingerprint - property
1999
2091
    @dbus_annotations(
2000
2092
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2155
2247
    del _interface
2156
2248
 
2157
2249
 
2158
 
class ProxyClient(object):
2159
 
    def __init__(self, child_pipe, fpr, address):
 
2250
class ProxyClient:
 
2251
    def __init__(self, child_pipe, key_id, fpr, address):
2160
2252
        self._pipe = child_pipe
2161
 
        self._pipe.send(('init', fpr, address))
 
2253
        self._pipe.send(('init', key_id, fpr, address))
2162
2254
        if not self._pipe.recv():
2163
 
            raise KeyError(fpr)
 
2255
            raise KeyError(key_id or fpr)
2164
2256
 
2165
2257
    def __getattribute__(self, name):
2166
2258
        if name == '_pipe':
2233
2325
 
2234
2326
            approval_required = False
2235
2327
            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,
 
2328
                if gnutls.has_rawpk:
 
2329
                    fpr = b""
 
2330
                    try:
 
2331
                        key_id = self.key_id(
 
2332
                            self.peer_certificate(session))
 
2333
                    except (TypeError, gnutls.Error) as error:
 
2334
                        logger.warning("Bad certificate: %s", error)
 
2335
                        return
 
2336
                    logger.debug("Key ID: %s", key_id)
 
2337
 
 
2338
                else:
 
2339
                    key_id = b""
 
2340
                    try:
 
2341
                        fpr = self.fingerprint(
 
2342
                            self.peer_certificate(session))
 
2343
                    except (TypeError, gnutls.Error) as error:
 
2344
                        logger.warning("Bad certificate: %s", error)
 
2345
                        return
 
2346
                    logger.debug("Fingerprint: %s", fpr)
 
2347
 
 
2348
                try:
 
2349
                    client = ProxyClient(child_pipe, key_id, fpr,
2246
2350
                                         self.client_address)
2247
2351
                except KeyError:
2248
2352
                    return
2325
2429
 
2326
2430
    @staticmethod
2327
2431
    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):
 
2432
        "Return the peer's certificate as a bytestring"
 
2433
        try:
 
2434
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2435
                                                     gnutls.CTYPE_PEERS)
 
2436
        except AttributeError:
 
2437
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2438
        if gnutls.has_rawpk:
 
2439
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2440
        else:
 
2441
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2442
        # If not a valid certificate type...
 
2443
        if cert_type not in valid_cert_types:
 
2444
            logger.info("Cert type %r not in %r", cert_type,
 
2445
                        valid_cert_types)
2332
2446
            # ...return invalid data
2333
2447
            return b""
2334
2448
        list_size = ctypes.c_uint(1)
2342
2456
        return ctypes.string_at(cert.data, cert.size)
2343
2457
 
2344
2458
    @staticmethod
 
2459
    def key_id(certificate):
 
2460
        "Convert a certificate bytestring to a hexdigit key ID"
 
2461
        # New GnuTLS "datum" with the public key
 
2462
        datum = gnutls.datum_t(
 
2463
            ctypes.cast(ctypes.c_char_p(certificate),
 
2464
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2465
            ctypes.c_uint(len(certificate)))
 
2466
        # XXX all these need to be created in the gnutls "module"
 
2467
        # New empty GnuTLS certificate
 
2468
        pubkey = gnutls.pubkey_t()
 
2469
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2470
        # Import the raw public key into the certificate
 
2471
        gnutls.pubkey_import(pubkey,
 
2472
                             ctypes.byref(datum),
 
2473
                             gnutls.X509_FMT_DER)
 
2474
        # New buffer for the key ID
 
2475
        buf = ctypes.create_string_buffer(32)
 
2476
        buf_len = ctypes.c_size_t(len(buf))
 
2477
        # Get the key ID from the raw public key into the buffer
 
2478
        gnutls.pubkey_get_key_id(
 
2479
            pubkey,
 
2480
            gnutls.KEYID_USE_SHA256,
 
2481
            ctypes.cast(ctypes.byref(buf),
 
2482
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2483
            ctypes.byref(buf_len))
 
2484
        # Deinit the certificate
 
2485
        gnutls.pubkey_deinit(pubkey)
 
2486
 
 
2487
        # Convert the buffer to a Python bytestring
 
2488
        key_id = ctypes.string_at(buf, buf_len.value)
 
2489
        # Convert the bytestring to hexadecimal notation
 
2490
        hex_key_id = binascii.hexlify(key_id).upper()
 
2491
        return hex_key_id
 
2492
 
 
2493
    @staticmethod
2345
2494
    def fingerprint(openpgp):
2346
2495
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2347
2496
        # New GnuTLS "datum" with the OpenPGP public key
2361
2510
                                       ctypes.byref(crtverify))
2362
2511
        if crtverify.value != 0:
2363
2512
            gnutls.openpgp_crt_deinit(crt)
2364
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2513
            raise gnutls.CertificateSecurityError(code
 
2514
                                                  =crtverify.value)
2365
2515
        # New buffer for the fingerprint
2366
2516
        buf = ctypes.create_string_buffer(20)
2367
2517
        buf_len = ctypes.c_size_t()
2377
2527
        return hex_fpr
2378
2528
 
2379
2529
 
2380
 
class MultiprocessingMixIn(object):
 
2530
class MultiprocessingMixIn:
2381
2531
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2382
2532
 
2383
2533
    def sub_process_main(self, request, address):
2395
2545
        return proc
2396
2546
 
2397
2547
 
2398
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2548
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2399
2549
    """ adds a pipe to the MixIn """
2400
2550
 
2401
2551
    def process_request(self, request, client_address):
2416
2566
 
2417
2567
 
2418
2568
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2419
 
                     socketserver.TCPServer, object):
 
2569
                     socketserver.TCPServer):
2420
2570
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2421
2571
 
2422
2572
    Attributes:
2495
2645
                    raise
2496
2646
        # Only bind(2) the socket if we really need to.
2497
2647
        if self.server_address[0] or self.server_address[1]:
 
2648
            if self.server_address[1]:
 
2649
                self.allow_reuse_address = True
2498
2650
            if not self.server_address[0]:
2499
2651
                if self.address_family == socket.AF_INET6:
2500
2652
                    any_address = "::"  # in6addr_any
2553
2705
    def add_pipe(self, parent_pipe, proc):
2554
2706
        # Call "handle_ipc" for both data and EOF events
2555
2707
        GLib.io_add_watch(
2556
 
            parent_pipe.fileno(),
2557
 
            GLib.IO_IN | GLib.IO_HUP,
 
2708
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2709
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2558
2710
            functools.partial(self.handle_ipc,
2559
2711
                              parent_pipe=parent_pipe,
2560
2712
                              proc=proc))
2574
2726
        command = request[0]
2575
2727
 
2576
2728
        if command == 'init':
2577
 
            fpr = request[1]
2578
 
            address = request[2]
 
2729
            key_id = request[1].decode("ascii")
 
2730
            fpr = request[2].decode("ascii")
 
2731
            address = request[3]
2579
2732
 
2580
2733
            for c in self.clients.values():
2581
 
                if c.fingerprint == fpr:
 
2734
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2735
                              "27AE41E4649B934CA495991B7852B855"):
 
2736
                    continue
 
2737
                if key_id and c.key_id == key_id:
 
2738
                    client = c
 
2739
                    break
 
2740
                if fpr and c.fingerprint == fpr:
2582
2741
                    client = c
2583
2742
                    break
2584
2743
            else:
2585
 
                logger.info("Client not found for fingerprint: %s, ad"
2586
 
                            "dress: %s", fpr, address)
 
2744
                logger.info("Client not found for key ID: %s, address"
 
2745
                            ": %s", key_id or fpr, address)
2587
2746
                if self.use_dbus:
2588
2747
                    # Emit D-Bus signal
2589
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2748
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2590
2749
                                                       address[0])
2591
2750
                parent_pipe.send(False)
2592
2751
                return False
2593
2752
 
2594
2753
            GLib.io_add_watch(
2595
 
                parent_pipe.fileno(),
2596
 
                GLib.IO_IN | GLib.IO_HUP,
 
2754
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2755
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2597
2756
                functools.partial(self.handle_ipc,
2598
2757
                                  parent_pipe=parent_pipe,
2599
2758
                                  proc=proc,
2614
2773
        if command == 'getattr':
2615
2774
            attrname = request[1]
2616
2775
            if isinstance(client_object.__getattribute__(attrname),
2617
 
                          collections.Callable):
 
2776
                          collections.abc.Callable):
2618
2777
                parent_pipe.send(('function', ))
2619
2778
            else:
2620
2779
                parent_pipe.send((
2631
2790
def rfc3339_duration_to_delta(duration):
2632
2791
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2633
2792
 
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)
 
2793
    >>> timedelta = datetime.timedelta
 
2794
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2795
    True
 
2796
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2797
    True
 
2798
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2799
    True
 
2800
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2801
    True
 
2802
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2803
    True
 
2804
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2805
    True
 
2806
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2807
    True
 
2808
    >>> del timedelta
2648
2809
    """
2649
2810
 
2650
2811
    # Parsing an RFC 3339 duration with regular expressions is not
2730
2891
def string_to_delta(interval):
2731
2892
    """Parse a string and return a datetime.timedelta
2732
2893
 
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)
 
2894
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2895
    True
 
2896
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2897
    True
 
2898
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2899
    True
 
2900
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2901
    True
 
2902
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2903
    True
 
2904
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
2905
    True
2745
2906
    """
2746
2907
 
2747
2908
    try:
2849
3010
 
2850
3011
    options = parser.parse_args()
2851
3012
 
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
3013
    # Default values for config file for server-global settings
 
3014
    if gnutls.has_rawpk:
 
3015
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
3016
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
3017
    else:
 
3018
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
3019
                    ":+SIGN-DSA-SHA256")
2858
3020
    server_defaults = {"interface": "",
2859
3021
                       "address": "",
2860
3022
                       "port": "",
2861
3023
                       "debug": "False",
2862
 
                       "priority":
2863
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2864
 
                       ":+SIGN-DSA-SHA256",
 
3024
                       "priority": priority,
2865
3025
                       "servicename": "Mandos",
2866
3026
                       "use_dbus": "True",
2867
3027
                       "use_ipv6": "True",
2872
3032
                       "foreground": "False",
2873
3033
                       "zeroconf": "True",
2874
3034
                       }
 
3035
    del priority
2875
3036
 
2876
3037
    # Parse config file for server-global settings
2877
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
3038
    server_config = configparser.ConfigParser(server_defaults)
2878
3039
    del server_defaults
2879
3040
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2880
 
    # Convert the SafeConfigParser object to a dict
 
3041
    # Convert the ConfigParser object to a dict
2881
3042
    server_settings = server_config.defaults()
2882
3043
    # Use the appropriate methods on the non-string config options
2883
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
3044
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3045
                   "foreground", "zeroconf"):
2884
3046
        server_settings[option] = server_config.getboolean("DEFAULT",
2885
3047
                                                           option)
2886
3048
    if server_settings["port"]:
2954
3116
                                  server_settings["servicename"])))
2955
3117
 
2956
3118
    # Parse config file with clients
2957
 
    client_config = configparser.SafeConfigParser(Client
2958
 
                                                  .client_defaults)
 
3119
    client_config = configparser.ConfigParser(Client.client_defaults)
2959
3120
    client_config.read(os.path.join(server_settings["configdir"],
2960
3121
                                    "clients.conf"))
2961
3122
 
3032
3193
        # Close all input and output, do double fork, etc.
3033
3194
        daemon()
3034
3195
 
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()
 
3196
    if gi.version_info < (3, 10, 2):
 
3197
        # multiprocessing will use threads, so before we use GLib we
 
3198
        # need to inform GLib that threads will be used.
 
3199
        GLib.threads_init()
3038
3200
 
3039
3201
    global main_loop
3040
3202
    # From the Avahi example code
3116
3278
                             if isinstance(s, bytes)
3117
3279
                             else s) for s in
3118
3280
                            value["client_structure"]]
3119
 
                        # .name & .host
3120
 
                        for k in ("name", "host"):
 
3281
                        # .name, .host, and .checker_command
 
3282
                        for k in ("name", "host", "checker_command"):
3121
3283
                            if isinstance(value[k], bytes):
3122
3284
                                value[k] = value[k].decode("utf-8")
 
3285
                        if "key_id" not in value:
 
3286
                            value["key_id"] = ""
 
3287
                        elif "fingerprint" not in value:
 
3288
                            value["fingerprint"] = ""
3123
3289
                    #  old_client_settings
3124
3290
                    # .keys()
3125
3291
                    old_client_settings = {
3129
3295
                        for key, value in
3130
3296
                        bytes_old_client_settings.items()}
3131
3297
                    del bytes_old_client_settings
3132
 
                    # .host
 
3298
                    # .host and .checker_command
3133
3299
                    for value in old_client_settings.values():
3134
 
                        if isinstance(value["host"], bytes):
3135
 
                            value["host"] = (value["host"]
3136
 
                                             .decode("utf-8"))
 
3300
                        for attribute in ("host", "checker_command"):
 
3301
                            if isinstance(value[attribute], bytes):
 
3302
                                value[attribute] = (value[attribute]
 
3303
                                                    .decode("utf-8"))
3137
3304
            os.remove(stored_state_path)
3138
3305
        except IOError as e:
3139
3306
            if e.errno == errno.ENOENT:
3262
3429
                pass
3263
3430
 
3264
3431
            @dbus.service.signal(_interface, signature="ss")
3265
 
            def ClientNotFound(self, fingerprint, address):
 
3432
            def ClientNotFound(self, key_id, address):
3266
3433
                "D-Bus signal"
3267
3434
                pass
3268
3435
 
3464
3631
                sys.exit(1)
3465
3632
            # End of Avahi example code
3466
3633
 
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))
 
3634
        GLib.io_add_watch(
 
3635
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3636
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3637
            lambda *args, **kwargs: (tcp_server.handle_request
 
3638
                                     (*args[2:], **kwargs) or True))
3471
3639
 
3472
3640
        logger.debug("Starting main loop")
3473
3641
        main_loop.run()
3483
3651
    # Must run before the D-Bus bus name gets deregistered
3484
3652
    cleanup()
3485
3653
 
 
3654
 
 
3655
def should_only_run_tests():
 
3656
    parser = argparse.ArgumentParser(add_help=False)
 
3657
    parser.add_argument("--check", action='store_true')
 
3658
    args, unknown_args = parser.parse_known_args()
 
3659
    run_tests = args.check
 
3660
    if run_tests:
 
3661
        # Remove --check argument from sys.argv
 
3662
        sys.argv[1:] = unknown_args
 
3663
    return run_tests
 
3664
 
 
3665
# Add all tests from doctest strings
 
3666
def load_tests(loader, tests, none):
 
3667
    import doctest
 
3668
    tests.addTests(doctest.DocTestSuite())
 
3669
    return tests
3486
3670
 
3487
3671
if __name__ == '__main__':
3488
 
    main()
 
3672
    try:
 
3673
        if should_only_run_tests():
 
3674
            # Call using ./mandos --check [--verbose]
 
3675
            unittest.main()
 
3676
        else:
 
3677
            main()
 
3678
    finally:
 
3679
        logging.shutdown()