/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-10-29 14:22:26 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 356.
  • Revision ID: teddy@recompile.se-20161029142226-n4s9d70tuk615pg1
Makefile: Clarify message when running client.

* Makefile (run-client): Clarify message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
# Add collections.abc.Callable if it does not exist
98
 
try:
99
 
    collections.abc.Callable
100
 
except AttributeError:
101
 
    class abc:
102
 
        Callable = collections.Callable
103
 
    collections.abc = abc
104
 
    del abc
105
 
 
106
 
# Show warnings by default
107
 
if not sys.warnoptions:
108
 
    import warnings
109
 
    warnings.simplefilter("default")
110
 
 
111
89
# Try to find the value of SO_BINDTODEVICE:
112
90
try:
113
91
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
133
111
            # No value found
134
112
            SO_BINDTODEVICE = None
135
113
 
136
 
if sys.version_info < (3, 2):
137
 
    configparser.Configparser = configparser.SafeConfigParser
 
114
if sys.version_info.major == 2:
 
115
    str = unicode
138
116
 
139
 
version = "1.8.9"
 
117
version = "1.7.13"
140
118
stored_state_file = "clients.pickle"
141
119
 
142
120
logger = logging.getLogger()
143
 
logging.captureWarnings(True)   # Show warnings via the logging system
144
121
syslogger = None
145
122
 
146
123
try:
201
178
    pass
202
179
 
203
180
 
204
 
class PGPEngine:
 
181
class PGPEngine(object):
205
182
    """A simple class for OpenPGP symmetric encryption & decryption"""
206
183
 
207
184
    def __init__(self):
211
188
            output = subprocess.check_output(["gpgconf"])
212
189
            for line in output.splitlines():
213
190
                name, text, path = line.split(b":")
214
 
                if name == b"gpg":
 
191
                if name == "gpg":
215
192
                    self.gpg = path
216
193
                    break
217
194
        except OSError as e:
222
199
                          '--force-mdc',
223
200
                          '--quiet']
224
201
        # Only GPG version 1 has the --no-use-agent option.
225
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
202
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
226
203
            self.gnupgargs.append("--no-use-agent")
227
204
 
228
205
    def __enter__(self):
297
274
 
298
275
 
299
276
# Pretend that we have an Avahi module
300
 
class avahi:
301
 
    """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."""
302
280
    IF_UNSPEC = -1               # avahi-common/address.h
303
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
304
282
    PROTO_INET = 0               # avahi-common/address.h
308
286
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
309
287
    DBUS_PATH_SERVER = "/"
310
288
 
311
 
    @staticmethod
312
 
    def string_array_to_txt_array(t):
 
289
    def string_array_to_txt_array(self, t):
313
290
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
314
291
                           for s in t), signature="ay")
315
292
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
320
297
    SERVER_RUNNING = 2           # avahi-common/defs.h
321
298
    SERVER_COLLISION = 3         # avahi-common/defs.h
322
299
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
300
avahi = Avahi()
323
301
 
324
302
 
325
303
class AvahiError(Exception):
337
315
    pass
338
316
 
339
317
 
340
 
class AvahiService:
 
