/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: 2019-08-16 19:32:47 UTC
  • Revision ID: teddy@recompile.se-20190816193247-3swy47ofqe7cr1i0
http://bugs.debian.org/934888
From: Grégoire Scano <gregoire.scano@malloc.fr>

Add French debconf translation

* debian/po/fr.po: New.

Acked-by: Teddy Hogeborn <teddy@recompile.se>

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
16
 
#
17
 
# This program is free software: you can redistribute it and/or modify
18
 
# it under the terms of the GNU General Public License as published by
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
15
# Copyright © 2008-2019 Björn Påhlsson
 
16
#
 
17
# This file is part of Mandos.
 
18
#
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
21
23
#
22
 
#     This program is distributed in the hope that it will be useful,
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
25
27
#     GNU General Public License for more details.
26
28
#
27
29
# You should have received a copy of the GNU General Public License
28
 
# along with this program.  If not, see
29
 
# <http://www.gnu.org/licenses/>.
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
30
31
#
31
32
# Contact the authors at <mandos@recompile.se>.
32
33
#
79
80
 
80
81
import dbus
81
82
import dbus.service
 
83
import gi
82
84
from gi.repository import GLib
83
85
from dbus.mainloop.glib import DBusGMainLoop
84
86
import ctypes
86
88
import xml.dom.minidom
87
89
import inspect
88
90
 
 
91
if sys.version_info.major == 2:
 
92
    __metaclass__ = type
 
93
 
89
94
# Try to find the value of SO_BINDTODEVICE:
90
95
try:
91
96
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
114
119
if sys.version_info.major == 2:
115
120
    str = unicode
116
121
 
117
 
version = "1.7.14"
 
122
if sys.version_info < (3, 2):
 
123
    configparser.Configparser = configparser.SafeConfigParser
 
124
 
 
125
version = "1.8.7"
118
126
stored_state_file = "clients.pickle"
119
127
 
120
128
logger = logging.getLogger()
178
186
    pass
179
187
 
180
188
 
181
 
class PGPEngine(object):
 
189
class PGPEngine:
182
190
    """A simple class for OpenPGP symmetric encryption & decryption"""
183
191
 
184
192
    def __init__(self):
274
282
 
275
283
 
276
284
# Pretend that we have an Avahi module
277
 
class Avahi(object):
278
 
    """This isn't so much a class as it is a module-like namespace.
279
 
    It is instantiated once, and simulates having an Avahi module."""
 
285
class avahi:
 
286
    """This isn't so much a class as it is a module-like namespace."""
280
287
    IF_UNSPEC = -1               # avahi-common/address.h
281
288
    PROTO_UNSPEC = -1            # avahi-common/address.h
282
289
    PROTO_INET = 0               # avahi-common/address.h
286
293
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
294
    DBUS_PATH_SERVER = "/"
288
295
 
289
 
    def string_array_to_txt_array(self, t):
 
296
    @staticmethod
 
297
    def string_array_to_txt_array(t):
290
298
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
299
                           for s in t), signature="ay")
292
300
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
297
305
    SERVER_RUNNING = 2           # avahi-common/defs.h
298
306
    SERVER_COLLISION = 3         # avahi-common/defs.h
299
307
    SERVER_FAILURE = 4           # avahi-common/defs.h
300
 
avahi = Avahi()
301
308
 
302
309
 
303
310
class AvahiError(Exception):
315
322
    pass
316
323
 
317
324
 
318
 
class AvahiService(object):
 
325
class AvahiService:
319
326
    """An Avahi (Zeroconf) service.
320
327
 
321
328
    Attributes:
495
502
class AvahiServiceToSyslog(AvahiService):
496
503
    def rename(self, *args, **kwargs):
497
504
        """Add the new name to the syslog messages"""
498
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
505
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
506
        syslogger.setFormatter(logging.Formatter(
500
507
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
508
            .format(self.name)))
503
510
 
504
511
 
505
512
# Pretend that we have a GnuTLS module
506
 
class GnuTLS(object):
507
 
    """This isn't so much a class as it is a module-like namespace.
508
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
513
class gnutls:
 
514
    """This isn't so much a class as it is a module-like namespace."""
509
515
 
