/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2018-02-08 10:02:51 UTC
  • Revision ID: teddy@recompile.se-20180208100251-x7qq39sjsgk4r2sq
Update Debian watch file to version 4

* debian/watch (version): Change to "4".
  (opts/pgpsigurlmangle): Remove.
  (opts/pgpmode): New; set to "auto".
  (URL): Change to "https://ftp.recompile.se/pub/@PACKAGE@/@PACKAGE@@ANY_VERSION@(?:\.orig)?@ARCHIVE_EXT@".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python3 -bI
2
 
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2019 Teddy Hogeborn
15
 
# Copyright © 2008-2019 Björn Påhlsson
 
14
# Copyright © 2008-2017 Teddy Hogeborn
 
15
# Copyright © 2008-2017 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
77
77
import itertools
78
78
import collections
79
79
import codecs
80
 
import unittest
81
80
 
82
81
import dbus
83
82
import dbus.service
84
 
import gi
85
83
from gi.repository import GLib
86
84
from dbus.mainloop.glib import DBusGMainLoop
87
85
import ctypes
89
87
import xml.dom.minidom
90
88
import inspect
91
89
 
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
 
 
101
90
# Try to find the value of SO_BINDTODEVICE:
102
91
try:
103
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
123
112
            # No value found
124
113
            SO_BINDTODEVICE = None
125
114
 
126
 
if sys.version_info < (3, 2):
127
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
128
117
 
129
 
version = "1.8.9"
 
118
version = "1.7.16"
130
119
stored_state_file = "clients.pickle"
131
120
 
132
121
logger = logging.getLogger()
133
 
logging.captureWarnings(True)   # Show warnings via the logging system
134
122
syslogger = None
135
123
 
136
124
try:
191
179
    pass
192
180
 
193
181
 
194
 
class PGPEngine:
 
182
class PGPEngine(object):
195
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
196
184
 
197
185
    def __init__(self):
201
189
            output = subprocess.check_output(["gpgconf"])
202
190
            for line in output.splitlines():
203
191
                name, text, path = line.split(b":")
204
 
                if name == b"gpg":
 
192
                if name == "gpg":
205
193
                    self.gpg = path
206
194
                    break
207
195
        except OSError as e:
212
200
                          '--force-mdc',
213
201
                          '--quiet']
214
202
        # Only GPG version 1 has the --no-use-agent option.
215
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
216
204
            self.gnupgargs.append("--no-use-agent")
217
205
 
218
206
    def __enter__(self):
287
275
 
288
276
 
289
277
# Pretend that we have an Avahi module
290
 
class avahi:
291
 
    """This isn't so much a class as it is a module-like namespace."""
 
278
class Avahi(object):
 
279
    """This isn't so much a class as it is a module-like namespace.
 
280
    It is instantiated once, and simulates having an Avahi module."""
292
281
    IF_UNSPEC = -1               # avahi-common/address.h
293
282
    PROTO_UNSPEC = -1            # avahi-common/address.h
294
283
    PROTO_INET = 0               # avahi-common/address.h
298
287
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
299
288
    DBUS_PATH_SERVER = "/"
300
289
 
301
 
    @staticmethod
302
 
    def string_array_to_txt_array(t):
 
290
    def string_array_to_txt_array(self, t):
303
291
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
304
292
                           for s in t), signature="ay")
305
293
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
310
298
    SERVER_RUNNING = 2           # avahi-common/defs.h
311
299
    SERVER_COLLISION = 3         # avahi-common/defs.h
312
300
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
301
avahi = Avahi()
313
302
 
314
303
 
315
304
class AvahiError(Exception):
327
316
    pass
328
317
 
329
318
 
330
 
class AvahiService:
 
319
class AvahiService(object):
331
320
    """An Avahi (Zeroconf) service.
332
321
 
333
322
    Attributes:
507
496
class AvahiServiceToSyslog(AvahiService):
508
497
    def rename(self, *args, **kwargs):
509
498
        """Add the new name to the syslog messages"""
510
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
499
        ret = super(AvahiServiceToSyslog, self).rename(self, *args,
 
500
                                                       **kwargs)
511
501
        syslogger.setFormatter(logging.Formatter(
512
502
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
513
503
            .format(self.name)))
515
505
 
516
506
 
517
507
# Pretend that we have a GnuTLS module
518
 
class gnutls:
519
 
    """This isn't so much a class as it is a module-like namespace."""
 
