/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-09-04 21:12:32 UTC
  • mfrom: (237.7.726 trunk)
  • Revision ID: teddy@recompile.se-20190904211232-qwuiramck8i8wmhe
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8 -*-
 
1
#!/usr/bin/python3 -b
 
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
79
81
 
80
82
import dbus
81
83
import dbus.service
 
84
import gi
82
85
from gi.repository import GLib
83
86
from dbus.mainloop.glib import DBusGMainLoop
84
87
import ctypes
86
89
import xml.dom.minidom
87
90
import inspect
88
91
 
 
92
if sys.version_info.major == 2:
 
93
    __metaclass__ = type
 
94
 
 
95
# Show warnings by default
 
96
if not sys.warnoptions:
 
97
    import warnings
 
98
    warnings.simplefilter("default")
 
99
 
89
100
# Try to find the value of SO_BINDTODEVICE:
90
101
try:
91
102
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
114
125
if sys.version_info.major == 2:
115
126
    str = unicode
116
127
 
117
 
version = "1.7.13"
 
128
if sys.version_info < (3, 2):
 
129
    configparser.Configparser = configparser.SafeConfigParser
 
130
 
 
131
version = "1.8.9"
118
132
stored_state_file = "clients.pickle"
119
133
 
120
134
logger = logging.getLogger()
 
135
logging.captureWarnings(True)   # Show warnings via the logging system
121
136
syslogger = None
122
137
 
123
138
try:
178
193
    pass
179
194
 
180
195
 
181
 
class PGPEngine(object):
 
196
class PGPEngine:
182
197
    """A simple class for OpenPGP symmetric encryption & decryption"""
183
198
 
184
199
    def __init__(self):
188
203
            output = subprocess.check_output(["gpgconf"])
189
204
            for line in output.splitlines():
190
205
                name, text, path = line.split(b":")
191
 
                if name == "gpg":
 
206
                if name == b"gpg":
192
207
                    self.gpg = path
193
208
                    break
194
209
        except OSError as e:
199
214
                          '--force-mdc',
200
215
                          '--quiet']
201
216
        # Only GPG version 1 has the --no-use-agent option.
202
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
217
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
203
218
            self.gnupgargs.append("--no-use-agent")
204
219
 
205
220
    def __enter__(self):
274
289
 
275
290
 
276
291
# 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."""
 
292
class avahi:
 
293
    """This isn't so much a class as it is a module-like namespace."""
280
294
    IF_UNSPEC = -1               # avahi-common/address.h
281
295
    PROTO_UNSPEC = -1            # avahi-common/address.h
282
296
    PROTO_INET = 0               # avahi-common/address.h
286
300
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
301
    DBUS_PATH_SERVER = "/"
288
302
 
289
 
    def string_array_to_txt_array(self, t):
 
303
    @staticmethod
 
304
    def string_array_to_txt_array(t):
290
305
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
306
                           for s in t), signature="ay")
292
307
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
297
312
    SERVER_RUNNING = 2           # avahi-common/defs.h
298
313
    SERVER_COLLISION = 3         # avahi-common/defs.h
299
314
    SERVER_FAILURE = 4           # avahi-common/defs.h
300
 
avahi = Avahi()
301
315
 
302
316
 
303
317
class AvahiError(Exception):
315
329
    pass
316
330
 
317
331
 
318
 
class AvahiService(object):
 
332
class AvahiService:
319
333
    """An Avahi (Zeroconf) service.
320
334
 
321
335
    Attributes:
495
509
class AvahiServiceToSyslog(AvahiService):
496
510
    def rename(self, *args, **kwargs):
497
511
        """Add the new name to the syslog messages"""
498
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
512
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
513
        syslogger.setFormatter(logging.Formatter(
500
514
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
515
            .format(self.name)))
503
517
 
504
518
 
505
519
# 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."""
 
520
class gnutls:
 
521
    """This isn't so much a class as it is a module-like namespace."""
509
522
 
510
523
    library = ctypes.util.find_library("gnutls")
511
524
    if library is None:
512
525
        library = ctypes.util.find_library("gnutls-deb0")
513
526
    _library = ctypes.cdll.LoadLibrary(library)