318
class AvahiService(object):
341
319
    """An Avahi (Zeroconf) service.
342
320
 
343
321
    Attributes:
517
495
class AvahiServiceToSyslog(AvahiService):
518
496
    def rename(self, *args, **kwargs):
519
497
        """Add the new name to the syslog messages"""
520
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
498
        ret = AvahiService.rename(self, *args, **kwargs)
521
499
        syslogger.setFormatter(logging.Formatter(
522
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
523
501
            .format(self.name)))
525
503
 
526
504
 
527
505
# Pretend that we have a GnuTLS module
528
 
class gnutls:
529
 
    """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."""
530
509
 
531
510
    library = ctypes.util.find_library("gnutls")
532
511
    if library is None:
533
512
        library = ctypes.util.find_library("gnutls-deb0")
534
513
    _library = ctypes.cdll.LoadLibrary(library)
535
514
    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))
536
523
 
537
524
    # Unless otherwise indicated, the constants and types below are
538
525
    # all from the gnutls/gnutls.h C header file.
542
529
    E_INTERRUPTED = -52
543
530
    E_AGAIN = -28
544
531
    CRT_OPENPGP = 2
545
 
    CRT_RAWPK = 3
546
532
    CLIENT = 2
547
533
    SHUT_RDWR = 0
548
534
    CRD_CERTIFICATE = 1
549
535
    E_NO_CERTIFICATE_FOUND = -49
550
 
    X509_FMT_DER = 0
551
 
    NO_TICKETS = 1<<10
552
 
    ENABLE_RAWPK = 1<<18
553
 
    CTYPE_PEERS = 3
554
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
555
536
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
556
537
 
557
538
    # Types
580
561
 
581
562
    # Exceptions
582
563
    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.
583
568
        def __init__(self, message=None, code=None, args=()):
584
569
            # Default usage is by a message string, but if a return
585
570
            # code is passed, convert it to a string with
586
571
            # gnutls.strerror()
587
572
            self.code = code
588
573
            if message is None and code is not None:
589
 
                message = gnutls.strerror(code)
590
 
            return super(gnutls.Error, self).__init__(
 
574
                message = GnuTLS.strerror(code)
 
575
            return super(GnuTLS.Error, self).__init__(
591
576
                message, *args)
592
577
 
593
578
    class CertificateSecurityError(Error):
594
579
        pass
595
580
 
596
581
    # Classes
597
 
    class Credentials:
 
582
    class Credentials(object):
598
583
        def __init__(self):
599
584
            self._c_object = gnutls.certificate_credentials_t()
600
585
            gnutls.certificate_allocate_credentials(
604
589
        def __del__(self):
605
590
            gnutls.certificate_free_credentials(self._c_object)
606
591
 
607
 
    class ClientSession:
 
592
    class ClientSession(object):
608
593
        def __init__(self, socket, credentials=None):
609
594
            self._c_object = gnutls.session_t()
610
 
            gnutls_flags = gnutls.CLIENT
611
 
            if gnutls.check_version(b"3.5.6"):
612
 
                gnutls_flags |= gnutls.NO_TICKETS
613
 
            if gnutls.has_rawpk:
614
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
615
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
616
 
            del gnutls_flags
 
595
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
617
596
            gnutls.set_default_priority(self._c_object)
618
597
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
619
598
            gnutls.handshake_set_private_extensions(self._c_object,
751
730
    check_version.argtypes = [ctypes.c_char_p]
752
731
    check_version.restype = ctypes.c_char_p
753
732
 
754
 
    _need_version = b"3.3.0"
755
 
    if check_version(_need_version) is None:
756
 
        raise self.Error("Needs GnuTLS {} or later"
757
 
                         .format(_need_version))
758
 
 
759
 
    _tls_rawpk_version = b"3.6.6"
760
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
761
 
 
762
 
    if has_rawpk:
763
 
        # Types
764
 
        class pubkey_st(ctypes.Structure):
765
 
            _fields = []
766
 
        pubkey_t = ctypes.POINTER(pubkey_st)
767
 
 
768
 
        x509_crt_fmt_t = ctypes.c_int
769
 
 
770
 
        # All the function declarations below are from gnutls/abstract.h
771
 
        pubkey_init = _library.gnutls_pubkey_init
772
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
773
 
        pubkey_init.restype = _error_code
774
 
 
775
 
        pubkey_import = _library.gnutls_pubkey_import
776
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
777
 
                                  x509_crt_fmt_t]
778
 
        pubkey_import.restype = _error_code
779
 
 
780
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
781
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
782
 
                                      ctypes.POINTER(ctypes.c_ubyte),
783
 
                                      ctypes.POINTER(ctypes.c_size_t)]
784
 
        pubkey_get_key_id.restype = _error_code
785
 
 
786
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
787
 
        pubkey_deinit.argtypes = [pubkey_t]
788
 
        pubkey_deinit.restype = None
789
 
    else:
790
 
        # All the function declarations below are from gnutls/openpgp.h
791
 
 
792
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
793
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
794
 
        openpgp_crt_init.restype = _error_code
795
 
 
796
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
797
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
798
 
                                       ctypes.POINTER(datum_t),
799
 
                                       openpgp_crt_fmt_t]
800
 
        openpgp_crt_import.restype = _error_code
801
 
 
802
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
803
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
804
 
                                            ctypes.POINTER(ctypes.c_uint)]
805
 
        openpgp_crt_verify_self.restype = _error_code
806
 
 
807
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
808
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
809
 
        openpgp_crt_deinit.restype = None
810
 
 
811
 
        openpgp_crt_get_fingerprint = (
812
 
            _library.gnutls_openpgp_crt_get_fingerprint)
813
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
814
 
                                                ctypes.c_void_p,
815
 
                                                ctypes.POINTER(
816
 
                                                    ctypes.c_size_t)]
817
 
        openpgp_crt_get_fingerprint.restype = _error_code
818
 
 
819
 
    if check_version(b"3.6.4"):
820
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
821
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
822
 
        certificate_type_get2.restype = _error_code
 
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
823
761
 
824
762
    # Remove non-public functions
825
763
    del _error_code, _retry_on_error
 
764
# Create the global "gnutls" object, simulating a module
 
765
gnutls = GnuTLS()
826
766
 
827
767
 
828
768
def call_pipe(connection,       # : multiprocessing.Connection
836
776
    connection.close()
837
777
 
838
778
 
839
 
class Client:
 
779
class Client(object):
840
780
    """A representation of a client host served by this server.