508
class GnuTLS(object):
 
509
    """This isn't so much a class as it is a module-like namespace.
 
510
    It is instantiated once, and simulates having a GnuTLS module."""
520
511
 
521
512
    library = ctypes.util.find_library("gnutls")
522
513
    if library is None:
523
514
        library = ctypes.util.find_library("gnutls-deb0")
524
515
    _library = ctypes.cdll.LoadLibrary(library)
525
516
    del library
 
517
    _need_version = b"3.3.0"
 
518
 
 
519
    def __init__(self):
 
520
        # Need to use "self" here, since this method is called before
 
521
        # the assignment to the "gnutls" global variable happens.
 
522
        if self.check_version(self._need_version) is None:
 
523
            raise self.Error("Needs GnuTLS {} or later"
 
524
                             .format(self._need_version))
526
525
 
527
526
    # Unless otherwise indicated, the constants and types below are
528
527
    # all from the gnutls/gnutls.h C header file.
532
531
    E_INTERRUPTED = -52
533
532
    E_AGAIN = -28
534
533
    CRT_OPENPGP = 2
535
 
    CRT_RAWPK = 3
536
534
    CLIENT = 2
537
535
    SHUT_RDWR = 0
538
536
    CRD_CERTIFICATE = 1
539
537
    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
545
538
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
546
539
 
547
540
    # Types
570
563
 
571
564
    # Exceptions
572
565
    class Error(Exception):
 
566
        # We need to use the class name "GnuTLS" here, since this
 
567
        # exception might be raised from within GnuTLS.__init__,
 
568
        # which is called before the assignment to the "gnutls"
 
569
        # global variable has happened.
573
570
        def __init__(self, message=None, code=None, args=()):
574
571
            # Default usage is by a message string, but if a return
575
572
            # code is passed, convert it to a string with
576
573
            # gnutls.strerror()
577
574
            self.code = code
578
575
            if message is None and code is not None:
579
 
                message = gnutls.strerror(code)
580
 
            return super(gnutls.Error, self).__init__(
 
576
                message = GnuTLS.strerror(code)
 
577
            return super(GnuTLS.Error, self).__init__(
581
578
                message, *args)
582
579
 
583
580
    class CertificateSecurityError(Error):
584
581
        pass
585
582
 
586
583
    # Classes
587
 
    class Credentials:
 
584
    class Credentials(object):
588
585
        def __init__(self):
589
586
            self._c_object = gnutls.certificate_credentials_t()
590
587
            gnutls.certificate_allocate_credentials(
594
591
        def __del__(self):
595
592
            gnutls.certificate_free_credentials(self._c_object)
596
593
 
597
 
    class ClientSession:
 
594
    class ClientSession(object):
598
595
        def __init__(self, socket, credentials=None):
599
596
            self._c_object = gnutls.session_t()
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
 
597
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
607
598
            gnutls.set_default_priority(self._c_object)
608
599
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
609
600
            gnutls.handshake_set_private_extensions(self._c_object,
741
732
    check_version.argtypes = [ctypes.c_char_p]
742
733
    check_version.restype = ctypes.c_char_p
743
734
 
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
 
735
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
 
737
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
738
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
739
    openpgp_crt_init.restype = _error_code
 
740
 
 
741
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
742
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
743
                                   ctypes.POINTER(datum_t),
 
744
                                   openpgp_crt_fmt_t]
 
745
    openpgp_crt_import.restype = _error_code
 
746
 
 
747
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
748
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
749
                                        ctypes.POINTER(ctypes.c_uint)]
 
750
    openpgp_crt_verify_self.restype = _error_code
 
751
 
 
752
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
753
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
754
    openpgp_crt_deinit.restype = None
 
755
 
 
756
    openpgp_crt_get_fingerprint = (
 
757
        _library.gnutls_openpgp_crt_get_fingerprint)
 
758
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
759
                                            ctypes.c_void_p,
 
760
                                            ctypes.POINTER(
 
761
                                                ctypes.c_size_t)]
 
