/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-08-25 17:37:05 UTC
  • Revision ID: teddy@recompile.se-20160825173705-q2v6lban8ph9uw75
PEP8 compliance: mandos

* mandos: Add PEP8 compliance (as per the "pycodestyle" tool).

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
79
 
82
80
import dbus
83
81
import dbus.service
84
 
import gi
85
82
from gi.repository import GLib
86
83
from dbus.mainloop.glib import DBusGMainLoop
87
84
import ctypes
89
86
import xml.dom.minidom
90
87
import inspect
91
88
 
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
89
# Try to find the value of SO_BINDTODEVICE:
102
90
try:
103
91
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
123
111
            # No value found
124
112
            SO_BINDTODEVICE = None
125
113
 
126
 
if sys.version_info < (3, 2):
127
 
    configparser.Configparser = configparser.SafeConfigParser
 
114
if sys.version_info.major == 2:
 
115
    str = unicode
128
116
 
129
 
version = "1.8.9"
 
117
version = "1.7.10"
130
118
stored_state_file = "clients.pickle"
131
119
 
132
120
logger = logging.getLogger()
133
 
logging.captureWarnings(True)   # Show warnings via the logging system
134
121
syslogger = None
135
122
 
136
123
try:
191
178
    pass
192
179
 
193
180
 
194
 
class PGPEngine:
 
181
class PGPEngine(object):
195
182
    """A simple class for OpenPGP symmetric encryption & decryption"""
196
183
 
197
184
    def __init__(self):
201
188
            output = subprocess.check_output(["gpgconf"])
202
189
            for line in output.splitlines():
203
190
                name, text, path = line.split(b":")
204
 
                if name == b"gpg":
 
191
                if name == "gpg":
205
192
                    self.gpg = path
206
193
                    break
207
194
        except OSError as e:
212
199
                          '--force-mdc',
213
200
                          '--quiet']
214
201
        # Only GPG version 1 has the --no-use-agent option.
215
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
202
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
216
203
            self.gnupgargs.append("--no-use-agent")
217
204
 
218
205
    def __enter__(self):
287
274
 
288
275
 
289
276
# 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."""
 
277
class Avahi(object):
 
278
    """This isn't so much a class as it is a module-like namespace.
 
279
    It is instantiated once, and simulates having an Avahi module."""
292
280
    IF_UNSPEC = -1               # avahi-common/address.h
293
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
294
282
    PROTO_INET = 0               # avahi-common/address.h
298
286
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
299
287
    DBUS_PATH_SERVER = "/"
300
288
 
301
 
    @staticmethod
302
 
    def string_array_to_txt_array(t):
 
289
    def string_array_to_txt_array(self, t):
303
290
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
304
291
                           for s in t), signature="ay")
305
292
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
310
297
    SERVER_RUNNING = 2           # avahi-common/defs.h
311
298
    SERVER_COLLISION = 3         # avahi-common/defs.h
312
299
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
300
avahi = Avahi()
313
301
 
314
302
 
315
303
class AvahiError(Exception):
327
315
    pass
328
316
 
329
317
 
330
 
class AvahiService:
 
318
class AvahiService(object):
331
319
    """An Avahi (Zeroconf) service.
332
320
 
333
321
    Attributes:
507
495
class AvahiServiceToSyslog(AvahiService):
508
496
    def rename(self, *args, **kwargs):
509
497
        """Add the new name to the syslog messages"""
510
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
498
        ret = AvahiService.rename(self, *args, **kwargs)
511
499
        syslogger.setFormatter(logging.Formatter(
512
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
513
501
            .format(self.name)))
515
503
 
516
504
 
517
505
# 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."""
520
 
 
521
 
    library = ctypes.util.find_library("gnutls")
522
 
    if library is None:
523
 
        library = ctypes.util.find_library("gnutls-deb0")
524
 
    _library = ctypes.cdll.LoadLibrary(library)