514
527
    del library
515
 
    _need_version = b"3.3.0"
516
 
 
517
 
    def __init__(self):
518
 
        # Need to use "self" here, since this method is called before
519
 
        # the assignment to the "gnutls" global variable happens.
520
 
        if self.check_version(self._need_version) is None:
521
 
            raise self.Error("Needs GnuTLS {} or later"
522
 
                             .format(self._need_version))
523
528
 
524
529
    # Unless otherwise indicated, the constants and types below are
525
530
    # all from the gnutls/gnutls.h C header file.
529
534
    E_INTERRUPTED = -52
530
535
    E_AGAIN = -28
531
536
    CRT_OPENPGP = 2
 
537
    CRT_RAWPK = 3
532
538
    CLIENT = 2
533
539
    SHUT_RDWR = 0
534
540
    CRD_CERTIFICATE = 1
535
541
    E_NO_CERTIFICATE_FOUND = -49
 
542
    X509_FMT_DER = 0
 
543
    NO_TICKETS = 1<<10
 
544
    ENABLE_RAWPK = 1<<18
 
545
    CTYPE_PEERS = 3
 
546
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
536
547
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
537
548
 
538
549
    # Types
561
572
 
562
573
    # Exceptions
563
574
    class Error(Exception):
564
 
        # We need to use the class name "GnuTLS" here, since this
565
 
        # exception might be raised from within GnuTLS.__init__,
566
 
        # which is called before the assignment to the "gnutls"
567
 
        # global variable has happened.
568
575
        def __init__(self, message=None, code=None, args=()):
569
576
            # Default usage is by a message string, but if a return
570
577
            # code is passed, convert it to a string with
571
578
            # gnutls.strerror()
572
579
            self.code = code
573
580
            if message is None and code is not None:
574
 
                message = GnuTLS.strerror(code)
575
 
            return super(GnuTLS.Error, self).__init__(
 
581
                message = gnutls.strerror(code)
 
582
            return super(gnutls.Error, self).__init__(
576
583
                message, *args)
577
584
 
578
585
    class CertificateSecurityError(Error):
579
586
        pass
580
587
 
581
588
    # Classes
582
 
    class Credentials(object):
 
589
    class Credentials:
583
590
        def __init__(self):
584
591
            self._c_object = gnutls.certificate_credentials_t()
585
592
            gnutls.certificate_allocate_credentials(
589
596
        def __del__(self):
590
597
            gnutls.certificate_free_credentials(self._c_object)
591
598
 
592
 
    class ClientSession(object):
 
599
    class ClientSession:
593
600
        def __init__(self, socket, credentials=None):
594
601
            self._c_object = gnutls.session_t()
595
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
602
            gnutls_flags = gnutls.CLIENT
 
603
            if gnutls.check_version(b"3.5.6"):
 
604
                gnutls_flags |= gnutls.NO_TICKETS
 
605
            if gnutls.has_rawpk:
 
606
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
607
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
608
            del gnutls_flags
596
609
            gnutls.set_default_priority(self._c_object)
597
610
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
598
611
            gnutls.handshake_set_private_extensions(self._c_object,
730
743
    check_version.argtypes = [ctypes.c_char_p]
731
744
    check_version.restype = ctypes.c_char_p
732
745
 
733
 
    # All the function declarations below are from gnutls/openpgp.h
734
 
 
735
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
736
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
737
 
    openpgp_crt_init.restype = _error_code
738
 
 
739
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
740
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
741
 
                                   ctypes.POINTER(datum_t),
742
 
                                   openpgp_crt_fmt_t]
743
 
    openpgp_crt_import.restype = _error_code
744
 
 
745
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
746
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
747
 
                                        ctypes.POINTER(ctypes.c_uint)]
748
 
    openpgp_crt_verify_self.restype = _error_code
749
 
 
750
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
751
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
752
 
    openpgp_crt_deinit.restype = None
753
 
 
754
 
    openpgp_crt_get_fingerprint = (
755
 
        _library.gnutls_openpgp_crt_get_fingerprint)
756
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
757
 
                                            ctypes.c_void_p,
758
 
                                            ctypes.POINTER(
759
 
                                                ctypes.c_size_t)]