841
781
 
842
782
    Attributes:
843
783
    approved:   bool(); 'None' if not yet approved/disapproved
844
784
    approval_delay: datetime.timedelta(); Time to wait for approval
845
785
    approval_duration: datetime.timedelta(); Duration of one approval
846
 
    checker: multiprocessing.Process(); a running checker process used
847
 
             to see if the client lives. 'None' if no process is
848
 
             running.
 
786
    checker:    subprocess.Popen(); a running checker process used
 
787
                                    to see if the client lives.
 
788
                                    'None' if no process is running.
849
789
    checker_callback_tag: a GLib event source tag, or None
850
790
    checker_command: string; External command which is run to check
851
791
                     if client lives.  %() expansions are done at
859
799
    disable_initiator_tag: a GLib event source tag, or None
860
800
    enabled:    bool()
861
801
    fingerprint: string (40 or 32 hexadecimal digits); used to
862
 
                 uniquely identify an OpenPGP client
863
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
864
 
            a client using raw public keys
 
802
                 uniquely identify the client
865
803
    host:       string; available for use by the checker command
866
804
    interval:   datetime.timedelta(); How often to start a new checker
867
805
    last_approval_request: datetime.datetime(); (UTC) or None
885
823
    """
886
824
 
887
825
    runtime_expansions = ("approval_delay", "approval_duration",
888
 
                          "created", "enabled", "expires", "key_id",
 
826
                          "created", "enabled", "expires",
889
827
                          "fingerprint", "host", "interval",
890
828
                          "last_approval_request", "last_checked_ok",
891
829
                          "last_enabled", "name", "timeout")
921
859
            client["enabled"] = config.getboolean(client_name,
922
860
                                                  "enabled")
923
861
 
924
 
            # Uppercase and remove spaces from key_id and fingerprint
925
 
            # for later comparison purposes with return value from the
926
 
            # key_id() and fingerprint() functions
927
 
            client["key_id"] = (section.get("key_id", "").upper()
928
 
                                .replace(" ", ""))
 
862
            # Uppercase and remove spaces from fingerprint for later
 
863
            # comparison purposes with return value from the
 
864
            # fingerprint() function
929
865
            client["fingerprint"] = (section["fingerprint"].upper()
930
866
                                     .replace(" ", ""))
931
867
            if "secret" in section:
975
911
            self.expires = None
976
912
 
977
913
        logger.debug("Creating client %r", self.name)
978
 
        logger.debug("  Key ID: %s", self.key_id)
979
914
        logger.debug("  Fingerprint: %s", self.fingerprint)
980
915
        self.created = settings.get("created",
981
916
                                    datetime.datetime.utcnow())
1045
980
        if self.checker_initiator_tag is not None:
1046
981
            GLib.source_remove(self.checker_initiator_tag)
1047
982
        self.checker_initiator_tag = GLib.timeout_add(
1048
 
            random.randrange(int(self.interval.total_seconds() * 1000
1049
 
                                 + 1)),
 
983
            int(self.interval.total_seconds() * 1000),
1050
984
            self.start_checker)
1051
985
        # Schedule a disable() when 'timeout' has passed
1052
986
        if self.disable_initiator_tag is not None:
1059
993
    def checker_callback(self, source, condition, connection,
1060
994
                         command):
1061
995
        """The checker has completed, so take appropriate actions."""
 
996
        self.checker_callback_tag = None
 
997
        self.checker = None
1062
998
        # Read return code from connection (see call_pipe)
1063
999
        returncode = connection.recv()
1064
1000
        connection.close()
1065
 
        if self.checker is not None:
1066
 
            self.checker.join()
1067
 
        self.checker_callback_tag = None
1068
 
        self.checker = None
1069
1001
 
1070
1002
        if returncode >= 0:
1071
1003
            self.last_checker_status = returncode
1160
1092
                kwargs=popen_args)
1161
1093
            self.checker.start()
1162
1094
            self.checker_callback_tag = GLib.io_add_watch(
1163
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1164
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1095
                pipe[0].fileno(), GLib.IO_IN,
1165
1096
                self.checker_callback, pipe[0], command)
1166
1097
        # Re-run this periodically if run by GLib.timeout_add
1167
1098
        return True
1422
1353
                raise ValueError("Byte arrays not supported for non-"
1423
1354
                                 "'ay' signature {!r}"
1424
1355
                                 .format(prop._dbus_signature))
1425
 
            value = dbus.ByteArray(bytes(value))
 
1356
            value = dbus.ByteArray(b''.join(chr(byte)
 
1357
                                            for byte in value))
1426
1358
        prop(value)
1427
1359
 
1428
1360
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1528
1460
                         exc_info=error)
1529
1461
        return xmlstring
1530
1462
 
1531
 
 
1532
1463
try:
1533
1464
    dbus.OBJECT_MANAGER_IFACE
1534
1465
except AttributeError:
2066
1997
    def Name_dbus_property(self):
2067
1998
        return dbus.String(self.name)
2068
1999
 
2069
 
    # KeyID - property
2070
 
    @dbus_annotations(
2071
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2072
 
    @dbus_service_property(_interface, signature="s", access="read")
2073
 
    def KeyID_dbus_property(self):
2074
 
        return dbus.String(self.key_id)
2075
 
 
2076
2000
    # Fingerprint - property
2077
2001
    @dbus_annotations(
2078
2002
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2233
2157
    del _interface
2234
2158
 
2235
2159
 
2236
 
class ProxyClient:
2237
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
2160
class ProxyClient(object):
 
2161
    def __init__(self, child_pipe, fpr, address):
2238
2162
        self._pipe = child_pipe
2239
 
        self._pipe.send(('init', key_id, fpr, address))
 
2163
        self._pipe.send(('init', fpr, address))
2240
2164
        if not self._pipe.recv():
2241
 
            raise KeyError(key_id or fpr)
 
2165
            raise KeyError(fpr)
2242
2166
 
2243
2167
    def __getattribute__(self, name):
2244
2168
        if name == '_pipe':
2311
2235
 
2312
2236
            approval_required = False
2313
2237
            try:
2314
 
                if gnutls.has_rawpk:
2315
 
                    fpr = b""
2316
 
                    try:
2317
 
                        key_id = self.key_id(
2318
 
                            self.peer_certificate(session))
2319
 
                    except (TypeError, gnutls.Error) as error:
2320
 
                        logger.warning("Bad certificate: %s", error)
2321
 
                        return
2322
 
                    logger.debug("Key ID: %s", key_id)
2323
 
 
2324
 
                else:
2325
 
                    key_id = b""
2326
 
                    try:
2327
 
                        fpr = self.fingerprint(
2328
 
                            self.peer_certificate(session))
2329
 
                    except (TypeError, gnutls.Error) as error:
2330
 
                        logger.warning("Bad certificate: %s", error)
2331
 
                        return
2332
 
                    logger.debug("Fingerprint: %s", fpr)
2333
 
 
2334
 
                try:
2335
 
                    client = ProxyClient(child_pipe, key_id, fpr,
 
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,
2336
2248
                                         self.client_address)
2337
2249
                except KeyError:
2338
2250
                    return
2415
2327
 
2416
2328
    @staticmethod
2417
2329
    def peer_certificate(session):
2418
 
        "Return the peer's certificate as a bytestring"
2419
 
        try:
2420
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
2421
 
                                                     gnutls.CTYPE_PEERS)
2422
 
        except AttributeError:
2423
 
            cert_type = gnutls.certificate_type_get(session._c_object)
2424
 
        if gnutls.has_rawpk:
2425
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2426
 
        else:
2427
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2428
 
        # If not a valid certificate type...
2429
 
        if cert_type not in valid_cert_types:
2430
 
            logger.info("Cert type %r not in %r", cert_type,
2431
 
                        valid_cert_types)
 
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):
2432
2334
            # ...return invalid data
2433
2335
            return b""
2434
2336
        list_size = ctypes.c_uint(1)
2442
2344
        return ctypes.string_at(cert.data, cert.size)
2443
2345
 
2444
2346
    @staticmethod
2445
 
    def key_id(certificate):
2446
 
        "Convert a certificate bytestring to a hexdigit key ID"
2447
 
        # New GnuTLS "datum" with the public key
2448
 
        datum = gnutls.datum_t(
2449
 
            ctypes.cast(ctypes.c_char_p(certificate),
2450
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2451
 
            ctypes.c_uint(len(certificate)))
2452
 
        # XXX all these need to be created in the gnutls "module"
2453
 
        # New empty GnuTLS certificate
2454
 
        pubkey = gnutls.pubkey_t()
2455
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
2456
 
        # Import the raw public key into the certificate
2457
 
        gnutls.pubkey_import(pubkey,
2458
 
                             ctypes.byref(datum),
2459
 
                             gnutls.X509_FMT_DER)
2460
 
        # New buffer for the key ID
2461
 
        buf = ctypes.create_string_buffer(32)
2462
 
        buf_len = ctypes.c_size_t(len(buf))
2463
 
        # Get the key ID from the raw public key into the buffer
2464
 
        gnutls.pubkey_get_key_id(pubkey,
2465
 
                                 gnutls.KEYID_USE_SHA256,
2466
 
                                 ctypes.cast(ctypes.byref(buf),
2467
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
2468
 
                                 ctypes.byref(buf_len))
2469
 
        # Deinit the certificate
2470
 
        gnutls.pubkey_deinit(pubkey)
2471
 
 
2472
 
        # Convert the buffer to a Python bytestring
2473
 
        key_id = ctypes.string_at(buf, buf_len.value)
2474
 
        # Convert the bytestring to hexadecimal notation
2475
 
        hex_key_id = binascii.hexlify(key_id).upper()
2476
 
        return hex_key_id
2477
 
 
2478
 
    @staticmethod
2479
2347
    def fingerprint(openpgp):
2480
2348
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2481
2349
        # New GnuTLS "datum" with the OpenPGP public key
2495
2363
                                       ctypes.byref(crtverify))
2496
2364
        if crtverify.value != 0:
2497
2365
            gnutls.openpgp_crt_deinit(crt)
2498
 
            raise gnutls.CertificateSecurityError(code
2499
 
                                                  =crtverify.value)
 
2366
            raise gnutls.CertificateSecurityError("Verify failed")
2500
2367
        # New buffer for the fingerprint
2501
2368
        buf = ctypes.create_string_buffer(20)
2502
2369
        buf_len = ctypes.c_size_t()
2512
2379
        return hex_fpr
2513
2380
 
2514
2381
 
2515
 
class MultiprocessingMixIn:
 
2382
class MultiprocessingMixIn(object):
2516
2383
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2517
2384
 
2518
2385
    def sub_process_main(self, request, address):
2530
2397
        return proc
2531
2398
 
2532
2399
 
2533
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2400
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2534
2401
    """ adds a pipe to the MixIn """
2535
2402
 
2536
2403
    def process_request(self, request, client_address):
2551
2418
 
2552
2419
 
2553
2420
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2554
 
                     socketserver.TCPServer):
 
2421
                     socketserver.TCPServer, object):
2555
2422
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2556
2423
 
2557
2424
    Attributes:
2630
2497
                    raise
2631
2498
        # Only bind(2) the socket if we really need to.
2632
2499
        if self.server_address[0] or self.server_address[1]:
2633
 
            if self.server_address[1]:
2634
 
                self.allow_reuse_address = True
2635
2500
            if not self.server_address[0]:
2636
2501
                if self.address_family == socket.AF_INET6:
2637
2502
                    any_address = "::"  # in6addr_any
2690
2555
    def add_pipe(self, parent_pipe, proc):
2691
2556
        # Call "handle_ipc" for both data and EOF events
2692
2557
        GLib.io_add_watch(
2693
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2694
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2558
            parent_pipe.fileno(),
 
2559
            GLib.IO_IN | GLib.IO_HUP,
2695
2560
            functools.partial(self.handle_ipc,
2696
2561
                              parent_pipe=parent_pipe,
2697
2562
                              proc=proc))
2711
2576
        command = request[0]
2712
2577
 
2713
2578
        if command == 'init':
2714
 
            key_id = request[1].decode("ascii")
2715
 
            fpr = request[2].decode("ascii")
2716
 
            address = request[3]
 
2579
            fpr = request[1]
 
2580
            address = request[2]
2717
2581
 
2718
2582
            for c in self.clients.values():
2719
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2720
 
                    continue
2721
 
                if key_id and c.key_id == key_id:
2722
 
                    client = c
2723
 
                    break
2724
 
                if fpr and c.fingerprint == fpr:
 
2583
                if c.fingerprint == fpr:
2725
2584
                    client = c
2726
2585
                    break
2727
2586
            else:
2728
 
                logger.info("Client not found for key ID: %s, address"
2729
 
                            ": %s", key_id or fpr, address)
 
2587
                logger.info("Client not found for fingerprint: %s, ad"
 
2588
                            "dress: %s", fpr, address)
2730
2589
                if self.use_dbus:
2731
2590
                    # Emit D-Bus signal
2732
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2591
                    mandos_dbus_service.ClientNotFound(fpr,
2733
2592
                                                       address[0])
2734
2593
                parent_pipe.send(False)
2735
2594
                return False
2736
2595
 
2737
2596
            GLib.io_add_watch(
2738
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2739
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2597
                parent_pipe.fileno(),
 
2598
                GLib.IO_IN | GLib.IO_HUP,
2740
2599
                functools.partial(self.handle_ipc,
2741
2600
                                  parent_pipe=parent_pipe,
2742
2601
                                  proc=proc,
2757
2616
        if command == 'getattr':
2758
2617
            attrname = request[1]
2759
2618
            if isinstance(client_object.__getattribute__(attrname),
2760
 
                          collections.abc.Callable):
 
2619
                          collections.Callable):
2761
2620
                parent_pipe.send(('function', ))
2762
2621
            else:
2763
2622
                parent_pipe.send((
2774
2633
def rfc3339_duration_to_delta(duration):
2775
2634
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2776
2635
 
2777
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2778
 
    True
2779
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2780
 
    True
2781
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2782
 
    True
2783
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2784
 
    True
2785
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2786
 
    True
2787
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2788
 
    True
2789
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2790
 
    True
 
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)
2791
2650
    """