525
 
    del library
 
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."""
 
509
 
 
510
    _library = ctypes.cdll.LoadLibrary(
 
511
        ctypes.util.find_library("gnutls"))
 
512
    _need_version = b"3.3.0"
 
513
 
 
514
    def __init__(self):
 
515
        # Need to use class name "GnuTLS" here, since this method is
 
516
        # called before the assignment to the "gnutls" global variable
 
517
        # happens.
 
518
        if GnuTLS.check_version(self._need_version) is None:
 
519
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
520
                               .format(self._need_version))
526
521
 
527
522
    # Unless otherwise indicated, the constants and types below are
528
523
    # all from the gnutls/gnutls.h C header file.
532
527
    E_INTERRUPTED = -52
533
528
    E_AGAIN = -28
534
529
    CRT_OPENPGP = 2
535
 
    CRT_RAWPK = 3
536
530
    CLIENT = 2
537
531
    SHUT_RDWR = 0
538
532
    CRD_CERTIFICATE = 1
539
533
    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
534
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
546
535
 
547
536
    # Types
570
559
 
571
560
    # Exceptions
572
561
    class Error(Exception):
 
562
        # We need to use the class name "GnuTLS" here, since this
 
563
        # exception might be raised from within GnuTLS.__init__,
 
564
        # which is called before the assignment to the "gnutls"
 
565
        # global variable has happened.
573
566
        def __init__(self, message=None, code=None, args=()):
574
567
            # Default usage is by a message string, but if a return
575
568
            # code is passed, convert it to a string with
576
569
            # gnutls.strerror()
577
570
            self.code = code
578
571
            if message is None and code is not None:
579
 
                message = gnutls.strerror(code)
580
 
            return super(gnutls.Error, self).__init__(
 
572
                message = GnuTLS.strerror(code)
 
573
            return super(GnuTLS.Error, self).__init__(
581
574
                message, *args)
582
575
 
583
576
    class CertificateSecurityError(Error):
584
577
        pass
585
578
 
586
579
    # Classes
587
 
    class Credentials:
 
580
    class Credentials(object):
588
581
        def __init__(self):
589
582
            self._c_object = gnutls.certificate_credentials_t()
590
583
            gnutls.certificate_allocate_credentials(
594
587
        def __del__(self):
595
588
            gnutls.certificate_free_credentials(self._c_object)
596
589
 
597
 
    class ClientSession:
 
590
    class ClientSession(object):
598
591
        def __init__(self, socket, credentials=None):
599
592
            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
 
593
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
607
594
            gnutls.set_default_priority(self._c_object)
608
595
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
609
596
            gnutls.handshake_set_private_extensions(self._c_object,
741
728
    check_version.argtypes = [ctypes.c_char_p]
742
729
    check_version.restype = ctypes.c_char_p
743
730
 
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
 
731
    # All the function declarations below are from gnutls/openpgp.h
 
732
 
 
733
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
734
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
735
    openpgp_crt_init.restype = _error_code
 
736
 
 
737
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
738
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
739
                                   ctypes.POINTER(datum_t),
 
740
                                   openpgp_crt_fmt_t]
 
741
    openpgp_crt_import.restype = _error_code
 
742
 
 
743
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
744
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
745
                                        ctypes.POINTER(ctypes.c_uint)]
 
746
    openpgp_crt_verify_self.restype = _error_code
 
747
 
 
748
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
749
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
750
    openpgp_crt_deinit.restype = None
 
751
 
 
752
    openpgp_crt_get_fingerprint = (
 
753
        _library.gnutls_openpgp_crt_get_fingerprint)
 
754
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
755
                                            ctypes.c_void_p,
 
756
                                            ctypes.POINTER(
 
757
                                                ctypes.c_size_t)]
 
758
    openpgp_crt_get_fingerprint.restype = _error_code
813
759
 
814
760
    # Remove non-public functions
815
761
    del _error_code, _retry_on_error
 
762
# Create the global "gnutls" object, simulating a module
 
763
gnutls = GnuTLS()
816
764
 
817
765
 
818
766
def call_pipe(connection,       # : multiprocessing.Connection
826
774
    connection.close()
827
775
 
828
776
 
829
 
class Client:
 
777
class Client(object):
830
778
    """A representation of a client host served by this server.