762
    openpgp_crt_get_fingerprint.restype = _error_code
813
763
 
814
764
    # Remove non-public functions
815
765
    del _error_code, _retry_on_error
 
766
# Create the global "gnutls" object, simulating a module
 
767
gnutls = GnuTLS()
816
768
 
817
769
 
818
770
def call_pipe(connection,       # : multiprocessing.Connection
826
778
    connection.close()
827
779
 
828
780
 
829
 
class Client:
 
781
class Client(object):
830
782
    """A representation of a client host served by this server.
831
783
 
832
784
    Attributes:
833
785
    approved:   bool(); 'None' if not yet approved/disapproved
834
786
    approval_delay: datetime.timedelta(); Time to wait for approval
835
787
    approval_duration: datetime.timedelta(); Duration of one approval
836
 
    checker: multiprocessing.Process(); a running checker process used
837
 
             to see if the client lives. 'None' if no process is
838
 
             running.
 
788
    checker:    subprocess.Popen(); a running checker process used
 
789
                                    to see if the client lives.
 
790
                                    'None' if no process is running.
839
791
    checker_callback_tag: a GLib event source tag, or None
840
792
    checker_command: string; External command which is run to check
841
793
                     if client lives.  %() expansions are done at
849
801
    disable_initiator_tag: a GLib event source tag, or None
850
802
    enabled:    bool()
851
803
    fingerprint: string (40 or 32 hexadecimal digits); used to
852
 
                 uniquely identify an OpenPGP client
853
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
854
 
            a client using raw public keys
 
804
                 uniquely identify the client
855
805
    host:       string; available for use by the checker command
856
806
    interval:   datetime.timedelta(); How often to start a new checker
857
807
    last_approval_request: datetime.datetime(); (UTC) or None
875
825
    """
876
826
 
877
827
    runtime_expansions = ("approval_delay", "approval_duration",
878
 
                          "created", "enabled", "expires", "key_id",
 
828
                          "created", "enabled", "expires",
879
829
                          "fingerprint", "host", "interval",
880
830
                          "last_approval_request", "last_checked_ok",
881
831
                          "last_enabled", "name", "timeout")
911
861
            client["enabled"] = config.getboolean(client_name,
912
862
                                                  "enabled")
913
863
 
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(" ", ""))
 
864
            # Uppercase and remove spaces from fingerprint for later
 
865
            # comparison purposes with return value from the
 
866
            # fingerprint() function
919
867
            client["fingerprint"] = (section["fingerprint"].upper()
920
868
                                     .replace(" ", ""))
921
869
            if "secret" in section:
965
913
            self.expires = None
966
914
 
967
915
        logger.debug("Creating client %r", self.name)
968
 
        logger.debug("  Key ID: %s", self.key_id)
969
916
        logger.debug("  Fingerprint: %s", self.fingerprint)
970
917
        self.created = settings.get("created",
971
918
                                    datetime.datetime.utcnow())
1048
995
    def checker_callback(self, source, condition, connection,
1049
996
                         command):
1050
997
        """The checker has completed, so take appropriate actions."""
 
998
        self.checker_callback_tag = None
 
999
        self.checker = None
1051
1000
        # Read return code from connection (see call_pipe)
1052
1001
        returncode = connection.recv()
1053
1002
        connection.close()
1054
 
        if self.checker is not None:
1055
 
            self.checker.join()
1056
 
        self.checker_callback_tag = None
1057
 
        self.checker = None
1058
1003
 
1059
1004
        if returncode >= 0:
1060
1005
            self.last_checker_status = returncode
1149
1094
                kwargs=popen_args)
1150
1095
            self.checker.start()
1151
1096
            self.checker_callback_tag = GLib.io_add_watch(
1152
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1097
                pipe[0].fileno(), GLib.IO_IN,
1154
1098
                self.checker_callback, pipe[0], command)
1155
1099
        # Re-run this periodically if run by GLib.timeout_add
1156
1100
        return True