2792
2651
 
2793
2652
    # Parsing an RFC 3339 duration with regular expressions is not
2873
2732
def string_to_delta(interval):
2874
2733
    """Parse a string and return a datetime.timedelta
2875
2734
 
2876
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2877
 
    True
2878
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2879
 
    True
2880
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2881
 
    True
2882
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2883
 
    True
2884
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2885
 
    True
2886
 
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2887
 
    True
 
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)
2888
2747
    """
2889
2748
 
2890
2749
    try:
2992
2851
 
2993
2852
    options = parser.parse_args()
2994
2853
 
 
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
 
2995
2859
    # Default values for config file for server-global settings
2996
 
    if gnutls.has_rawpk:
2997
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2998
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2999
 
    else:
3000
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3001
 
                    ":+SIGN-DSA-SHA256")
3002
2860
    server_defaults = {"interface": "",
3003
2861
                       "address": "",
3004
2862
                       "port": "",
3005
2863
                       "debug": "False",
3006
 
                       "priority": priority,
 
2864
                       "priority":
 
2865
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2866
                       ":+SIGN-DSA-SHA256",
3007
2867
                       "servicename": "Mandos",
3008
2868
                       "use_dbus": "True",
3009
2869
                       "use_ipv6": "True",
3014
2874
                       "foreground": "False",
3015
2875
                       "zeroconf": "True",
3016
2876
                       }