831
779
 
832
780
    Attributes:
833
781
    approved:   bool(); 'None' if not yet approved/disapproved
834
782
    approval_delay: datetime.timedelta(); Time to wait for approval
835
783
    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.
 
784
    checker:    subprocess.Popen(); a running checker process used
 
785
                                    to see if the client lives.
 
786
                                    'None' if no process is running.
839
787
    checker_callback_tag: a GLib event source tag, or None
840
788
    checker_command: string; External command which is run to check
841
789
                     if client lives.  %() expansions are done at
849
797
    disable_initiator_tag: a GLib event source tag, or None
850
798
    enabled:    bool()
851
799
    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
 
800
                 uniquely identify the client
855
801
    host:       string; available for use by the checker command
856
802
    interval:   datetime.timedelta(); How often to start a new checker
857
803
    last_approval_request: datetime.datetime(); (UTC) or None
875
821
    """
876
822
 
877
823
    runtime_expansions = ("approval_delay", "approval_duration",
878
 
                          "created", "enabled", "expires", "key_id",
 
824
                          "created", "enabled", "expires",
879
825
                          "fingerprint", "host", "interval",
880
826
                          "last_approval_request", "last_checked_ok",
881
827
                          "last_enabled", "name", "timeout")
911
857
            client["enabled"] = config.getboolean(client_name,
912
858
                                                  "enabled")
913
859
 
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(" ", ""))
 
860
            # Uppercase and remove spaces from fingerprint for later
 
861
            # comparison purposes with return value from the
 
862
            # fingerprint() function
919
863
            client["fingerprint"] = (section["fingerprint"].upper()
920
864
                                     .replace(" ", ""))
921
865
            if "secret" in section:
965
909
            self.expires = None
966
910
 
967
911
        logger.debug("Creating client %r", self.name)
968
 
        logger.debug("  Key ID: %s", self.key_id)
969
912
        logger.debug("  Fingerprint: %s", self.fingerprint)
970
913
        self.created = settings.get("created",
971
914
                                    datetime.datetime.utcnow())
1048
991
    def checker_callback(self, source, condition, connection,
1049
992
                         command):
1050
993
        """The checker has completed, so take appropriate actions."""
 
994
        self.checker_callback_tag = None
 
995
        self.checker = None
1051
996
        # Read return code from connection (see call_pipe)
1052
997
        returncode = connection.recv()
1053
998
        connection.close()
1054
 
        if self.checker is not None:
1055
 
            self.checker.join()
1056
 
        self.checker_callback_tag = None
1057
 
        self.checker = None
1058
999
 
1059
1000
        if returncode >= 0:
1060
1001
            self.last_checker_status = returncode
1149
1090
                kwargs=popen_args)
1150
1091
            self.checker.start()
1151
1092
            self.checker_callback_tag = GLib.io_add_watch(
1152
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1093
                pipe[0].fileno(), GLib.IO_IN,
1154
1094
                self.checker_callback, pipe[0], command)
1155
1095
        # Re-run this periodically if run by GLib.timeout_add
1156
1096
        return True
1411
1351
                raise ValueError("Byte arrays not supported for non-"
1412
1352
                                 "'ay' signature {!r}"
1413
1353
                                 .format(prop._dbus_signature))
1414
 
            value = dbus.ByteArray(bytes(value))
 
1354
            value = dbus.ByteArray(b''.join(chr(byte)
 
1355
                                            for byte in value))
1415
1356
        prop(value)
1416
1357
 
1417
1358
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1517
1458
                         exc_info=error)
1518
1459
        return xmlstring
1519
1460
 
1520
 
 
1521
1461
try:
1522
1462
    dbus.OBJECT_MANAGER_IFACE
1523
1463
except AttributeError:
2055
1995
    def Name_dbus_property(self):
2056
1996
        return dbus.String(self.name)
2057
1997
 
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
1998
    # Fingerprint - property
2066
1999
    @dbus_annotations(
2067
2000
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2222
2155
    del _interface
2223
2156
 
2224
2157
 
2225
 
class ProxyClient:
2226
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
2158
class ProxyClient(object):
 
2159
    def __init__(self, child_pipe, fpr, address):
2227
2160
        self._pipe = child_pipe
2228
 
        self._pipe.send(('init', key_id, fpr, address))
 
2161
        self._pipe.send(('init', fpr, address))
2229
2162
        if not self._pipe.recv():
2230
 
            raise KeyError(key_id or fpr)
 
2163
            raise KeyError(fpr)
2231
2164
 
2232
2165
    def __getattribute__(self, name):
2233
2166
        if name == '_pipe':
2300
2233
 
2301
2234
            approval_required = False
2302
2235
            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,
 
2236
                try:
 
2237
                    fpr = self.fingerprint(
 
2238
                        self.peer_certificate(session))
 
2239
                except (TypeError, gnutls.Error) as error:
 
2240
                    logger.warning("Bad certificate: %s", error)
 
2241
                    return
 
2242
                logger.debug("Fingerprint: %s", fpr)
 
2243
 
 
2244
                try:
 
2245
                    client = ProxyClient(child_pipe, fpr,
2325
2246
                                         self.client_address)
2326
2247
                except KeyError:
2327
2248
                    return
2404
2325
 
2405
2326
    @staticmethod
2406
2327
    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)
 
2328
        "Return the peer's OpenPGP certificate as a bytestring"
 
2329
        # If not an OpenPGP certificate...
 
2330
        if (gnutls.certificate_type_get(session._c_object)
 
2331
            != gnutls.CRT_OPENPGP):
2421
2332
            # ...return invalid data
2422
2333
            return b""
2423
2334
        list_size = ctypes.c_uint(1)
2431
2342
        return ctypes.string_at(cert.data, cert.size)
2432
2343
 
2433
2344
    @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
2345
    def fingerprint(openpgp):
2469
2346
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2470
2347
        # New GnuTLS "datum" with the OpenPGP public key
2484
2361
                                       ctypes.byref(crtverify))
2485
2362
        if crtverify.value != 0:
2486
2363
            gnutls.openpgp_crt_deinit(crt)
2487
 
            raise gnutls.CertificateSecurityError(code
2488
 
                                                  =crtverify.value)
 
2364
            raise gnutls.CertificateSecurityError("Verify failed")
2489
2365
        # New buffer for the fingerprint
2490
2366
        buf = ctypes.create_string_buffer(20)
2491
2367
        buf_len = ctypes.c_size_t()
2501
2377
        return hex_fpr
2502
2378
 
2503
2379
 
2504
 
class MultiprocessingMixIn:
 
2380
class MultiprocessingMixIn(object):
2505
2381
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2506
2382
 
2507
2383
    def sub_process_main(self, request, address):
2519
2395
        return proc
2520
2396
 
2521
2397
 
2522
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2398
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2523
2399
    """ adds a pipe to the MixIn """
2524
2400
 
2525
2401
    def process_request(self, request, client_address):
2540
2416
 
2541
2417
 
2542
2418
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2543
 
                     socketserver.TCPServer):
 
2419
                     socketserver.TCPServer, object):
2544
2420
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2545
2421
 
2546
2422
    Attributes:
2619
2495
                    raise
2620
2496
        # Only bind(2) the socket if we really need to.
2621
2497
        if self.server_address[0] or self.server_address[1]:
2622
 
            if self.server_address[1]:
2623
 
                self.allow_reuse_address = True
2624
2498
            if not self.server_address[0]:
2625
2499
                if self.address_family == socket.AF_INET6:
2626
2500
                    any_address = "::"  # in6addr_any
2679
2553
    def add_pipe(self, parent_pipe, proc):
2680
2554
        # Call "handle_ipc" for both data and EOF events
2681
2555
        GLib.io_add_watch(
2682
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2683
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2556
            parent_pipe.fileno(),
 
2557
            GLib.IO_IN | GLib.IO_HUP,
2684
2558
            functools.partial(self.handle_ipc,
2685
2559
                              parent_pipe=parent_pipe,
2686
2560
                              proc=proc))
2700
2574
        command = request[0]
2701
2575
 
2702
2576
        if command == 'init':
2703
 
            key_id = request[1].decode("ascii")
2704
 
            fpr = request[2].decode("ascii")
2705
 
            address = request[3]
 
2577
            fpr = request[1]
 
2578
            address = request[2]
2706
2579
 
2707
2580
            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:
 
2581
                if c.fingerprint == fpr:
2714
2582
                    client = c
2715
2583
                    break
2716
2584
            else:
2717
 
                logger.info("Client not found for key ID: %s, address"
2718
 
                            ": %s", key_id or fpr, address)
 
2585
                logger.info("Client not found for fingerprint: %s, ad"
 
2586
                            "dress: %s", fpr, address)
2719
2587
                if self.use_dbus:
2720
2588
                    # Emit D-Bus signal
2721
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2589
                    mandos_dbus_service.ClientNotFound(fpr,
2722
2590
                                                       address[0])
2723
2591
                parent_pipe.send(False)
2724
2592
                return False
2725
2593
 
2726
2594
            GLib.io_add_watch(
2727
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2728
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2595
                parent_pipe.fileno(),
 
2596
                GLib.IO_IN | GLib.IO_HUP,
2729
2597
                functools.partial(self.handle_ipc,
2730
2598
                                  parent_pipe=parent_pipe,
2731
2599
                                  proc=proc,
2763
2631
def rfc3339_duration_to_delta(duration):
2764
2632
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2765
2633
 
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
 
2634
    >>> rfc3339_duration_to_delta("P7D")
 
2635
    datetime.timedelta(7)
 
2636
    >>> rfc3339_duration_to_delta("PT60S")
 
2637
    datetime.timedelta(0, 60)
 
2638
    >>> rfc3339_duration_to_delta("PT60M")
 
2639
    datetime.timedelta(0, 3600)
 
2640
    >>> rfc3339_duration_to_delta("PT24H")
 
2641
    datetime.timedelta(1)
 
2642
    >>> rfc3339_duration_to_delta("P1W")
 
2643
    datetime.timedelta(7)
 
2644
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2645
    datetime.timedelta(0, 330)
 
2646
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2647
    datetime.timedelta(1, 200)
2780
2648
    """