1411
1355
                raise ValueError("Byte arrays not supported for non-"
1412
1356
                                 "'ay' signature {!r}"
1413
1357
                                 .format(prop._dbus_signature))
1414
 
            value = dbus.ByteArray(bytes(value))
 
1358
            value = dbus.ByteArray(b''.join(chr(byte)
 
1359
                                            for byte in value))
1415
1360
        prop(value)
1416
1361
 
1417
1362
    @dbus.service.method(dbus.PROPERTIES_IFACE,
2055
2000
    def Name_dbus_property(self):
2056
2001
        return dbus.String(self.name)
2057
2002
 
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
 
 
2065
2003
    # Fingerprint - property
2066
2004
    @dbus_annotations(
2067
2005
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2222
2160
    del _interface
2223
2161
 
2224
2162
 
2225
 
class ProxyClient:
2226
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
2163
class ProxyClient(object):
 
2164
    def __init__(self, child_pipe, fpr, address):
2227
2165
        self._pipe = child_pipe
2228
 
        self._pipe.send(('init', key_id, fpr, address))
 
2166
        self._pipe.send(('init', fpr, address))
2229
2167
        if not self._pipe.recv():
2230
 
            raise KeyError(key_id or fpr)
 
2168
            raise KeyError(fpr)
2231
2169
 
2232
2170
    def __getattribute__(self, name):
2233
2171
        if name == '_pipe':
2300
2238
 
2301
2239
            approval_required = False
2302
2240
            try:
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,
 
2241
                try:
 
2242
                    fpr = self.fingerprint(
 
2243
                        self.peer_certificate(session))
 
2244
                except (TypeError, gnutls.Error) as error:
 
2245
                    logger.warning("Bad certificate: %s", error)
 
2246
                    return
 
2247
                logger.debug("Fingerprint: %s", fpr)
 
2248
 
 
2249
                try:
 
2250
                    client = ProxyClient(child_pipe, fpr,
2325
2251
                                         self.client_address)
2326
2252
                except KeyError:
2327
2253
                    return
2404
2330
 
2405
2331
    @staticmethod
2406
2332
    def peer_certificate(session):
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)
 
2333
        "Return the peer's OpenPGP certificate as a bytestring"
 
2334
        # If not an OpenPGP certificate...
 
2335
        if (gnutls.certificate_type_get(session._c_object)
 
2336
            != gnutls.CRT_OPENPGP):
2421
2337
            # ...return invalid data
2422
2338
            return b""
2423
2339
        list_size = ctypes.c_uint(1)
2431
2347
        return ctypes.string_at(cert.data, cert.size)
2432
2348
 
2433
2349
    @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
2468
2350
    def fingerprint(openpgp):
2469
2351
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2470
2352
        # New GnuTLS "datum" with the OpenPGP public key
2484
2366
                                       ctypes.byref(crtverify))
2485
2367
        if crtverify.value != 0:
2486
2368
            gnutls.openpgp_crt_deinit(crt)
2487
 
            raise gnutls.CertificateSecurityError(code
2488
 
                                                  =crtverify.value)
 
2369
            raise gnutls.CertificateSecurityError("Verify failed")
2489
2370
        # New buffer for the fingerprint
2490
2371
        buf = ctypes.create_string_buffer(20)
2491
2372
        buf_len = ctypes.c_size_t()
2501
2382
        return hex_fpr
2502
2383
 
2503
2384
 
2504
 
class MultiprocessingMixIn:
 
2385
class MultiprocessingMixIn(object):
2505
2386
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2506
2387
 
2507
2388
    def sub_process_main(self, request, address):
2519
2400
        return proc
2520
2401
 
2521
2402
 
2522
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2403
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2523
2404
    """ adds a pipe to the MixIn """
2524
2405
 
2525
2406
    def process_request(self, request, client_address):
2540
2421
 
2541
2422
 
2542
2423
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2543
 
                     socketserver.TCPServer):
 
2424
                     socketserver.TCPServer, object):
2544
2425
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2545
2426
 
2546
2427
    Attributes:
2619
2500
                    raise
2620
2501
        # Only bind(2) the socket if we really need to.
2621
2502
        if self.server_address[0] or self.server_address[1]:
2622
 
            if self.server_address[1]:
2623
 
                self.allow_reuse_address = True
2624
2503
            if not self.server_address[0]:
2625
2504
                if self.address_family == socket.AF_INET6:
2626
2505
                    any_address = "::"  # in6addr_any
2679
2558
    def add_pipe(self, parent_pipe, proc):
2680
2559
        # Call "handle_ipc" for both data and EOF events
2681
2560
        GLib.io_add_watch(
2682
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2683
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2561
            parent_pipe.fileno(),
 
2562
            GLib.IO_IN | GLib.IO_HUP,
2684
2563
            functools.partial(self.handle_ipc,
2685
2564
                              parent_pipe=parent_pipe,
2686
2565
                              proc=proc))
2700
2579
        command = request[0]
2701
2580
 
2702
2581
        if command == 'init':
2703
 
            key_id = request[1].decode("ascii")
2704
 
            fpr = request[2].decode("ascii")
2705
 
            address = request[3]
 
2582
            fpr = request[1].decode("ascii")
 
2583
            address = request[2]
2706
2584
 
2707
2585
            for c in self.clients.values():
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:
 
2586
                if c.fingerprint == fpr:
2714
2587
                    client = c
2715
2588
                    break
2716
2589
            else:
2717
 
                logger.info("Client not found for key ID: %s, address"
2718
 
                            ": %s", key_id or fpr, address)
 
2590
                logger.info("Client not found for fingerprint: %s, ad"
 
2591
                            "dress: %s", fpr, address)
2719
2592
                if self.use_dbus:
2720
2593
                    # Emit D-Bus signal
2721
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2594
                    mandos_dbus_service.ClientNotFound(fpr,
2722
2595
                                                       address[0])
2723
2596
                parent_pipe.send(False)
2724
2597
                return False
2725
2598
 