760
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
746
    _need_version = b"3.3.0"
 
747
    if check_version(_need_version) is None:
 
748
        raise self.Error("Needs GnuTLS {} or later"
 
749
                         .format(_need_version))
 
750
 
 
751
    _tls_rawpk_version = b"3.6.6"
 
752
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
753
 
 
754
    if has_rawpk:
 
755
        # Types
 
756
        class pubkey_st(ctypes.Structure):
 
757
            _fields = []
 
758
        pubkey_t = ctypes.POINTER(pubkey_st)
 
759
 
 
760
        x509_crt_fmt_t = ctypes.c_int
 
761
 
 
762
        # All the function declarations below are from gnutls/abstract.h
 
763
        pubkey_init = _library.gnutls_pubkey_init
 
764
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
765
        pubkey_init.restype = _error_code
 
766
 
 
767
        pubkey_import = _library.gnutls_pubkey_import
 
768
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
769
                                  x509_crt_fmt_t]
 
770
        pubkey_import.restype = _error_code
 
771
 
 
772
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
773
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
774
                                      ctypes.POINTER(ctypes.c_ubyte),
 
775
                                      ctypes.POINTER(ctypes.c_size_t)]
 
776
        pubkey_get_key_id.restype = _error_code
 
777
 
 
778
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
779
        pubkey_deinit.argtypes = [pubkey_t]
 
780
        pubkey_deinit.restype = None
 
781
    else:
 
782
        # All the function declarations below are from gnutls/openpgp.h
 
783
 
 
784
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
785
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
786
        openpgp_crt_init.restype = _error_code
 
787
 
 
788
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
789
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
790
                                       ctypes.POINTER(datum_t),
 
791
                                       openpgp_crt_fmt_t]
 
792
        openpgp_crt_import.restype = _error_code
 
793
 
 
794
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
795
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
796
                                            ctypes.POINTER(ctypes.c_uint)]
 
797
        openpgp_crt_verify_self.restype = _error_code
 
798
 
 
799
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
800
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
801
        openpgp_crt_deinit.restype = None
 
802
 
 
803
        openpgp_crt_get_fingerprint = (
 
804
            _library.gnutls_openpgp_crt_get_fingerprint)
 
805
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
806
                                                ctypes.c_void_p,
 
807
                                                ctypes.POINTER(
 
808
                                                    ctypes.c_size_t)]
 
809
        openpgp_crt_get_fingerprint.restype = _error_code
 
810
 
 
811
    if check_version(b"3.6.4"):
 
812
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
813
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
814
        certificate_type_get2.restype = _error_code
761
815
 
762
816
    # Remove non-public functions
763
817
    del _error_code, _retry_on_error
764
 
# Create the global "gnutls" object, simulating a module
765
 
gnutls = GnuTLS()
766
818
 
767
819
 