2781
2649
 
2782
2650
    # Parsing an RFC 3339 duration with regular expressions is not
2862
2730
def string_to_delta(interval):
2863
2731
    """Parse a string and return a datetime.timedelta
2864
2732
 
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
 
2733
    >>> string_to_delta('7d')
 
2734
    datetime.timedelta(7)
 
2735
    >>> string_to_delta('60s')
 
2736
    datetime.timedelta(0, 60)
 
2737
    >>> string_to_delta('60m')
 
2738
    datetime.timedelta(0, 3600)
 
2739
    >>> string_to_delta('24h')
 
2740
    datetime.timedelta(1)
 
2741
    >>> string_to_delta('1w')
 
2742
    datetime.timedelta(7)
 
2743
    >>> string_to_delta('5m 30s')
 
2744
    datetime.timedelta(0, 330)
2877
2745
    """
2878
2746
 
2879
2747
    try:
2981
2849
 
2982
2850
    options = parser.parse_args()
2983
2851
 
 
2852
    if options.check:
 
2853
        import doctest
 
2854
        fail_count, test_count = doctest.testmod()
 
2855
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2856
 
2984
2857
    # 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
2858
    server_defaults = {"interface": "",
2992
2859
                       "address": "",
2993
2860
                       "port": "",
2994
2861
                       "debug": "False",
2995
 
                       "priority": priority,
 
2862
                       "priority":
 
2863
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2864
                       ":+SIGN-DSA-SHA256",
2996
2865
                       "servicename": "Mandos",
2997
2866
                       "use_dbus": "True",
2998
2867
                       "use_ipv6": "True",
3003
2872
                       "foreground": "False",
3004
2873
                       "zeroconf": "True",
3005
2874
                       }
