/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: 2016-10-05 19:56:40 UTC
  • Revision ID: teddy@recompile.se-20161005195640-yrjxv8kkx662usr0
Fix bug where Mandos client would crash on exit

* plugins.d/mandos-client.c (init_gnutls_global): Fix memory leak by
  doing free(params.data) after import.

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