768
820
def call_pipe(connection,       # : multiprocessing.Connection
776
828
    connection.close()
777
829
 
778
830
 
779
 
class Client(object):
 
831
class Client:
780
832
    """A representation of a client host served by this server.
781
833
 
782
834
    Attributes:
783
835
    approved:   bool(); 'None' if not yet approved/disapproved
784
836
    approval_delay: datetime.timedelta(); Time to wait for approval
785
837
    approval_duration: datetime.timedelta(); Duration of one approval
786
 
    checker:    subprocess.Popen(); a running checker process used
787
 
                                    to see if the client lives.
788
 
                                    'None' if no process is running.
 
838
    checker: multiprocessing.Process(); a running checker process used
 
839
             to see if the client lives. 'None' if no process is
 
840
             running.
789
841
    checker_callback_tag: a GLib event source tag, or None
790
842
    checker_command: string; External command which is run to check
791
843
                     if client lives.  %() expansions are done at
799
851
    disable_initiator_tag: a GLib event source tag, or None
800
852
    enabled:    bool()
801
853
    fingerprint: string (40 or 32 hexadecimal digits); used to
802
 
                 uniquely identify the client
 
854
                 uniquely identify an OpenPGP client
 
855
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
856
            a client using raw public keys
803
857
    host:       string; available for use by the checker command
804
858
    interval:   datetime.timedelta(); How often to start a new checker
805
859
    last_approval_request: datetime.datetime(); (UTC) or None
823
877
    """
824
878
 
825
879
    runtime_expansions = ("approval_delay", "approval_duration",
826
 
                          "created", "enabled", "expires",
 
880
                          "created", "enabled", "expires", "key_id",
827
881
                          "fingerprint", "host", "interval",
828
882
                          "last_approval_request", "last_checked_ok",
829
883
                          "last_enabled", "name", "timeout")
859
913
            client["enabled"] = config.getboolean(client_name,
860
914
                                                  "enabled")
861
915
 
862
 
            # Uppercase and remove spaces from fingerprint for later
863
 
            # comparison purposes with return value from the
864
 
            # fingerprint() function
 
916
            # Uppercase and remove spaces from key_id and fingerprint
 
917
            # for later comparison purposes with return value from the
 
918
            # key_id() and fingerprint() functions
 
919
            client["key_id"] = (section.get("key_id", "").upper()
 
920
                                .replace(" ", ""))
865
921
            client["fingerprint"] = (section["fingerprint"].upper()
866
922
                                     .replace(" ", ""))
867
923
            if "secret" in section:
911
967
            self.expires = None
912
968
 
913
969
        logger.debug("Creating client %r", self.name)
 
970
        logger.debug("  Key ID: %s", self.key_id)
914
971
        logger.debug("  Fingerprint: %s", self.fingerprint)
915
972
        self.created = settings.get("created",
916
973
                                    datetime.datetime.utcnow())
993
1050
    def checker_callback(self, source, condition, connection,
994
1051
                         command):
995
1052
        """The checker has completed, so take appropriate actions."""
996
 
        self.checker_callback_tag = None
997
 
        self.checker = None
998
1053
        # Read return code from connection (see call_pipe)
999
1054
        returncode = connection.recv()
1000
1055
        connection.close()
 
1056
        if self.checker is not None:
 
1057
            self.checker.join()
 
1058
        self.checker_callback_tag = None
 
1059
        self.checker = None
1001
1060
 
1002
1061
        if returncode >= 0:
1003
1062
            self.last_checker_status = returncode
1092
1151
                kwargs=popen_args)
1093
1152
            self.checker.start()
1094
1153
            self.checker_callback_tag = GLib.io_add_watch(
1095
 
                pipe[0].fileno(), GLib.IO_IN,
 
1154
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1155
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1096
1156
                self.checker_callback, pipe[0], command)
1097
1157
        # Re-run this periodically if run by GLib.timeout_add
1098
1158
        return True
1460
1520
                         exc_info=error)
1461
1521
        return xmlstring
1462
1522
 
 
1523
 
1463
1524
try:
1464
1525
    dbus.OBJECT_MANAGER_IFACE
1465
1526
except AttributeError:
1997
2058
    def Name_dbus_property(self):
1998
2059
        return dbus.String(self.name)
1999
2060
 
 
2061
    # KeyID - property
 