3006
 
    del priority
3007
2875
 
3008
2876
    # Parse config file for server-global settings
3009
 
    server_config = configparser.ConfigParser(server_defaults)
 
2877
    server_config = configparser.SafeConfigParser(server_defaults)
3010
2878
    del server_defaults
3011
2879
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3012
 
    # Convert the ConfigParser object to a dict
 
2880
    # Convert the SafeConfigParser object to a dict
3013
2881
    server_settings = server_config.defaults()
3014
2882
    # Use the appropriate methods on the non-string config options
3015
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3016
 
                   "foreground", "zeroconf"):
 
2883
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3017
2884
        server_settings[option] = server_config.getboolean("DEFAULT",
3018
2885
                                                           option)
3019
2886
    if server_settings["port"]:
3087
2954
                                  server_settings["servicename"])))
3088
2955
 
3089
2956
    # Parse config file with clients
3090
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2957
    client_config = configparser.SafeConfigParser(Client
 
2958
                                                  .client_defaults)
3091
2959
    client_config.read(os.path.join(server_settings["configdir"],
3092
2960
                                    "clients.conf"))
3093
2961
 
3164
3032
        # Close all input and output, do double fork, etc.
3165
3033
        daemon()
3166
3034
 
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()
 
3035
    # multiprocessing will use threads, so before we use GLib we need
 