510
516
    library = ctypes.util.find_library("gnutls")
511
517
    if library is None:
512
518
        library = ctypes.util.find_library("gnutls-deb0")
513
519
    _library = ctypes.cdll.LoadLibrary(library)
514
520
    del library
515
 
    _need_version = b"3.3.0"
516
 
 
517
 
    def __init__(self):
518
 
        # Need to use "self" here, since this method is called before
519
 
        # the assignment to the "gnutls" global variable happens.
520
 
        if self.check_version(self._need_version) is None:
521
 
            raise self.Error("Needs GnuTLS {} or later"
522
 
                             .format(self._need_version))
523
521
 
524
522
    # Unless otherwise indicated, the constants and types below are
525
523
    # all from the gnutls/gnutls.h C header file.
529
527
    E_INTERRUPTED = -52
530
528
    E_AGAIN = -28
531
529
    CRT_OPENPGP = 2
 
530
    CRT_RAWPK = 3
532
531
    CLIENT = 2
533
532
    SHUT_RDWR = 0
534
533
    CRD_CERTIFICATE = 1
535
534
    E_NO_CERTIFICATE_FOUND = -49
 
535
    X509_FMT_DER = 0
 
536
    NO_TICKETS = 1<<10
 
537
    ENABLE_RAWPK = 1<<18
 
538
    CTYPE_PEERS = 3
 
539
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
536
540
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
537
541
 
538
542
    # Types
561
565
 
562
566
    # Exceptions
563
567
    class Error(Exception):
564
 
        # We need to use the class name "GnuTLS" here, since this
565
 
        # exception might be raised from within GnuTLS.__init__,
566
 
        # which is called before the assignment to the "gnutls"
567
 
        # global variable has happened.
568
568
        def __init__(self, message=None, code=None, args=()):
569
569
            # Default usage is by a message string, but if a return
570
570
            # code is passed, convert it to a string with
571
571
            # gnutls.strerror()
572
572
            self.code = code
573
573
            if message is None and code is not None:
574
 
                message = GnuTLS.strerror(code)
575
 
            return super(GnuTLS.Error, self).__init__(
 
574
                message = gnutls.strerror(code)
 
575
            return super(gnutls.Error, self).__init__(
576
576
                message, *args)
577
577
 
578
578
    class CertificateSecurityError(Error):
579
579
        pass
580
580
 
581
581
    # Classes
582
 
    class Credentials(object):
 
582
    class Credentials:
583
583
        def __init__(self):
584
584
            self._c_object = gnutls.certificate_credentials_t()
585
585
            gnutls.certificate_allocate_credentials(
589
589
        def __del__(self):
590
590
            gnutls.certificate_free_credentials(self._c_object)
591
591
 
592
 
    class ClientSession(object):
 
592
    class ClientSession:
593
593
        def __init__(self, socket, credentials=None):
594
594
            self._c_object = gnutls.session_t()
595
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
595
            gnutls_flags = gnutls.CLIENT
 
596
            if gnutls.check_version(b"3.5.6"):
 
597
                gnutls_flags |= gnutls.NO_TICKETS
 
598
            if gnutls.has_rawpk:
 
599
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
600
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
601
            del gnutls_flags
596
602
            gnutls.set_default_priority(self._c_object)
597
603
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
598
604
            gnutls.handshake_set_private_extensions(self._c_object,
730
736
    check_version.argtypes = [ctypes.c_char_p]
731
737
    check_version.restype = ctypes.c_char_p
732
738
 
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
 
739
    _need_version = b"3.3.0"
 
740
    if check_version(_need_version) is None:
 
741
        raise self.Error("Needs GnuTLS {} or later"
 
742
                         .format(_need_version))
 
743
 
 
744
    _tls_rawpk_version = b"3.6.6"
 
745
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
746
 
 
747
    if has_rawpk:
 
748
        # Types
 
749
        class pubkey_st(ctypes.Structure):
 
750
            _fields = []
 
751
        pubkey_t = ctypes.POINTER(pubkey_st)
 
752
 
 
753
        x509_crt_fmt_t = ctypes.c_int
 
754
 
 
755
        # All the function declarations below are from gnutls/abstract.h
 
756
        pubkey_init = _library.gnutls_pubkey_init
 
757
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
758
        pubkey_init.restype = _error_code
 
759
 
 
760
        pubkey_import = _library.gnutls_pubkey_import
 
761
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
762
                                  x509_crt_fmt_t]
 
763
        pubkey_import.restype = _error_code
 
764
 
 
765
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
766
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
767
                                      ctypes.POINTER(ctypes.c_ubyte),
 
768
                                      ctypes.POINTER(ctypes.c_size_t)]
 
769
        pubkey_get_key_id.restype = _error_code
 
770
 
 
771
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
772
        pubkey_deinit.argtypes = [pubkey_t]
 
773
        pubkey_deinit.restype = None
 
774
    else:
 
775
        # All the function declarations below are from gnutls/openpgp.h
 
776
 
 
777
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
778
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
779
        openpgp_crt_init.restype = _error_code
 
780
 
 
781
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
782
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
783
                                       ctypes.POINTER(datum_t),
 
784
                                       openpgp_crt_fmt_t]
 