2062
    @dbus_annotations(
 
2063
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2064
    @dbus_service_property(_interface, signature="s", access="read")
 
2065
    def KeyID_dbus_property(self):
 
2066
        return dbus.String(self.key_id)
 
2067
 
2000
2068
    # Fingerprint - property
2001
2069
    @dbus_annotations(
2002
2070
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2157
2225
    del _interface
2158
2226
 
2159
2227
 
2160
 
class ProxyClient(object):
2161
 
    def __init__(self, child_pipe, fpr, address):
 
2228
class ProxyClient:
 
2229
    def __init__(self, child_pipe, key_id, fpr, address):
2162
2230
        self._pipe = child_pipe
2163
 
        self._pipe.send(('init', fpr, address))
 
2231
        self._pipe.send(('init', key_id, fpr, address))
2164
2232
        if not self._pipe.recv():
2165
 
            raise KeyError(fpr)
 
2233
            raise KeyError(key_id or fpr)
2166
2234
 
2167
2235
    def __getattribute__(self, name):
2168
2236
        if name == '_pipe':
2235
2303
 
2236
2304
            approval_required = False
2237
2305
            try:
2238
 
                try:
2239
 
                    fpr = self.fingerprint(
2240
 
                        self.peer_certificate(session))
2241
 
                except (TypeError, gnutls.Error) as error:
2242
 
                    logger.warning("Bad certificate: %s", error)
2243
 
                    return
2244
 
                logger.debug("Fingerprint: %s", fpr)
2245
 
 
2246
 
                try:
2247
 
                    client = ProxyClient(child_pipe, fpr,
 
2306
                if gnutls.has_rawpk:
 
2307
                    fpr = b""
 
2308
                    try:
 
2309
                        key_id = self.key_id(
 
2310
                            self.peer_certificate(session))
 
2311
                    except (TypeError, gnutls.Error) as error:
 
2312
                        logger.warning("Bad certificate: %s", error)
 
2313
                        return
 
2314
                    logger.debug("Key ID: %s", key_id)
 
2315
 
 
2316
                else:
 
2317
                    key_id = b""
 
2318
                    try:
 
2319
                        fpr = self.fingerprint(
 
2320
                            self.peer_certificate(session))
 
2321
                    except (TypeError, gnutls.Error) as error:
 
2322
                        logger.warning("Bad certificate: %s", error)
 
2323
                        return
 
2324
                    logger.debug("Fingerprint: %s", fpr)
 
2325
 
 
2326
                try:
 
2327
                    client = ProxyClient(child_pipe, key_id, fpr,
2248
2328
                                         self.client_address)
2249
2329
                except KeyError:
2250
2330
                    return
2327
2407
 
2328
2408
    @staticmethod
2329
2409
    def peer_certificate(session):
2330
 
        "Return the peer's OpenPGP certificate as a bytestring"
2331
 
        # If not an OpenPGP certificate...
2332
 
        if (gnutls.certificate_type_get(session._c_object)
2333
 
            != gnutls.CRT_OPENPGP):
 
2410
        "Return the peer's certificate as a bytestring"
 
2411
        try:
 
2412
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2413
                                                     gnutls.CTYPE_PEERS)
 
2414
        except AttributeError:
 
2415
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2416
        if gnutls.has_rawpk:
 
2417
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2418
        else:
 
2419
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2420
        # If not a valid certificate type...
 
2421
        if cert_type not in valid_cert_types:
 
2422
            logger.info("Cert type %r not in %r", cert_type,
 
2423
                        valid_cert_types)
2334
2424
            # ...return invalid data
2335
2425
            return b""
2336
2426
        list_size = ctypes.c_uint(1)
2344
2434
        return ctypes.string_at(cert.data, cert.size)
2345
2435
 
2346
2436
    @staticmethod
 
2437
    def key_id(certificate):
 
2438
        "Convert a certificate bytestring to a hexdigit key ID"
 
2439
        # New GnuTLS "datum" with the public key
 
2440
        datum = gnutls.datum_t(
 
2441
            ctypes.cast(ctypes.c_char_p(certificate),
 
2442
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2443
            ctypes.c_uint(len(certificate)))
 
2444
        # XXX all these need to be created in the gnutls "module"
 
2445
        # New empty GnuTLS certificate
 
2446
        pubkey = gnutls.pubkey_t()
 
2447
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2448
        # Import the raw public key into the certificate
 
2449
        gnutls.pubkey_import(pubkey,
 
2450
                             ctypes.byref(datum),
 
2451
                             gnutls.X509_FMT_DER)
 
2452
        # New buffer for the key ID
 
2453
        buf = ctypes.create_string_buffer(32)
 
2454
        buf_len = ctypes.c_size_t(len(buf))
 
2455
        # Get the key ID from the raw public key into the buffer
 
2456
        gnutls.pubkey_get_key_id(pubkey,
 
2457
                                 gnutls.KEYID_USE_SHA256,
 
2458
                                 ctypes.cast(ctypes.byref(buf),
 
2459
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2460
                                 ctypes.byref(buf_len))
 
2461
        # Deinit the certificate
 
2462
        gnutls.pubkey_deinit(pubkey)
 
2463
 
 
2464
        # Convert the buffer to a Python bytestring
 
2465
        key_id = ctypes.string_at(buf, buf_len.value)
 
2466
        # Convert the bytestring to hexadecimal notation
 
2467
        hex_key_id = binascii.hexlify(key_id).upper()
 
2468
        return hex_key_id
 
2469
 
 
2470
    @staticmethod
2347
2471
    def fingerprint(openpgp):
2348
2472
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2349
2473
        # New GnuTLS "datum" with the OpenPGP public key
2363
2487
                                       ctypes.byref(crtverify))
2364
2488
        if crtverify.value != 0:
2365
2489
            gnutls.openpgp_crt_deinit(crt)
2366
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2490
            raise gnutls.CertificateSecurityError(code
 
2491
                                                  =crtverify.value)
2367
2492
        # New buffer for the fingerprint
2368
2493
        buf = ctypes.create_string_buffer(20)
2369
2494
        buf_len = ctypes.c_size_t()
2379
2504
        return hex_fpr
2380
2505
 
2381
2506
 
2382
 
class MultiprocessingMixIn(object):
 
2507
class MultiprocessingMixIn:
2383
2508
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2384
2509
 
2385
2510
    def sub_process_main(self, request, address):
2397
2522
        return proc
2398
2523
 
2399
2524
 
2400
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2525
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2401
2526
    """ adds a pipe to the MixIn """
2402
2527
 
2403
2528
    def process_request(self, request, client_address):
2418
2543
 
2419
2544
 
2420
2545
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2421
 
                     socketserver.TCPServer, object):
 
2546
                     socketserver.TCPServer):
2422
2547
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2423
2548
 
2424
2549
    Attributes:
2497
2622
                    raise
2498
2623
        # Only bind(2) the socket if we really need to.
2499
2624
        if self.server_address[0] or self.server_address[1]:
 
2625
            if self.server_address[1]:
 
2626
                self.allow_reuse_address = True
2500
2627
            if not self.server_address[0]:
2501
2628
                if self.address_family == socket.AF_INET6:
2502
2629
                    any_address = "::"  # in6addr_any
2555
2682
    def add_pipe(self, parent_pipe, proc):
2556
2683
        # Call "handle_ipc" for both data and EOF events
2557
2684
        GLib.io_add_watch(
2558
 
            parent_pipe.fileno(),
2559
 
            GLib.IO_IN | GLib.IO_HUP,
 
2685
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2686
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2560
2687
            functools.partial(self.handle_ipc,
2561
2688
                              parent_pipe=parent_pipe,
2562
2689
                              proc=proc))
2576
2703
        command = request[0]
2577
2704
 
2578
2705
        if command == 'init':
2579
 
            fpr = request[1]
2580
 
            address = request[2]
 
2706
            key_id = request[1].decode("ascii")
 
2707
            fpr = request[2].decode("ascii")
 
2708
            address = request[3]
2581
2709
 
2582
2710
            for c in self.clients.values():
2583
 
                if c.fingerprint == fpr:
 
2711
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2712
                    continue
 
2713
                if key_id and c.key_id == key_id:
 
2714
                    client = c
 
2715
                    break
 
2716
                if fpr and c.fingerprint == fpr:
2584
2717
                    client = c
2585
2718
                    break
2586
2719
            else:
2587
 
                logger.info("Client not found for fingerprint: %s, ad"
2588
 
                            "dress: %s", fpr, address)
 
2720
                logger.info("Client not found for key ID: %s, address"
 
2721
                            ": %s", key_id or fpr, address)
2589
2722
                if self.use_dbus:
2590
2723
                    # Emit D-Bus signal
2591
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2724
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2592
2725
                                                       address[0])
