/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: 2019-12-04 23:52:20 UTC
  • Revision ID: teddy@recompile.se-20191204235220-yn88brp0scmqwy2t
Remove non-project-specific pattern from .bzrignore

Only project-specific patterns should be in the .bzrignore file.
Other generic patterns should be in the ~/.config/breezy/ignore and
~/.bazaar/ignore files.

* .bzrignore (.tramp_history): Remove.

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