3017
 
    del priority
3018
2877
 
3019
2878
    # Parse config file for server-global settings
3020
 
    server_config = configparser.ConfigParser(server_defaults)
 
2879
    server_config = configparser.SafeConfigParser(server_defaults)
3021
2880
    del server_defaults
3022
2881
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3023
 
    # Convert the ConfigParser object to a dict
 
2882
    # Convert the SafeConfigParser object to a dict
3024
2883
    server_settings = server_config.defaults()
3025
2884
    # Use the appropriate methods on the non-string config options
3026
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3027
 
                   "foreground", "zeroconf"):
 
2885
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3028
2886
        server_settings[option] = server_config.getboolean("DEFAULT",
3029
2887
                                                           option)
3030
2888
    if server_settings["port"]:
3098
2956
                                  server_settings["servicename"])))
3099
2957
 
3100
2958
    # Parse config file with clients
3101
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2959
    client_config = configparser.SafeConfigParser(Client
 
2960
                                                  .client_defaults)
3102
2961
    client_config.read(os.path.join(server_settings["configdir"],
3103
2962
                                    "clients.conf"))
3104
2963
 
3175
3034
        # Close all input and output, do double fork, etc.
3176
3035
        daemon()
3177
3036
 
3178
 
    if gi.version_info < (3, 10, 2):