2593
2726
                parent_pipe.send(False)
2594
2727
                return False
2595
2728
 
2596
2729
            GLib.io_add_watch(
2597
 
                parent_pipe.fileno(),
2598
 
                GLib.IO_IN | GLib.IO_HUP,
 
2730
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2731
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2599
2732
                functools.partial(self.handle_ipc,
2600
2733
                                  parent_pipe=parent_pipe,
2601
2734
                                  proc=proc,
2633
2766
def rfc3339_duration_to_delta(duration):
2634
2767
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2635
2768
 
2636
 
    >>> rfc3339_duration_to_delta("P7D")
2637
 
    datetime.timedelta(7)
2638
 
    >>> rfc3339_duration_to_delta("PT60S")
2639
 
    datetime.timedelta(0, 60)
2640
 
    >>> rfc3339_duration_to_delta("PT60M")
2641
 
    datetime.timedelta(0, 3600)
2642
 
    >>> rfc3339_duration_to_delta("PT24H")
2643
 
    datetime.timedelta(1)
2644
 
    >>> rfc3339_duration_to_delta("P1W")
2645
 
    datetime.timedelta(7)
2646
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2647
 
    datetime.timedelta(0, 330)
2648
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2649
 
    datetime.timedelta(1, 200)
 
2769
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2770
    True
 
2771
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2772
    True
 
2773
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2774
    True
 
2775
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2776
    True
 
2777
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2778
    True
 
2779
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2780
    True
 
2781
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2782
    True
2650
2783
    """
2651
2784
 
2652
2785
    # Parsing an RFC 3339 duration with regular expressions is not
2732
2865
def string_to_delta(interval):
2733
2866
    """Parse a string and return a datetime.timedelta
2734
2867
 
2735
 
    >>> string_to_delta('7d')
2736
 
    datetime.timedelta(7)
2737
 
    >>> string_to_delta('60s')
2738
 
    datetime.timedelta(0, 60)
2739
 
    >>> string_to_delta('60m')
2740
 
    datetime.timedelta(0, 3600)
2741
 
    >>> string_to_delta('24h')
2742
 
    datetime.timedelta(1)
2743
 
    >>> string_to_delta('1w')
2744
 
    datetime.timedelta(7)
2745
 
    >>> string_to_delta('5m 30s')
2746
 
    datetime.timedelta(0, 330)
 
2868
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2869
    True
 
2870
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2871
    True
 
2872
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2873
    True
 
2874
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2875
    True
 
2876
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2877
    True
 
2878
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
2879
    True
2747
2880
    """
2748
2881
 
2749
2882
    try:
2851
2984
 
2852
2985
    options = parser.parse_args()
2853
2986
 
2854
 
    if options.check:
2855
 
        import doctest
2856
 
        fail_count, test_count = doctest.testmod()
2857
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2858
 
 
2859
2987
    # Default values for config file for server-global settings
 
2988
    if gnutls.has_rawpk:
 
2989
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
2990
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
2991
    else:
 
2992
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2993
                    ":+SIGN-DSA-SHA256")
2860
2994
    server_defaults = {"interface": "",
2861
2995
                       "address": "",
2862
2996
                       "port": "",
2863
2997
                       "debug": "False",
2864
 
                       "priority":
2865
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2866
 
                       ":+SIGN-DSA-SHA256",
 
2998
                       "priority": priority,
2867
2999
                       "servicename": "Mandos",
2868
3000
                       "use_dbus": "True",
2869
3001
                       "use_ipv6": "True",
2874
3006
                       "foreground": "False",
2875
3007
                       "zeroconf": "True",
2876
3008
                       }
 
3009
    del priority
2877
3010
 
2878
3011
    # Parse config file for server-global settings
2879
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
3012
    server_config = configparser.ConfigParser(server_defaults)
2880
3013
    del server_defaults
2881
3014
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2882
 
    # Convert the SafeConfigParser object to a dict
 
3015
    # Convert the ConfigParser object to a dict
2883
3016
    server_settings = server_config.defaults()
2884
3017
    # Use the appropriate methods on the non-string config options
2885
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
3018
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3019
                   "foreground", "zeroconf"):
2886
3020
        server_settings[option] = server_config.getboolean("DEFAULT",
2887
3021
                                                           option)
2888
3022
    if server_settings["port"]:
2956
3090
                                  server_settings["servicename"])))
2957
3091
 
2958
3092
    # Parse config file with clients
2959
 
    client_config = configparser.SafeConfigParser(Client
2960
 
                                                  .client_defaults)
 
3093
    client_config = configparser.ConfigParser(Client.client_defaults)
2961
3094
    client_config.read(os.path.join(server_settings["configdir"],
2962
3095
                                    "clients.conf"))
2963
3096
 
3034
3167
        # Close all input and output, do double fork, etc.
3035
3168
        daemon()
3036
3169
 
3037
 
    # multiprocessing will use threads, so before we use GLib we need
3038
 
    # to inform GLib that threads will be used.
3039
 
    GLib.threads_init()
 
3170
    if gi.version_info < (3, 10, 2):
 
3171
        # multiprocessing will use threads, so before we use GLib we
 
3172
        # need to inform GLib that threads will be used.
 
3173
        GLib.threads_init()
3040
3174
 
3041
3175
    global main_loop
3042
3176
    # From the Avahi example code
3118
3252
                             if isinstance(s, bytes)
3119
3253
                             else s) for s in
3120
3254
                            value["client_structure"]]
3121
 
                        # .name & .host
3122
 
                        for k in ("name", "host"):
 
3255
                        # .name, .host, and .checker_command
 
3256
                        for k in ("name", "host", "checker_command"):
3123
3257
                            if isinstance(value[k], bytes):
3124
3258
                                value[k] = value[k].decode("utf-8")
 
3259
                        if "key_id" not in value:
 
3260
                            value["key_id"] = ""
 
3261
                        elif "fingerprint" not in value:
 
3262
                            value["fingerprint"] = ""
3125
3263
                    #  old_client_settings
3126
3264
                    # .keys()
3127
3265
                    old_client_settings = {
3131
3269
                        for key, value in
3132
3270
                        bytes_old_client_settings.items()}
3133
3271
                    del bytes_old_client_settings
3134
 
                    # .host
 
3272
                    # .host and .checker_command
3135
3273
                    for value in old_client_settings.values():
3136
 
                        if isinstance(value["host"], bytes):
3137
 
                            value["host"] = (value["host"]
3138
 
                                             .decode("utf-8"))
 
3274
                        for attribute in ("host", "checker_command"):
 
3275
                            if isinstance(value[attribute], bytes):
 
3276
                                value[attribute] = (value[attribute]
 
3277
                                                    .decode("utf-8"))
3139
3278
            os.remove(stored_state_path)
3140
3279
        except IOError as e:
3141
3280
            if e.errno == errno.ENOENT:
3264
3403
                pass
3265
3404
 
3266
3405
            @dbus.service.signal(_interface, signature="ss")
3267
 
            def ClientNotFound(self, fingerprint, address):
 
3406
            def ClientNotFound(self, key_id, address):
3268
3407
                "D-Bus signal"
3269
3408
                pass
3270
3409
 
3466
3605
                sys.exit(1)
3467
3606
            # End of Avahi example code
3468
3607
 
3469
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3470
 
                          lambda *args, **kwargs:
3471
 
                          (tcp_server.handle_request
3472
 
                           (*args[2:], **kwargs) or True))
 
3608
        GLib.io_add_watch(
 
3609
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3610
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3611
            lambda *args, **kwargs: (tcp_server.handle_request
 
3612
                                     (*args[2:], **kwargs) or True))
3473
3613
 
3474
3614
        logger.debug("Starting main loop")
3475
3615
        main_loop.run()
3485
3625
    # Must run before the D-Bus bus name gets deregistered
3486
3626
    cleanup()
3487
3627
 
 
3628
 
 
3629
def should_only_run_tests():
 
3630
    parser = argparse.ArgumentParser(add_help=False)
 
3631
    parser.add_argument("--check", action='store_true')
 
3632
    args, unknown_args = parser.parse_known_args()
 
3633
    run_tests = args.check
 
3634
    if run_tests:
 
3635
        # Remove --check argument from sys.argv
 
3636
        sys.argv[1:] = unknown_args
 
3637
    return run_tests
 
3638
 
 
3639
# Add all tests from doctest strings
 
3640
def load_tests(loader, tests, none):
 
3641
    import doctest
 
3642
    tests.addTests(doctest.DocTestSuite())
 
3643
    return tests
3488
3644
 
3489
3645
if __name__ == '__main__':
3490
 
    main()
 
3646
    try:
 
3647
        if should_only_run_tests():
 
3648
            # Call using ./mandos --check [--verbose]
 
3649
            unittest.main()
 
3650
        else:
 
3651
            main()
 
3652
    finally:
 
3653
        logging.shutdown()