785
        openpgp_crt_import.restype = _error_code
 
786
 
 
787
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
788
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
789
                                            ctypes.POINTER(ctypes.c_uint)]
 
790
        openpgp_crt_verify_self.restype = _error_code
 
791
 
 
792
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
793
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
794
        openpgp_crt_deinit.restype = None
 
795
 
 
796
        openpgp_crt_get_fingerprint = (
 
797
            _library.gnutls_openpgp_crt_get_fingerprint)
 
798
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
799
                                                ctypes.c_void_p,
 
800
                                                ctypes.POINTER(
 
801
                                                    ctypes.c_size_t)]
 
802
        openpgp_crt_get_fingerprint.restype = _error_code
 
803
 
 
804
    if check_version(b"3.6.4"):
 
805
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
806
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
807
        certificate_type_get2.restype = _error_code
761
808
 
762
809
    # Remove non-public functions
763
810
    del _error_code, _retry_on_error
764
 
# Create the global "gnutls" object, simulating a module
765
 
gnutls = GnuTLS()
766
811
 
767
812
 
768
813
def call_pipe(connection,       # : multiprocessing.Connection
776
821
    connection.close()
777
822
 
778
823
 
779
 
class Client(object):
 
824
class Client:
780
825
    """A representation of a client host served by this server.
781
826
 
782
827
    Attributes:
783
828
    approved:   bool(); 'None' if not yet approved/disapproved
784
829
    approval_delay: datetime.timedelta(); Time to wait for approval
785
830
    approval_duration: datetime.timedelta(); Duration of one approval
786
 
    checker:    subprocess.Popen(); a running checker process used
787
 
                                    to see if the client lives.
788
 
                                    'None' if no process is running.
 
831
    checker: multiprocessing.Process(); a running checker process used
 
832
             to see if the client lives. 'None' if no process is
 
833
             running.
789
834
    checker_callback_tag: a GLib event source tag, or None
790
835
    checker_command: string; External command which is run to check
791
836
                     if client lives.  %() expansions are done at
799
844
    disable_initiator_tag: a GLib event source tag, or None
800
845
    enabled:    bool()
801
846
    fingerprint: string (40 or 32 hexadecimal digits); used to
802
 
                 uniquely identify the client
 
847
                 uniquely identify an OpenPGP client
 
848
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
849
            a client using raw public keys
803
850
    host:       string; available for use by the checker command
804
851
    interval:   datetime.timedelta(); How often to start a new checker
805
852
    last_approval_request: datetime.datetime(); (UTC) or None
823
870
    """
824
871
 
825
872
    runtime_expansions = ("approval_delay", "approval_duration",
826
 
                          "created", "enabled", "expires",
 
873
                          "created", "enabled", "expires", "key_id",
827
874
                          "fingerprint", "host", "interval",
828
875
                          "last_approval_request", "last_checked_ok",
829
876
                          "last_enabled", "name", "timeout")
859
906
            client["enabled"] = config.getboolean(client_name,
860
907
                                                  "enabled")
861
908
 
862
 
            # Uppercase and remove spaces from fingerprint for later
863
 
            # comparison purposes with return value from the
864
 
            # fingerprint() function
 
909
            # Uppercase and remove spaces from key_id and fingerprint
 
910
            # for later comparison purposes with return value from the
 
911
            # key_id() and fingerprint() functions
 
912
            client["key_id"] = (section.get("key_id", "").upper()
 
913
                                .replace(" ", ""))
865
914
            client["fingerprint"] = (section["fingerprint"].upper()
866
915
                                     .replace(" ", ""))
867
916
            if "secret" in section:
911
960
            self.expires = None
912
961
 
913
962
        logger.debug("Creating client %r", self.name)
 
963
        logger.debug("  Key ID: %s", self.key_id)
914
964
        logger.debug("  Fingerprint: %s", self.fingerprint)
915
965
        self.created = settings.get("created",
916
966
                                    datetime.datetime.utcnow())
993
1043
    def checker_callback(self, source, condition, connection,
994
1044
                         command):
995
1045
        """The checker has completed, so take appropriate actions."""
996
 
        self.checker_callback_tag = None
997
 
        self.checker = None
998
1046
        # Read return code from connection (see call_pipe)
999
1047
        returncode = connection.recv()
1000
1048
        connection.close()
 
1049
        self.checker.join()
 
1050
        self.checker_callback_tag = None
 
1051
        self.checker = None
1001
1052
 
1002
1053
        if returncode >= 0:
1003
1054
            self.last_checker_status = returncode
1998
2049
    def Name_dbus_property(self):
1999
2050
        return dbus.String(self.name)
2000
2051
 
 
2052
    # KeyID - property
 
2053
    @dbus_annotations(
 
2054
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2055
    @dbus_service_property(_interface, signature="s", access="read")
 
2056
    def KeyID_dbus_property(self):
 
2057
        return dbus.String(self.key_id)
 
2058
 
2001
2059
    # Fingerprint - property
2002
2060
    @dbus_annotations(
2003
2061
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2158
2216
    del _interface
2159
2217
 
2160
2218
 
2161
 
class ProxyClient(object):
2162
 
    def __init__(self, child_pipe, fpr, address):
 
2219
class ProxyClient:
 
2220
    def __init__(self, child_pipe, key_id, fpr, address):
2163
2221
        self._pipe = child_pipe
2164
 
        self._pipe.send(('init', fpr, address))
 
2222
        self._pipe.send(('init', key_id, fpr, address))
2165
2223
        if not self._pipe.recv():
2166
 
            raise KeyError(fpr)
 
2224
            raise KeyError(key_id or fpr)
2167
2225
 
2168
2226
    def __getattribute__(self, name):
2169
2227
        if name == '_pipe':
2236
2294
 
2237
2295
            approval_required = False
2238
2296
            try:
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,
 
2297
                if gnutls.has_rawpk:
 
2298
                    fpr = b""
 
2299
                    try:
 
2300
                        key_id = self.key_id(
 
2301
                            self.peer_certificate(session))
 
2302
                    except (TypeError, gnutls.Error) as error:
 
2303
                        logger.warning("Bad certificate: %s", error)
 
2304
                        return
 
2305
                    logger.debug("Key ID: %s", key_id)
 
2306
 
 
2307
                else:
 
2308
                    key_id = b""
 
2309
                    try:
 
2310
                        fpr = self.fingerprint(
 
2311
                            self.peer_certificate(session))
 
2312
                    except (TypeError, gnutls.Error) as error:
 
2313
                        logger.warning("Bad certificate: %s", error)
 
2314
                        return
 
2315
                    logger.debug("Fingerprint: %s", fpr)
 
2316
 
 
2317
                try:
 
2318
                    client = ProxyClient(child_pipe, key_id, fpr,
2249
2319
                                         self.client_address)
2250
2320
                except KeyError:
2251
2321
                    return
2328
2398
 
2329
2399
    @staticmethod
2330
2400
    def peer_certificate(session):
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):
 
2401
        "Return the peer's certificate as a bytestring"
 
2402
        try:
 
2403
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2404
                                                     gnutls.CTYPE_PEERS)
 
2405
        except AttributeError:
 
2406
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2407
        if gnutls.has_rawpk:
 
2408
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2409
        else:
 
2410
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2411
        # If not a valid certificate type...
 
2412
        if cert_type not in valid_cert_types:
 
2413
            logger.info("Cert type %r not in %r", cert_type,
 
2414
                        valid_cert_types)
2335
2415
            # ...return invalid data
2336
2416
            return b""
2337
2417
        list_size = ctypes.c_uint(1)
2345
2425
        return ctypes.string_at(cert.data, cert.size)
2346
2426
 
2347
2427
    @staticmethod
 
2428
    def key_id(certificate):
 
2429
        "Convert a certificate bytestring to a hexdigit key ID"
 
2430
        # New GnuTLS "datum" with the public key
 
2431
        datum = gnutls.datum_t(
 
2432
            ctypes.cast(ctypes.c_char_p(certificate),
 
2433
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2434
            ctypes.c_uint(len(certificate)))
 
2435
        # XXX all these need to be created in the gnutls "module"
 
2436
        # New empty GnuTLS certificate
 
2437
        pubkey = gnutls.pubkey_t()
 
2438
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2439
        # Import the raw public key into the certificate
 
2440
        gnutls.pubkey_import(pubkey,
 
2441
                             ctypes.byref(datum),
 
2442
                             gnutls.X509_FMT_DER)
 
2443
        # New buffer for the key ID
 
2444
        buf = ctypes.create_string_buffer(32)
 
2445
        buf_len = ctypes.c_size_t(len(buf))
 
2446
        # Get the key ID from the raw public key into the buffer
 
2447
        gnutls.pubkey_get_key_id(pubkey,
 
2448
                                 gnutls.KEYID_USE_SHA256,
 
2449
                                 ctypes.cast(ctypes.byref(buf),
 
2450
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2451
                                 ctypes.byref(buf_len))
 
2452
        # Deinit the certificate
 
2453
        gnutls.pubkey_deinit(pubkey)
 
2454
 
 
2455
        # Convert the buffer to a Python bytestring
 
2456
        key_id = ctypes.string_at(buf, buf_len.value)
 
2457
        # Convert the bytestring to hexadecimal notation
 
2458
        hex_key_id = binascii.hexlify(key_id).upper()
 
2459
        return hex_key_id
 
2460
 
 
2461
    @staticmethod
2348
2462
    def fingerprint(openpgp):
2349
2463
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2350
2464
        # New GnuTLS "datum" with the OpenPGP public key
2364
2478
                                       ctypes.byref(crtverify))
2365
2479
        if crtverify.value != 0:
2366
2480
            gnutls.openpgp_crt_deinit(crt)
2367
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2481
            raise gnutls.CertificateSecurityError(code
 
2482
                                                  =crtverify.value)
2368
2483
        # New buffer for the fingerprint
2369
2484
        buf = ctypes.create_string_buffer(20)
2370
2485
        buf_len = ctypes.c_size_t()
2380
2495
        return hex_fpr
2381
2496
 
2382
2497
 
2383
 
class MultiprocessingMixIn(object):
 
2498
class MultiprocessingMixIn:
2384
2499
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2385
2500
 
2386
2501
    def sub_process_main(self, request, address):
2398
2513
        return proc
2399
2514
 
2400
2515
 
2401
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2516
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2402
2517
    """ adds a pipe to the MixIn """
2403
2518
 
2404
2519
    def process_request(self, request, client_address):
2419
2534
 
2420
2535
 
2421
2536
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2422
 
                     socketserver.TCPServer, object):
 
2537
                     socketserver.TCPServer):