3036
    # to inform GLib that threads will be used.
 
3037
    GLib.threads_init()
3171
3038
 
3172
3039
    global main_loop
3173
3040
    # From the Avahi example code
3249
3116
                             if isinstance(s, bytes)
3250
3117
                             else s) for s in
3251
3118
                            value["client_structure"]]
3252
 
                        # .name, .host, and .checker_command
3253
 
                        for k in ("name", "host", "checker_command"):
 
3119
                        # .name & .host
 
3120
                        for k in ("name", "host"):
3254
3121
                            if isinstance(value[k], bytes):
3255
3122
                                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
3123
                    #  old_client_settings
3261
3124
                    # .keys()
3262
3125
                    old_client_settings = {
3266
3129
                        for key, value in
3267
3130
                        bytes_old_client_settings.items()}
3268
3131
                    del bytes_old_client_settings
3269
 
                    # .host and .checker_command
 
3132
                    # .host
3270
3133
                    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"))
 
3134
                        if isinstance(value["host"], bytes):
 
3135
                            value["host"] = (value["host"]
 
3136
                                             .decode("utf-8"))
3275
3137
            os.remove(stored_state_path)
3276
3138
        except IOError as e:
3277
3139
            if e.errno == errno.ENOENT:
3400
3262
                pass
3401
3263
 
3402
3264
            @dbus.service.signal(_interface, signature="ss")
3403
 
            def ClientNotFound(self, key_id, address):
 
3265
            def ClientNotFound(self, fingerprint, address):
3404
3266
                "D-Bus signal"
3405
3267
                pass
3406
3268
 
3602
3464
                sys.exit(1)
3603
3465
            # End of Avahi example code
3604
3466
 
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))
 
3467
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3468
                          lambda *args, **kwargs:
 
3469
                          (tcp_server.handle_request
 
3470
                           (*args[2:], **kwargs) or True))
3610
3471
 
3611
3472
        logger.debug("Starting main loop")
3612
3473
        main_loop.run()
3622
3483
    # Must run before the D-Bus bus name gets deregistered
3623
3484
    cleanup()
3624
3485
 
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
3486
 
3642
3487
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()
 
3488
    main()