2726
2599
            GLib.io_add_watch(
2727
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2728
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2600
                parent_pipe.fileno(),
 
2601
                GLib.IO_IN | GLib.IO_HUP,
2729
2602
                functools.partial(self.handle_ipc,
2730
2603
                                  parent_pipe=parent_pipe,
2731
2604
                                  proc=proc,
2763
2636
def rfc3339_duration_to_delta(duration):
2764
2637
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2765
2638
 
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
 
2639
    >>> rfc3339_duration_to_delta("P7D")
 
2640
    datetime.timedelta(7)
 
2641
    >>> rfc3339_duration_to_delta("PT60S")
 
2642
    datetime.timedelta(0, 60)
 
2643
    >>> rfc3339_duration_to_delta("PT60M")
 
2644
    datetime.timedelta(0, 3600)
 
2645
    >>> rfc3339_duration_to_delta("PT24H")
 
2646
    datetime.timedelta(1)
 
2647
    >>> rfc3339_duration_to_delta("P1W")
 
2648
    datetime.timedelta(7)
 
2649
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2650
    datetime.timedelta(0, 330)
 
2651
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2652
    datetime.timedelta(1, 200)
2780
2653
    """
2781
2654
 
2782
2655
    # Parsing an RFC 3339 duration with regular expressions is not
2862
2735
def string_to_delta(interval):
2863
2736
    """Parse a string and return a datetime.timedelta
2864
2737
 
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
 
2738
    >>> string_to_delta('7d')
 
2739
    datetime.timedelta(7)
 
2740
    >>> string_to_delta('60s')
 
2741
    datetime.timedelta(0, 60)
 
2742
    >>> string_to_delta('60m')
 
2743
    datetime.timedelta(0, 3600)
 
2744
    >>> string_to_delta('24h')
 
2745
    datetime.timedelta(1)
 
2746
    >>> string_to_delta('1w')
 
2747
    datetime.timedelta(7)
 
2748
    >>> string_to_delta('5m 30s')
 
2749
    datetime.timedelta(0, 330)
2877
2750
    """
2878
2751
 
2879
2752
    try:
2981
2854
 
2982
2855
    options = parser.parse_args()
2983
2856
 
 
2857
    if options.check:
 
2858
        import doctest
 
2859
        fail_count, test_count = doctest.testmod()
 
2860
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2861
 
2984
2862
    # 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")
2991
2863
    server_defaults = {"interface": "",
2992
2864
                       "address": "",
2993
2865
                       "port": "",
2994
2866
                       "debug": "False",
2995
 
                       "priority": priority,
 
2867
                       "priority":
 
2868
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2869
                       ":+SIGN-DSA-SHA256",
2996
2870
                       "servicename": "Mandos",
2997
2871
                       "use_dbus": "True",
2998
2872
                       "use_ipv6": "True",
3003
2877
                       "foreground": "False",
3004
2878
                       "zeroconf": "True",
3005
2879
                       }
3006
 
    del priority
3007
2880
 
3008
2881
    # Parse config file for server-global settings
3009
 
    server_config = configparser.ConfigParser(server_defaults)
 
2882
    server_config = configparser.SafeConfigParser(server_defaults)
3010
2883
    del server_defaults
3011
2884
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3012
 
    # Convert the ConfigParser object to a dict
 
2885
    # Convert the SafeConfigParser object to a dict
3013
2886
    server_settings = server_config.defaults()
3014
2887
    # Use the appropriate methods on the non-string config options
3015
2888
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3087
2960
                                  server_settings["servicename"])))
3088
2961
 
3089
2962
    # Parse config file with clients
3090
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2963
    client_config = configparser.SafeConfigParser(Client
 
2964
                                                  .client_defaults)
3091
2965
    client_config.read(os.path.join(server_settings["configdir"],
3092
2966
                                    "clients.conf"))
3093
2967
 
3164
3038
        # Close all input and output, do double fork, etc.
3165
3039
        daemon()
3166
3040
 
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()
 
3041
    # multiprocessing will use threads, so before we use GLib we need
 
3042
    # to inform GLib that threads will be used.
 
3043
    GLib.threads_init()
3171
3044
 
3172
3045
    global main_loop
3173
3046
    # From the Avahi example code
3249
3122
                             if isinstance(s, bytes)
3250
3123
                             else s) for s in
3251
3124
                            value["client_structure"]]
3252
 
                        # .name, .host, and .checker_command
3253
 
                        for k in ("name", "host", "checker_command"):
 
3125
                        # .name & .host
 
3126
                        for k in ("name", "host"):
3254
3127
                            if isinstance(value[k], bytes):
3255
3128
                                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"] = ""
3260
3129
                    #  old_client_settings
3261
3130
                    # .keys()
3262
3131
                    old_client_settings = {
3266
3135
                        for key, value in
3267
3136
                        bytes_old_client_settings.items()}
3268
3137
                    del bytes_old_client_settings
3269
 
                    # .host and .checker_command
 
3138
                    # .host
3270
3139
                    for value in old_client_settings.values():
3271
 
                        for attribute in ("host", "checker_command"):
3272
 
                            if isinstance(value[attribute], bytes):
3273
 
                                value[attribute] = (value[attribute]
3274
 
                                                    .decode("utf-8"))
 
3140
                        if isinstance(value["host"], bytes):
 
3141
                            value["host"] = (value["host"]
 
3142
                                             .decode("utf-8"))
3275
3143
            os.remove(stored_state_path)
3276
3144
        except IOError as e:
3277
3145
            if e.errno == errno.ENOENT:
3400
3268
                pass
3401
3269
 
3402
3270
            @dbus.service.signal(_interface, signature="ss")
3403
 
            def ClientNotFound(self, key_id, address):
 
3271
            def ClientNotFound(self, fingerprint, address):
3404
3272
                "D-Bus signal"
3405
3273
                pass
3406
3274
 
3602
3470
                sys.exit(1)
3603
3471
            # End of Avahi example code
3604
3472
 
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
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3474
                          lambda *args, **kwargs:
 
3475
                          (tcp_server.handle_request
 
3476
                           (*args[2:], **kwargs) or True))
3610
3477
 
3611
3478
        logger.debug("Starting main loop")
3612
3479
        main_loop.run()
3622
3489
    # Must run before the D-Bus bus name gets deregistered
3623
3490
    cleanup()
3624
3491
 
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
3641
3492
 
3642
3493
if __name__ == '__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()
 
3494
    main()