2423
2538
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2424
2539
 
2425
2540
    Attributes:
2498
2613
                    raise
2499
2614
        # Only bind(2) the socket if we really need to.
2500
2615
        if self.server_address[0] or self.server_address[1]:
 
2616
            if self.server_address[1]:
 
2617
                self.allow_reuse_address = True
2501
2618
            if not self.server_address[0]:
2502
2619
                if self.address_family == socket.AF_INET6:
2503
2620
                    any_address = "::"  # in6addr_any
2577
2694
        command = request[0]
2578
2695
 
2579
2696
        if command == 'init':
2580
 
            fpr = request[1]
2581
 
            address = request[2]
 
2697
            key_id = request[1].decode("ascii")
 
2698
            fpr = request[2].decode("ascii")
 
2699
            address = request[3]
2582
2700
 
2583
2701
            for c in self.clients.values():
2584
 
                if c.fingerprint == fpr:
 
2702
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2703
                    continue
 
2704
                if key_id and c.key_id == key_id:
 
2705
                    client = c
 
2706
                    break
 
2707
                if fpr and c.fingerprint == fpr:
2585
2708
                    client = c
2586
2709
                    break
2587
2710
            else:
2588
 
                logger.info("Client not found for fingerprint: %s, ad"
2589
 
                            "dress: %s", fpr, address)
 