3179
 
        # multiprocessing will use threads, so before we use GLib we
3180
 
        # need to inform GLib that threads will be used.
3181
 
        GLib.threads_init()
 
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()
3182
3040
 
3183
3041
    global main_loop
3184
3042
    # From the Avahi example code
3260
3118
                             if isinstance(s, bytes)
3261
3119
                             else s) for s in
3262
3120
                            value["client_structure"]]
3263
 
                        # .name, .host, and .checker_command
3264
 
                        for k in ("name", "host", "checker_command"):
 
3121
                        # .name & .host
 
3122
                        for k in ("name", "host"):
3265
3123
                            if isinstance(value[k], bytes):
3266
3124
                                value[k] = value[k].decode("utf-8")
3267
 
                        if "key_id" not in value:
3268
 
                            value["key_id"] = ""
3269
 
                        elif "fingerprint" not in value:
3270
 
                            value["fingerprint"] = ""
3271
3125
                    #  old_client_settings
3272
3126
                    # .keys()
3273
3127
                    old_client_settings = {
3277
3131
                        for key, value in
3278
3132
                        bytes_old_client_settings.items()}
3279
3133
                    del bytes_old_client_settings
3280
 
                    # .host and .checker_command
 
3134
                    # .host
3281
3135
                    for value in old_client_settings.values():