2711
                logger.info("Client not found for key ID: %s, address"
 
2712
                            ": %s", key_id or fpr, address)
2590
2713
                if self.use_dbus:
2591
2714
                    # Emit D-Bus signal
2592
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2715
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2593
2716
                                                       address[0])
2594
2717
                parent_pipe.send(False)
2595
2718
                return False
2858
2981
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2859
2982
 
2860
2983
    # Default values for config file for server-global settings
 
2984
    if gnutls.has_rawpk:
 
2985
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
2986
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
2987
    else:
 
2988
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2989
                    ":+SIGN-DSA-SHA256")
2861
2990
    server_defaults = {"interface": "",
2862
2991
                       "address": "",
2863
2992
                       "port": "",
2864
2993
                       "debug": "False",
2865
 
                       "priority":
2866
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2867
 
                       ":+SIGN-DSA-SHA256",
 
2994
                       "priority": priority,
2868
2995
                       "servicename": "Mandos",
2869
2996
                       "use_dbus": "True",
2870
2997
                       "use_ipv6": "True",
2875
3002
                       "foreground": "False",
2876
3003
                       "zeroconf": "True",
2877
3004
                       }
 
3005
    del priority
2878
3006
 
2879
3007
    # Parse config file for server-global settings
2880
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
3008
    server_config = configparser.ConfigParser(server_defaults)