3282
 
                        for attribute in ("host", "checker_command"):
3283
 
                            if isinstance(value[attribute], bytes):
3284
 
                                value[attribute] = (value[attribute]
3285
 
                                                    .decode("utf-8"))
 
3136
                        if isinstance(value["host"], bytes):
 
3137
                            value["host"] = (value["host"]
 
3138
                                             .decode("utf-8"))
3286
3139
            os.remove(stored_state_path)
3287
3140
        except IOError as e:
3288
3141
            if e.errno == errno.ENOENT:
3411
3264
                pass
3412
3265
 
3413
3266
            @dbus.service.signal(_interface, signature="ss")
3414
 
            def ClientNotFound(self, key_id, address):
 
3267
            def ClientNotFound(self, fingerprint, address):
3415
3268
                "D-Bus signal"
3416
3269
                pass
3417
3270
 
3613
3466
                sys.exit(1)
3614
3467
            # End of Avahi example code
3615
3468
 
3616
 
        GLib.io_add_watch(
3617
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3618
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3619
 
            lambda *args, **kwargs: (tcp_server.handle_request
3620
 
                                     (*args[2:], **kwargs) or True))
 
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))
3621
3473
 
3622
3474
        logger.debug("Starting main loop")
3623
3475
        main_loop.run()
3633
3485
    # Must run before the D-Bus bus name gets deregistered
3634
3486
    cleanup()
3635
3487
 
3636
 
 
3637
 
def should_only_run_tests():
3638
 
    parser = argparse.ArgumentParser(add_help=False)
3639
 
    parser.add_argument("--check", action='store_true')
3640
 
    args, unknown_args = parser.parse_known_args()
3641
 
    run_tests = args.check
3642
 
    if run_tests:
3643
 
        # Remove --check argument from sys.argv
3644
 
        sys.argv[1:] = unknown_args
3645
 
    return run_tests
3646
 
 
3647
 
# Add all tests from doctest strings
3648
 
def load_tests(loader, tests, none):
3649
 
    import doctest
3650
 
    tests.addTests(doctest.DocTestSuite())
3651
 
    return tests
3652
3488
 
3653
3489
if __name__ == '__main__':
3654
 
    try:
3655
 
        if should_only_run_tests():
3656
 
            # Call using ./mandos --check [--verbose]
3657
 
            unittest.main()
3658
 
        else:
3659
 
            main()
3660
 
    finally:
3661
 
        logging.shutdown()
 
3490
    main()