2881
3009
    del server_defaults
2882
3010
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2883
 
    # Convert the SafeConfigParser object to a dict
 
3011
    # Convert the ConfigParser object to a dict
2884
3012
    server_settings = server_config.defaults()
2885
3013
    # Use the appropriate methods on the non-string config options
2886
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
3014
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3015
                   "foreground", "zeroconf"):
2887
3016
        server_settings[option] = server_config.getboolean("DEFAULT",
2888
3017
                                                           option)
2889
3018
    if server_settings["port"]:
2957
3086
                                  server_settings["servicename"])))
2958
3087
 
2959
3088
    # Parse config file with clients
2960
 
    client_config = configparser.SafeConfigParser(Client
2961
 
                                                  .client_defaults)
 
3089
    client_config = configparser.ConfigParser(Client.client_defaults)
2962
3090
    client_config.read(os.path.join(server_settings["configdir"],
2963
3091
                                    "clients.conf"))
2964
3092
 
3035
3163
        # Close all input and output, do double fork, etc.
3036
3164
        daemon()
3037
3165
 
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()
 
3166
    if gi.version_info < (3, 10, 2):
 
3167
        # multiprocessing will use threads, so before we use GLib we
 
3168
        # need to inform GLib that threads will be used.
 
3169
        GLib.threads_init()
3041
3170
 
3042
3171
    global main_loop
3043
3172
    # From the Avahi example code
3123
3252
                        for k in ("name", "host"):
3124
3253
                            if isinstance(value[k], bytes):
3125
3254
                                value[k] = value[k].decode("utf-8")
 
3255
                        if "key_id" not in value:
 
3256
                            value["key_id"] = ""
 
3257
                        elif "fingerprint" not in value:
 
3258
                            value["fingerprint"] = ""
3126
3259
                    #  old_client_settings
3127
3260
                    # .keys()
3128
3261
                    old_client_settings = {
3265
3398
                pass
3266
3399
 
3267
3400
            @dbus.service.signal(_interface, signature="ss")
3268
 
            def ClientNotFound(self, fingerprint, address):
 
3401
            def ClientNotFound(self, key_id, address):
3269
3402
                "D-Bus signal"
3270
3403
                pass
3271
3404