/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: 2022-04-23 23:58:39 UTC
  • Revision ID: teddy@recompile.se-20220423235839-cnt9aq1kjveqaydc
Bug fix in mandos-ctl: handle backslashes in password

* mandos-ctl (mode=password): When sending the password to gpg, use
  "printf" instead of "echo -n".  This avoids the behavior of the
  "echo" builtin in "dash", which always interprets backslash escape
  codes.

Reported-By: Jesse Norell <jesse@kci.net>

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8 -*-
 
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 -*-
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-2018 Teddy Hogeborn
15
 
# Copyright © 2008-2018 Björn Påhlsson
 
14
# Copyright © 2008-2020 Teddy Hogeborn
 
15
# Copyright © 2008-2020 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
77
77
import itertools
78
78
import collections
79
79
import codecs
 
80
import unittest
 
81
import random
 
82
import shlex
80
83
 
81
84
import dbus
82
85
import dbus.service
 
86
import gi
83
87
from gi.repository import GLib
84
88
from dbus.mainloop.glib import DBusGMainLoop
85
89
import ctypes
87
91
import xml.dom.minidom
88
92
import inspect
89
93
 
 
94
if sys.version_info.major == 2:
 
95
    __metaclass__ = type
 
96
    str = unicode
 
97
 
 
98
# Add collections.abc.Callable if it does not exist
 
99
try:
 
100
    collections.abc.Callable
 
101
except AttributeError:
 
102
    class abc:
 
103
        Callable = collections.Callable
 
104
    collections.abc = abc
 
105
    del abc
 
106
 
 
107
# Add shlex.quote if it does not exist
 
108
try:
 
109
    shlex.quote
 
110
except AttributeError:
 
111
    shlex.quote = re.escape
 
112
 
 
113
# Show warnings by default
 
114
if not sys.warnoptions:
 
115
    import warnings
 
116
    warnings.simplefilter("default")
 
117
 
90
118
# Try to find the value of SO_BINDTODEVICE:
91
119
try:
92
120
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
112
140
            # No value found
113
141
            SO_BINDTODEVICE = None
114
142
 
115
 
if sys.version_info.major == 2:
116
 
    str = unicode
 
143
if sys.version_info < (3, 2):
 
144
    configparser.Configparser = configparser.SafeConfigParser
117
145
 
118
 
version = "1.7.16"
 
146
version = "1.8.14"
119
147
stored_state_file = "clients.pickle"
120
148
 
121
149
logger = logging.getLogger()
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
122
151
syslogger = None
123
152
 
124
153
try:
160
189
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
190
        address="/dev/log"))
162
191
    syslogger.setFormatter(logging.Formatter
163
 
                           ('Mandos [%(process)d]: %(levelname)s:'
164
 
                            ' %(message)s'))
 
192
                           ("Mandos [%(process)d]: %(levelname)s:"
 
193
                            " %(message)s"))
165
194
    logger.addHandler(syslogger)
166
195
 
167
196
    if debug:
168
197
        console = logging.StreamHandler()
169
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
170
 
                                               ' [%(process)d]:'
171
 
                                               ' %(levelname)s:'
172
 
                                               ' %(message)s'))
 
198
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
 
199
                                               " [%(process)d]:"
 
200
                                               " %(levelname)s:"
 
201
                                               " %(message)s"))
173
202
        logger.addHandler(console)
174
203
    logger.setLevel(level)
175
204
 
179
208
    pass
180
209
 
181
210
 
182
 
class PGPEngine(object):
 
211
class PGPEngine:
183
212
    """A simple class for OpenPGP symmetric encryption & decryption"""
184
213
 
185
214
    def __init__(self):
189
218
            output = subprocess.check_output(["gpgconf"])
190
219
            for line in output.splitlines():
191
220
                name, text, path = line.split(b":")
192
 
                if name == "gpg":
 
221
                if name == b"gpg":
193
222
                    self.gpg = path
194
223
                    break
195
224
        except OSError as e:
196
225
            if e.errno != errno.ENOENT:
197
226
                raise
198
 
        self.gnupgargs = ['--batch',
199
 
                          '--homedir', self.tempdir,
200
 
                          '--force-mdc',
201
 
                          '--quiet']
 
227
        self.gnupgargs = ["--batch",
 
228
                          "--homedir", self.tempdir,
 
229
                          "--force-mdc",
 
230
                          "--quiet"]
202
231
        # Only GPG version 1 has the --no-use-agent option.
203
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
204
233
            self.gnupgargs.append("--no-use-agent")
205
234
 
206
235
    def __enter__(self):
243
272
                dir=self.tempdir) as passfile:
244
273
            passfile.write(passphrase)
245
274
            passfile.flush()
246
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
247
 
                                     '--passphrase-file',
 
275
            proc = subprocess.Popen([self.gpg, "--symmetric",
 
276
                                     "--passphrase-file",
248
277
                                     passfile.name]
249
278
                                    + self.gnupgargs,
250
279
                                    stdin=subprocess.PIPE,
261
290
                dir=self.tempdir) as passfile:
262
291
            passfile.write(passphrase)
263
292
            passfile.flush()
264
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
265
 
                                     '--passphrase-file',
 
293
            proc = subprocess.Popen([self.gpg, "--decrypt",
 
294
                                     "--passphrase-file",
266
295
                                     passfile.name]
267
296
                                    + self.gnupgargs,
268
297
                                    stdin=subprocess.PIPE,
275
304
 
276
305
 
277
306
# Pretend that we have an Avahi module
278
 
class Avahi(object):
279
 
    """This isn't so much a class as it is a module-like namespace.
280
 
    It is instantiated once, and simulates having an Avahi module."""
 
307
class avahi:
 
308
    """This isn't so much a class as it is a module-like namespace."""
281
309
    IF_UNSPEC = -1               # avahi-common/address.h
282
310
    PROTO_UNSPEC = -1            # avahi-common/address.h
283
311
    PROTO_INET = 0               # avahi-common/address.h
287
315
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
316
    DBUS_PATH_SERVER = "/"
289
317
 
290
 
    def string_array_to_txt_array(self, t):
 
318
    @staticmethod
 
319
    def string_array_to_txt_array(t):
291
320
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
321
                           for s in t), signature="ay")
293
322
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
298
327
    SERVER_RUNNING = 2           # avahi-common/defs.h
299
328
    SERVER_COLLISION = 3         # avahi-common/defs.h
300
329
    SERVER_FAILURE = 4           # avahi-common/defs.h
301
 
avahi = Avahi()
302
330
 
303
331
 
304
332
class AvahiError(Exception):
316
344
    pass
317
345
 
318
346
 
319
 
class AvahiService(object):
 
347
class AvahiService:
320
348
    """An Avahi (Zeroconf) service.
321
349
 
322
350
    Attributes:
323
351
    interface: integer; avahi.IF_UNSPEC or an interface index.
324
352
               Used to optionally bind to the specified interface.
325
 
    name: string; Example: 'Mandos'
326
 
    type: string; Example: '_mandos._tcp'.
 
353
    name: string; Example: "Mandos"
 
354
    type: string; Example: "_mandos._tcp".
327
355
     See <https://www.iana.org/assignments/service-names-port-numbers>
328
356
    port: integer; what port to announce
329
357
    TXT: list of strings; TXT record for the service
407
435
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
408
436
        self.entry_group_state_changed_match = (
409
437
            self.group.connect_to_signal(
410
 
                'StateChanged', self.entry_group_state_changed))
 
438
                "StateChanged", self.entry_group_state_changed))
411
439
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
412
440
                     self.name, self.type)
413
441
        self.group.AddService(
496
524
class AvahiServiceToSyslog(AvahiService):
497
525
    def rename(self, *args, **kwargs):
498
526
        """Add the new name to the syslog messages"""
499
 
        ret = super(AvahiServiceToSyslog, self).rename(self, *args,
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
500
528
                                                       **kwargs)
501
529
        syslogger.setFormatter(logging.Formatter(
502
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
530
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
503
531
            .format(self.name)))
504
532
        return ret
505
533
 
506
534
 
507
535
# Pretend that we have a GnuTLS module
508
 
class GnuTLS(object):
509
 
    """This isn't so much a class as it is a module-like namespace.
510
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
536
class gnutls:
 
537
    """This isn't so much a class as it is a module-like namespace."""
511
538
 
512
539
    library = ctypes.util.find_library("gnutls")
513
540
    if library is None:
514
541
        library = ctypes.util.find_library("gnutls-deb0")
515
542
    _library = ctypes.cdll.LoadLibrary(library)
516
543
    del library
517
 
    _need_version = b"3.3.0"
518
 
 
519
 
    def __init__(self):
520
 
        # Need to use "self" here, since this method is called before
521
 
        # the assignment to the "gnutls" global variable happens.
522
 
        if self.check_version(self._need_version) is None:
523
 
            raise self.Error("Needs GnuTLS {} or later"
524
 
                             .format(self._need_version))
525
544
 
526
545
    # Unless otherwise indicated, the constants and types below are
527
546
    # all from the gnutls/gnutls.h C header file.
531
550
    E_INTERRUPTED = -52
532
551
    E_AGAIN = -28
533
552
    CRT_OPENPGP = 2
 
553
    CRT_RAWPK = 3
534
554
    CLIENT = 2
535
555
    SHUT_RDWR = 0
536
556
    CRD_CERTIFICATE = 1
537
557
    E_NO_CERTIFICATE_FOUND = -49
 
558
    X509_FMT_DER = 0
 
559
    NO_TICKETS = 1<<10
 
560
    ENABLE_RAWPK = 1<<18
 
561
    CTYPE_PEERS = 3
 
562
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
538
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
539
564
 
540
565
    # Types
541
 
    class session_int(ctypes.Structure):
 
566
    class _session_int(ctypes.Structure):
542
567
        _fields_ = []
543
 
    session_t = ctypes.POINTER(session_int)
 
568
    session_t = ctypes.POINTER(_session_int)
544
569
 
545
570
    class certificate_credentials_st(ctypes.Structure):
546
571
        _fields_ = []
549
574
    certificate_type_t = ctypes.c_int
550
575
 
551
576
    class datum_t(ctypes.Structure):
552
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
553
 
                    ('size', ctypes.c_uint)]
 
577
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
 
578
                    ("size", ctypes.c_uint)]
554
579
 
555
 
    class openpgp_crt_int(ctypes.Structure):
 
580
    class _openpgp_crt_int(ctypes.Structure):
556
581
        _fields_ = []
557
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
582
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
558
583
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
559
584
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
560
585
    credentials_type_t = ctypes.c_int
563
588
 
564
589
    # Exceptions
565
590
    class Error(Exception):
566
 
        # We need to use the class name "GnuTLS" here, since this
567
 
        # exception might be raised from within GnuTLS.__init__,
568
 
        # which is called before the assignment to the "gnutls"
569
 
        # global variable has happened.
570
591
        def __init__(self, message=None, code=None, args=()):
571
592
            # Default usage is by a message string, but if a return
572
593
            # code is passed, convert it to a string with
573
594
            # gnutls.strerror()
574
595
            self.code = code
575
596
            if message is None and code is not None:
576
 
                message = GnuTLS.strerror(code)
577
 
            return super(GnuTLS.Error, self).__init__(
 
597
                message = gnutls.strerror(code).decode(
 
598
                    "utf-8", errors="replace")
 
599
            return super(gnutls.Error, self).__init__(
578
600
                message, *args)
579
601
 
580
602
    class CertificateSecurityError(Error):
581
603
        pass
582
604
 
 
605
    class PointerTo:
 
606
        def __init__(self, cls):
 
607
            self.cls = cls
 
608
 
 
609
        def from_param(self, obj):
 
610
            if not isinstance(obj, self.cls):
 
611
                raise TypeError("Not of type {}: {!r}"
 
612
                                .format(self.cls.__name__, obj))
 
613
            return ctypes.byref(obj.from_param(obj))
 
614
 
 
615
    class CastToVoidPointer:
 
616
        def __init__(self, cls):
 
617
            self.cls = cls
 
618
 
 
619
        def from_param(self, obj):
 
620
            if not isinstance(obj, self.cls):
 
621
                raise TypeError("Not of type {}: {!r}"
 
622
                                .format(self.cls.__name__, obj))
 
623
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
 
624
 
 
625
    class With_from_param:
 
626
        @classmethod
 
627
        def from_param(cls, obj):
 
628
            return obj._as_parameter_
 
629
 
583
630
    # Classes
584
 
    class Credentials(object):
 
631
    class Credentials(With_from_param):
585
632
        def __init__(self):
586
 
            self._c_object = gnutls.certificate_credentials_t()
587
 
            gnutls.certificate_allocate_credentials(
588
 
                ctypes.byref(self._c_object))
 
633
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
634
            gnutls.certificate_allocate_credentials(self)
589
635
            self.type = gnutls.CRD_CERTIFICATE
590
636
 
591
637
        def __del__(self):
592
 
            gnutls.certificate_free_credentials(self._c_object)
 
638
            gnutls.certificate_free_credentials(self)
593
639
 
594
 
    class ClientSession(object):
 
640
    class ClientSession(With_from_param):
595
641
        def __init__(self, socket, credentials=None):
596
 
            self._c_object = gnutls.session_t()
597
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
598
 
            gnutls.set_default_priority(self._c_object)
599
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
600
 
            gnutls.handshake_set_private_extensions(self._c_object,
601
 
                                                    True)
 
642
            self._as_parameter_ = gnutls.session_t()
 
643
            gnutls_flags = gnutls.CLIENT
 
644
            if gnutls.check_version(b"3.5.6"):
 
645
                gnutls_flags |= gnutls.NO_TICKETS
 
646
            if gnutls.has_rawpk:
 
647
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
648
            gnutls.init(self, gnutls_flags)
 
649
            del gnutls_flags
 
650
            gnutls.set_default_priority(self)
 
651
            gnutls.transport_set_ptr(self, socket.fileno())
 
652
            gnutls.handshake_set_private_extensions(self, True)
602
653
            self.socket = socket
603
654
            if credentials is None:
604
655
                credentials = gnutls.Credentials()
605
 
            gnutls.credentials_set(self._c_object, credentials.type,
606
 
                                   ctypes.cast(credentials._c_object,
607
 
                                               ctypes.c_void_p))
 
656
            gnutls.credentials_set(self, credentials.type,
 
657
                                   credentials)
608
658
            self.credentials = credentials
609
659
 
610
660
        def __del__(self):
611
 
            gnutls.deinit(self._c_object)
 
661
            gnutls.deinit(self)
612
662
 
613
663
        def handshake(self):
614
 
            return gnutls.handshake(self._c_object)
 
664
            return gnutls.handshake(self)
615
665
 
616
666
        def send(self, data):
617
667
            data = bytes(data)
618
668
            data_len = len(data)
619
669
            while data_len > 0:
620
 
                data_len -= gnutls.record_send(self._c_object,
621
 
                                               data[-data_len:],
 
670
                data_len -= gnutls.record_send(self, data[-data_len:],
622
671
                                               data_len)
623
672
 
624
673
        def bye(self):
625
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
674
            return gnutls.bye(self, gnutls.SHUT_RDWR)
626
675
 
627
676
    # Error handling functions
628
677
    def _error_code(result):
629
678
        """A function to raise exceptions on errors, suitable
630
 
        for the 'restype' attribute on ctypes functions"""
631
 
        if result >= 0:
 
679
        for the "restype" attribute on ctypes functions"""
 
680
        if result >= gnutls.E_SUCCESS:
632
681
            return result
633
682
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
634
683
            raise gnutls.CertificateSecurityError(code=result)
635
684
        raise gnutls.Error(code=result)
636
685
 
637
 
    def _retry_on_error(result, func, arguments):
 
686
    def _retry_on_error(result, func, arguments,
 
687
                        _error_code=_error_code):
638
688
        """A function to retry on some errors, suitable
639
 
        for the 'errcheck' attribute on ctypes functions"""
640
 
        while result < 0:
 
689
        for the "errcheck" attribute on ctypes functions"""
 
690
        while result < gnutls.E_SUCCESS:
641
691
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
642
692
                return _error_code(result)
643
693
            result = func(*arguments)
648
698
 
649
699
    # Functions
650
700
    priority_set_direct = _library.gnutls_priority_set_direct
651
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
701
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
652
702
                                    ctypes.POINTER(ctypes.c_char_p)]
653
703
    priority_set_direct.restype = _error_code
654
704
 
655
705
    init = _library.gnutls_init
656
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
706
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
657
707
    init.restype = _error_code
658
708
 
659
709
    set_default_priority = _library.gnutls_set_default_priority
660
 
    set_default_priority.argtypes = [session_t]
 
710
    set_default_priority.argtypes = [ClientSession]
661
711
    set_default_priority.restype = _error_code
662
712
 
663
713
    record_send = _library.gnutls_record_send
664
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
714
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
665
715
                            ctypes.c_size_t]
666
716
    record_send.restype = ctypes.c_ssize_t
667
717
    record_send.errcheck = _retry_on_error
669
719
    certificate_allocate_credentials = (
670
720
        _library.gnutls_certificate_allocate_credentials)
671
721
    certificate_allocate_credentials.argtypes = [
672
 
        ctypes.POINTER(certificate_credentials_t)]
 
722
        PointerTo(Credentials)]
673
723
    certificate_allocate_credentials.restype = _error_code
674
724
 
675
725
    certificate_free_credentials = (
676
726
        _library.gnutls_certificate_free_credentials)
677
 
    certificate_free_credentials.argtypes = [
678
 
        certificate_credentials_t]
 
727
    certificate_free_credentials.argtypes = [Credentials]
679
728
    certificate_free_credentials.restype = None
680
729
 
681
730
    handshake_set_private_extensions = (
682
731
        _library.gnutls_handshake_set_private_extensions)
683
 
    handshake_set_private_extensions.argtypes = [session_t,
 
732
    handshake_set_private_extensions.argtypes = [ClientSession,
684
733
                                                 ctypes.c_int]
685
734
    handshake_set_private_extensions.restype = None
686
735
 
687
736
    credentials_set = _library.gnutls_credentials_set
688
 
    credentials_set.argtypes = [session_t, credentials_type_t,
689
 
                                ctypes.c_void_p]
 
737
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
738
                                CastToVoidPointer(Credentials)]
690
739
    credentials_set.restype = _error_code
691
740
 
692
741
    strerror = _library.gnutls_strerror
694
743
    strerror.restype = ctypes.c_char_p
695
744
 
696
745
    certificate_type_get = _library.gnutls_certificate_type_get
697
 
    certificate_type_get.argtypes = [session_t]
 
746
    certificate_type_get.argtypes = [ClientSession]
698
747
    certificate_type_get.restype = _error_code
699
748
 
700
749
    certificate_get_peers = _library.gnutls_certificate_get_peers
701
 
    certificate_get_peers.argtypes = [session_t,
 
750
    certificate_get_peers.argtypes = [ClientSession,
702
751
                                      ctypes.POINTER(ctypes.c_uint)]
703
752
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
753
 
711
760
    global_set_log_function.restype = None
712
761
 
713
762
    deinit = _library.gnutls_deinit
714
 
    deinit.argtypes = [session_t]
 
763
    deinit.argtypes = [ClientSession]
715
764
    deinit.restype = None
716
765
 
717
766
    handshake = _library.gnutls_handshake
718
 
    handshake.argtypes = [session_t]
719
 
    handshake.restype = _error_code
 
767
    handshake.argtypes = [ClientSession]
 
768
    handshake.restype = ctypes.c_int
720
769
    handshake.errcheck = _retry_on_error
721
770
 
722
771
    transport_set_ptr = _library.gnutls_transport_set_ptr
723
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
772
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
724
773
    transport_set_ptr.restype = None
725
774
 
726
775
    bye = _library.gnutls_bye
727
 
    bye.argtypes = [session_t, close_request_t]
728
 
    bye.restype = _error_code
 
776
    bye.argtypes = [ClientSession, close_request_t]
 
777
    bye.restype = ctypes.c_int
729
778
    bye.errcheck = _retry_on_error
730
779
 
731
780
    check_version = _library.gnutls_check_version
732
781
    check_version.argtypes = [ctypes.c_char_p]
733
782
    check_version.restype = ctypes.c_char_p
734
783
 
735
 
    # All the function declarations below are from gnutls/openpgp.h
736
 
 
737
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
738
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
739
 
    openpgp_crt_init.restype = _error_code
740
 
 
741
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
742
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
743
 
                                   ctypes.POINTER(datum_t),
744
 
                                   openpgp_crt_fmt_t]
745
 
    openpgp_crt_import.restype = _error_code
746
 
 
747
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
748
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
749
 
                                        ctypes.POINTER(ctypes.c_uint)]
750
 
    openpgp_crt_verify_self.restype = _error_code
751
 
 
752
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
753
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
754
 
    openpgp_crt_deinit.restype = None
755
 
 
756
 
    openpgp_crt_get_fingerprint = (
757
 
        _library.gnutls_openpgp_crt_get_fingerprint)
758
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
759
 
                                            ctypes.c_void_p,
760
 
                                            ctypes.POINTER(
761
 
                                                ctypes.c_size_t)]
762
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
784
    _need_version = b"3.3.0"
 
785
    if check_version(_need_version) is None:
 
786
        raise self.Error("Needs GnuTLS {} or later"
 
787
                         .format(_need_version))
 
788
 
 
789
    _tls_rawpk_version = b"3.6.6"
 
790
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
791
 
 
792
    if has_rawpk:
 
793
        # Types
 
794
        class pubkey_st(ctypes.Structure):
 
795
            _fields = []
 
796
        pubkey_t = ctypes.POINTER(pubkey_st)
 
797
 
 
798
        x509_crt_fmt_t = ctypes.c_int
 
799
 
 
800
        # All the function declarations below are from
 
801
        # gnutls/abstract.h
 
802
        pubkey_init = _library.gnutls_pubkey_init
 
803
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
804
        pubkey_init.restype = _error_code
 
805
 
 
806
        pubkey_import = _library.gnutls_pubkey_import
 
807
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
808
                                  x509_crt_fmt_t]
 
809
        pubkey_import.restype = _error_code
 
810
 
 
811
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
812
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
813
                                      ctypes.POINTER(ctypes.c_ubyte),
 
814
                                      ctypes.POINTER(ctypes.c_size_t)]
 
815
        pubkey_get_key_id.restype = _error_code
 
816
 
 
817
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
818
        pubkey_deinit.argtypes = [pubkey_t]
 
819
        pubkey_deinit.restype = None
 
820
    else:
 
821
        # All the function declarations below are from
 
822
        # gnutls/openpgp.h
 
823
 
 
824
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
825
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
826
        openpgp_crt_init.restype = _error_code
 
827
 
 
828
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
829
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
830
                                       ctypes.POINTER(datum_t),
 
831
                                       openpgp_crt_fmt_t]
 
832
        openpgp_crt_import.restype = _error_code
 
833
 
 
834
        openpgp_crt_verify_self = \
 
835
            _library.gnutls_openpgp_crt_verify_self
 
836
        openpgp_crt_verify_self.argtypes = [
 
837
            openpgp_crt_t,
 
838
            ctypes.c_uint,
 
839
            ctypes.POINTER(ctypes.c_uint),
 
840
        ]
 
841
        openpgp_crt_verify_self.restype = _error_code
 
842
 
 
843
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
844
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
845
        openpgp_crt_deinit.restype = None
 
846
 
 
847
        openpgp_crt_get_fingerprint = (
 
848
            _library.gnutls_openpgp_crt_get_fingerprint)
 
849
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
850
                                                ctypes.c_void_p,
 
851
                                                ctypes.POINTER(
 
852
                                                    ctypes.c_size_t)]
 
853
        openpgp_crt_get_fingerprint.restype = _error_code
 
854
 
 
855
    if check_version(b"3.6.4"):
 
856
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
857
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
858
        certificate_type_get2.restype = _error_code
763
859
 
764
860
    # Remove non-public functions
765
861
    del _error_code, _retry_on_error
766
 
# Create the global "gnutls" object, simulating a module
767
 
gnutls = GnuTLS()
768
862
 
769
863
 
770
864
def call_pipe(connection,       # : multiprocessing.Connection
778
872
    connection.close()
779
873
 
780
874
 
781
 
class Client(object):
 
875
class Client:
782
876
    """A representation of a client host served by this server.
783
877
 
784
878
    Attributes:
785
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
879
    approved:   bool(); None if not yet approved/disapproved
786
880
    approval_delay: datetime.timedelta(); Time to wait for approval
787
881
    approval_duration: datetime.timedelta(); Duration of one approval
788
 
    checker:    subprocess.Popen(); a running checker process used
789
 
                                    to see if the client lives.
790
 
                                    'None' if no process is running.
 
882
    checker: multiprocessing.Process(); a running checker process used
 
883
             to see if the client lives. None if no process is
 
884
             running.
791
885
    checker_callback_tag: a GLib event source tag, or None
792
886
    checker_command: string; External command which is run to check
793
887
                     if client lives.  %() expansions are done at
801
895
    disable_initiator_tag: a GLib event source tag, or None
802
896
    enabled:    bool()
803
897
    fingerprint: string (40 or 32 hexadecimal digits); used to
804
 
                 uniquely identify the client
 
898
                 uniquely identify an OpenPGP client
 
899
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
900
            a client using raw public keys
805
901
    host:       string; available for use by the checker command
806
902
    interval:   datetime.timedelta(); How often to start a new checker
807
903
    last_approval_request: datetime.datetime(); (UTC) or None
825
921
    """
826
922
 
827
923
    runtime_expansions = ("approval_delay", "approval_duration",
828
 
                          "created", "enabled", "expires",
 
924
                          "created", "enabled", "expires", "key_id",
829
925
                          "fingerprint", "host", "interval",
830
926
                          "last_approval_request", "last_checked_ok",
831
927
                          "last_enabled", "name", "timeout")
861
957
            client["enabled"] = config.getboolean(client_name,
862
958
                                                  "enabled")
863
959
 
864
 
            # Uppercase and remove spaces from fingerprint for later
865
 
            # comparison purposes with return value from the
866
 
            # fingerprint() function
 
960
            # Uppercase and remove spaces from key_id and fingerprint
 
961
            # for later comparison purposes with return value from the
 
962
            # key_id() and fingerprint() functions
 
963
            client["key_id"] = (section.get("key_id", "").upper()
 
964
                                .replace(" ", ""))
867
965
            client["fingerprint"] = (section["fingerprint"].upper()
868
966
                                     .replace(" ", ""))
869
967
            if "secret" in section:
913
1011
            self.expires = None
914
1012
 
915
1013
        logger.debug("Creating client %r", self.name)
 
1014
        logger.debug("  Key ID: %s", self.key_id)
916
1015
        logger.debug("  Fingerprint: %s", self.fingerprint)
917
1016
        self.created = settings.get("created",
918
1017
                                    datetime.datetime.utcnow())
982
1081
        if self.checker_initiator_tag is not None:
983
1082
            GLib.source_remove(self.checker_initiator_tag)
984
1083
        self.checker_initiator_tag = GLib.timeout_add(
985
 
            int(self.interval.total_seconds() * 1000),
 
1084
            random.randrange(int(self.interval.total_seconds() * 1000
 
1085
                                 + 1)),
986
1086
            self.start_checker)
987
1087
        # Schedule a disable() when 'timeout' has passed
988
1088
        if self.disable_initiator_tag is not None:
995
1095
    def checker_callback(self, source, condition, connection,
996
1096
                         command):
997
1097
        """The checker has completed, so take appropriate actions."""
998
 
        self.checker_callback_tag = None
999
 
        self.checker = None
1000
1098
        # Read return code from connection (see call_pipe)
1001
1099
        returncode = connection.recv()
1002
1100
        connection.close()
 
1101
        if self.checker is not None:
 
1102
            self.checker.join()
 
1103
        self.checker_callback_tag = None
 
1104
        self.checker = None
1003
1105
 
1004
1106
        if returncode >= 0:
1005
1107
            self.last_checker_status = returncode
1061
1163
        if self.checker is None:
1062
1164
            # Escape attributes for the shell
1063
1165
            escaped_attrs = {
1064
 
                attr: re.escape(str(getattr(self, attr)))
 
1166
                attr: shlex.quote(str(getattr(self, attr)))
1065
1167
                for attr in self.runtime_expansions}
1066
1168
            try:
1067
1169
                command = self.checker_command % escaped_attrs
1094
1196
                kwargs=popen_args)
1095
1197
            self.checker.start()
1096
1198
            self.checker_callback_tag = GLib.io_add_watch(
1097
 
                pipe[0].fileno(), GLib.IO_IN,
 
1199
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1200
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1098
1201
                self.checker_callback, pipe[0], command)
1099
1202
        # Re-run this periodically if run by GLib.timeout_add
1100
1203
        return True
1139
1242
        func._dbus_name = func.__name__
1140
1243
        if func._dbus_name.endswith("_dbus_property"):
1141
1244
            func._dbus_name = func._dbus_name[:-14]
1142
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
1245
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1143
1246
        return func
1144
1247
 
1145
1248
    return decorator
1234
1337
 
1235
1338
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
1339
                         out_signature="s",
1237
 
                         path_keyword='object_path',
1238
 
                         connection_keyword='connection')
 
1340
                         path_keyword="object_path",
 
1341
                         connection_keyword="connection")
1239
1342
    def Introspect(self, object_path, connection):
1240
1343
        """Overloading of standard D-Bus method.
1241
1344
 
1355
1458
                raise ValueError("Byte arrays not supported for non-"
1356
1459
                                 "'ay' signature {!r}"
1357
1460
                                 .format(prop._dbus_signature))
1358
 
            value = dbus.ByteArray(b''.join(chr(byte)
1359
 
                                            for byte in value))
 
1461
            value = dbus.ByteArray(bytes(value))
1360
1462
        prop(value)
1361
1463
 
1362
1464
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1395
1497
 
1396
1498
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1397
1499
                         out_signature="s",
1398
 
                         path_keyword='object_path',
1399
 
                         connection_keyword='connection')
 
1500
                         path_keyword="object_path",
 
1501
                         connection_keyword="connection")
1400
1502
    def Introspect(self, object_path, connection):
1401
1503
        """Overloading of standard D-Bus method.
1402
1504
 
1497
1599
 
1498
1600
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
1601
                         out_signature="s",
1500
 
                         path_keyword='object_path',
1501
 
                         connection_keyword='connection')
 
1602
                         path_keyword="object_path",
 
1603
                         connection_keyword="connection")
1502
1604
    def Introspect(self, object_path, connection):
1503
1605
        """Overloading of standard D-Bus method.
1504
1606
 
2000
2102
    def Name_dbus_property(self):
2001
2103
        return dbus.String(self.name)
2002
2104
 
 
2105
    # KeyID - property
 
2106
    @dbus_annotations(
 
2107
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2108
    @dbus_service_property(_interface, signature="s", access="read")
 
2109
    def KeyID_dbus_property(self):
 
2110
        return dbus.String(self.key_id)
 
2111
 
2003
2112
    # Fingerprint - property
2004
2113
    @dbus_annotations(
2005
2114
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2160
2269
    del _interface
2161
2270
 
2162
2271
 
2163
 
class ProxyClient(object):
2164
 
    def __init__(self, child_pipe, fpr, address):
 
2272
class ProxyClient:
 
2273
    def __init__(self, child_pipe, key_id, fpr, address):
2165
2274
        self._pipe = child_pipe
2166
 
        self._pipe.send(('init', fpr, address))
 
2275
        self._pipe.send(("init", key_id, fpr, address))
2167
2276
        if not self._pipe.recv():
2168
 
            raise KeyError(fpr)
 
2277
            raise KeyError(key_id or fpr)
2169
2278
 
2170
2279
    def __getattribute__(self, name):
2171
 
        if name == '_pipe':
 
2280
        if name == "_pipe":
2172
2281
            return super(ProxyClient, self).__getattribute__(name)
2173
 
        self._pipe.send(('getattr', name))
 
2282
        self._pipe.send(("getattr", name))
2174
2283
        data = self._pipe.recv()
2175
 
        if data[0] == 'data':
 
2284
        if data[0] == "data":
2176
2285
            return data[1]
2177
 
        if data[0] == 'function':
 
2286
        if data[0] == "function":
2178
2287
 
2179
2288
            def func(*args, **kwargs):
2180
 
                self._pipe.send(('funcall', name, args, kwargs))
 
2289
                self._pipe.send(("funcall", name, args, kwargs))
2181
2290
                return self._pipe.recv()[1]
2182
2291
 
2183
2292
            return func
2184
2293
 
2185
2294
    def __setattr__(self, name, value):
2186
 
        if name == '_pipe':
 
2295
        if name == "_pipe":
2187
2296
            return super(ProxyClient, self).__setattr__(name, value)
2188
 
        self._pipe.send(('setattr', name, value))
 
2297
        self._pipe.send(("setattr", name, value))
2189
2298
 
2190
2299
 
2191
2300
class ClientHandler(socketserver.BaseRequestHandler, object):
2203
2312
 
2204
2313
            session = gnutls.ClientSession(self.request)
2205
2314
 
2206
 
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2315
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
2207
2316
            #                       "+AES-256-CBC", "+SHA1",
2208
2317
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2209
2318
            #                       "+DHE-DSS"))
2211
2320
            priority = self.server.gnutls_priority
2212
2321
            if priority is None:
2213
2322
                priority = "NORMAL"
2214
 
            gnutls.priority_set_direct(session._c_object,
2215
 
                                       priority.encode("utf-8"),
2216
 
                                       None)
 
2323
            gnutls.priority_set_direct(session,
 
2324
                                       priority.encode("utf-8"), None)
2217
2325
 
2218
2326
            # Start communication using the Mandos protocol
2219
2327
            # Get protocol number
2238
2346
 
2239
2347
            approval_required = False
2240
2348
            try:
2241
 
                try:
2242
 
                    fpr = self.fingerprint(
2243
 
                        self.peer_certificate(session))
2244
 
                except (TypeError, gnutls.Error) as error:
2245
 
                    logger.warning("Bad certificate: %s", error)
2246
 
                    return
2247
 
                logger.debug("Fingerprint: %s", fpr)
2248
 
 
2249
 
                try:
2250
 
                    client = ProxyClient(child_pipe, fpr,
 
2349
                if gnutls.has_rawpk:
 
2350
                    fpr = b""
 
2351
                    try:
 
2352
                        key_id = self.key_id(
 
2353
                            self.peer_certificate(session))
 
2354
                    except (TypeError, gnutls.Error) as error:
 
2355
                        logger.warning("Bad certificate: %s", error)
 
2356
                        return
 
2357
                    logger.debug("Key ID: %s",
 
2358
                                 key_id.decode("utf-8",
 
2359
                                               errors="replace"))
 
2360
 
 
2361
                else:
 
2362
                    key_id = b""
 
2363
                    try:
 
2364
                        fpr = self.fingerprint(
 
2365
                            self.peer_certificate(session))
 
2366
                    except (TypeError, gnutls.Error) as error:
 
2367
                        logger.warning("Bad certificate: %s", error)
 
2368
                        return
 
2369
                    logger.debug("Fingerprint: %s", fpr)
 
2370
 
 
2371
                try:
 
2372
                    client = ProxyClient(child_pipe, key_id, fpr,
2251
2373
                                         self.client_address)
2252
2374
                except KeyError:
2253
2375
                    return
2330
2452
 
2331
2453
    @staticmethod
2332
2454
    def peer_certificate(session):
2333
 
        "Return the peer's OpenPGP certificate as a bytestring"
2334
 
        # If not an OpenPGP certificate...
2335
 
        if (gnutls.certificate_type_get(session._c_object)
2336
 
            != gnutls.CRT_OPENPGP):
 
2455
        "Return the peer's certificate as a bytestring"
 
2456
        try:
 
2457
            cert_type = gnutls.certificate_type_get2(
 
2458
                session, gnutls.CTYPE_PEERS)
 
2459
        except AttributeError:
 
2460
            cert_type = gnutls.certificate_type_get(session)
 
2461
        if gnutls.has_rawpk:
 
2462
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2463
        else:
 
2464
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2465
        # If not a valid certificate type...
 
2466
        if cert_type not in valid_cert_types:
 
2467
            logger.info("Cert type %r not in %r", cert_type,
 
2468
                        valid_cert_types)
2337
2469
            # ...return invalid data
2338
2470
            return b""
2339
2471
        list_size = ctypes.c_uint(1)
2340
2472
        cert_list = (gnutls.certificate_get_peers
2341
 
                     (session._c_object, ctypes.byref(list_size)))
 
2473
                     (session, ctypes.byref(list_size)))
2342
2474
        if not bool(cert_list) and list_size.value != 0:
2343
2475
            raise gnutls.Error("error getting peer certificate")
2344
2476
        if list_size.value == 0:
2347
2479
        return ctypes.string_at(cert.data, cert.size)
2348
2480
 
2349
2481
    @staticmethod
 
2482
    def key_id(certificate):
 
2483
        "Convert a certificate bytestring to a hexdigit key ID"
 
2484
        # New GnuTLS "datum" with the public key
 
2485
        datum = gnutls.datum_t(
 
2486
            ctypes.cast(ctypes.c_char_p(certificate),
 
2487
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2488
            ctypes.c_uint(len(certificate)))
 
2489
        # XXX all these need to be created in the gnutls "module"
 
2490
        # New empty GnuTLS certificate
 
2491
        pubkey = gnutls.pubkey_t()
 
2492
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2493
        # Import the raw public key into the certificate
 
2494
        gnutls.pubkey_import(pubkey,
 
2495
                             ctypes.byref(datum),
 
2496
                             gnutls.X509_FMT_DER)
 
2497
        # New buffer for the key ID
 
2498
        buf = ctypes.create_string_buffer(32)
 
2499
        buf_len = ctypes.c_size_t(len(buf))
 
2500
        # Get the key ID from the raw public key into the buffer
 
2501
        gnutls.pubkey_get_key_id(
 
2502
            pubkey,
 
2503
            gnutls.KEYID_USE_SHA256,
 
2504
            ctypes.cast(ctypes.byref(buf),
 
2505
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2506
            ctypes.byref(buf_len))
 
2507
        # Deinit the certificate
 
2508
        gnutls.pubkey_deinit(pubkey)
 
2509
 
 
2510
        # Convert the buffer to a Python bytestring
 
2511
        key_id = ctypes.string_at(buf, buf_len.value)
 
2512
        # Convert the bytestring to hexadecimal notation
 
2513
        hex_key_id = binascii.hexlify(key_id).upper()
 
2514
        return hex_key_id
 
2515
 
 
2516
    @staticmethod
2350
2517
    def fingerprint(openpgp):
2351
2518
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2352
2519
        # New GnuTLS "datum" with the OpenPGP public key
2366
2533
                                       ctypes.byref(crtverify))
2367
2534
        if crtverify.value != 0:
2368
2535
            gnutls.openpgp_crt_deinit(crt)
2369
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2536
            raise gnutls.CertificateSecurityError(code
 
2537
                                                  =crtverify.value)
2370
2538
        # New buffer for the fingerprint
2371
2539
        buf = ctypes.create_string_buffer(20)
2372
2540
        buf_len = ctypes.c_size_t()
2382
2550
        return hex_fpr
2383
2551
 
2384
2552
 
2385
 
class MultiprocessingMixIn(object):
 
2553
class MultiprocessingMixIn:
2386
2554
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2387
2555
 
2388
2556
    def sub_process_main(self, request, address):
2400
2568
        return proc
2401
2569
 
2402
2570
 
2403
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2571
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2404
2572
    """ adds a pipe to the MixIn """
2405
2573
 
2406
2574
    def process_request(self, request, client_address):
2421
2589
 
2422
2590
 
2423
2591
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2424
 
                     socketserver.TCPServer, object):
2425
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2592
                     socketserver.TCPServer):
 
2593
    """IPv6-capable TCP server.  Accepts None as address and/or port
2426
2594
 
2427
2595
    Attributes:
2428
2596
        enabled:        Boolean; whether this server is activated yet
2500
2668
                    raise
2501
2669
        # Only bind(2) the socket if we really need to.
2502
2670
        if self.server_address[0] or self.server_address[1]:
 
2671
            if self.server_address[1]:
 
2672
                self.allow_reuse_address = True
2503
2673
            if not self.server_address[0]:
2504
2674
                if self.address_family == socket.AF_INET6:
2505
2675
                    any_address = "::"  # in6addr_any
2558
2728
    def add_pipe(self, parent_pipe, proc):
2559
2729
        # Call "handle_ipc" for both data and EOF events
2560
2730
        GLib.io_add_watch(
2561
 
            parent_pipe.fileno(),
2562
 
            GLib.IO_IN | GLib.IO_HUP,
 
2731
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2732
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2563
2733
            functools.partial(self.handle_ipc,
2564
2734
                              parent_pipe=parent_pipe,
2565
2735
                              proc=proc))
2578
2748
        request = parent_pipe.recv()
2579
2749
        command = request[0]
2580
2750
 
2581
 
        if command == 'init':
2582
 
            fpr = request[1].decode("ascii")
2583
 
            address = request[2]
 
2751
        if command == "init":
 
2752
            key_id = request[1].decode("ascii")
 
2753
            fpr = request[2].decode("ascii")
 
2754
            address = request[3]
2584
2755
 
2585
2756
            for c in self.clients.values():
2586
 
                if c.fingerprint == fpr:
 
2757
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2758
                              "27AE41E4649B934CA495991B7852B855"):
 
2759
                    continue
 
2760
                if key_id and c.key_id == key_id:
 
2761
                    client = c
 
2762
                    break
 
2763
                if fpr and c.fingerprint == fpr:
2587
2764
                    client = c
2588
2765
                    break
2589
2766
            else:
2590
 
                logger.info("Client not found for fingerprint: %s, ad"
2591
 
                            "dress: %s", fpr, address)
 
2767
                logger.info("Client not found for key ID: %s, address"
 
2768
                            ": %s", key_id or fpr, address)
2592
2769
                if self.use_dbus:
2593
2770
                    # Emit D-Bus signal
2594
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2771
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2595
2772
                                                       address[0])
2596
2773
                parent_pipe.send(False)
2597
2774
                return False
2598
2775
 
2599
2776
            GLib.io_add_watch(
2600
 
                parent_pipe.fileno(),
2601
 
                GLib.IO_IN | GLib.IO_HUP,
 
2777
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2778
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2602
2779
                functools.partial(self.handle_ipc,
2603
2780
                                  parent_pipe=parent_pipe,
2604
2781
                                  proc=proc,
2607
2784
            # remove the old hook in favor of the new above hook on
2608
2785
            # same fileno
2609
2786
            return False
2610
 
        if command == 'funcall':
 
2787
        if command == "funcall":
2611
2788
            funcname = request[1]
2612
2789
            args = request[2]
2613
2790
            kwargs = request[3]
2614
2791
 
2615
 
            parent_pipe.send(('data', getattr(client_object,
 
2792
            parent_pipe.send(("data", getattr(client_object,
2616
2793
                                              funcname)(*args,
2617
2794
                                                        **kwargs)))
2618
2795
 
2619
 
        if command == 'getattr':
 
2796
        if command == "getattr":
2620
2797
            attrname = request[1]
2621
2798
            if isinstance(client_object.__getattribute__(attrname),
2622
 
                          collections.Callable):
2623
 
                parent_pipe.send(('function', ))
 
2799
                          collections.abc.Callable):
 
2800
                parent_pipe.send(("function", ))
2624
2801
            else:
2625
2802
                parent_pipe.send((
2626
 
                    'data', client_object.__getattribute__(attrname)))
 
2803
                    "data", client_object.__getattribute__(attrname)))
2627
2804
 
2628
 
        if command == 'setattr':
 
2805
        if command == "setattr":
2629
2806
            attrname = request[1]
2630
2807
            value = request[2]
2631
2808
            setattr(client_object, attrname, value)
2636
2813
def rfc3339_duration_to_delta(duration):
2637
2814
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2638
2815
 
2639
 
    >>> rfc3339_duration_to_delta("P7D")
2640
 
    datetime.timedelta(7)
2641
 
    >>> rfc3339_duration_to_delta("PT60S")
2642
 
    datetime.timedelta(0, 60)
2643
 
    >>> rfc3339_duration_to_delta("PT60M")
2644
 
    datetime.timedelta(0, 3600)
2645
 
    >>> rfc3339_duration_to_delta("PT24H")
2646
 
    datetime.timedelta(1)
2647
 
    >>> rfc3339_duration_to_delta("P1W")
2648
 
    datetime.timedelta(7)
2649
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2650
 
    datetime.timedelta(0, 330)
2651
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2652
 
    datetime.timedelta(1, 200)
 
2816
    >>> timedelta = datetime.timedelta
 
2817
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2818
    True
 
2819
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2820
    True
 
2821
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2822
    True
 
2823
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2824
    True
 
2825
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2826
    True
 
2827
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2828
    True
 
2829
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2830
    True
 
2831
    >>> del timedelta
2653
2832
    """
2654
2833
 
2655
2834
    # Parsing an RFC 3339 duration with regular expressions is not
2735
2914
def string_to_delta(interval):
2736
2915
    """Parse a string and return a datetime.timedelta
2737
2916
 
2738
 
    >>> string_to_delta('7d')
2739
 
    datetime.timedelta(7)
2740
 
    >>> string_to_delta('60s')
2741
 
    datetime.timedelta(0, 60)
2742
 
    >>> string_to_delta('60m')
2743
 
    datetime.timedelta(0, 3600)
2744
 
    >>> string_to_delta('24h')
2745
 
    datetime.timedelta(1)
2746
 
    >>> string_to_delta('1w')
2747
 
    datetime.timedelta(7)
2748
 
    >>> string_to_delta('5m 30s')
2749
 
    datetime.timedelta(0, 330)
 
2917
    >>> string_to_delta("7d") == datetime.timedelta(7)
 
2918
    True
 
2919
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
 
2920
    True
 
2921
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
 
2922
    True
 
2923
    >>> string_to_delta("24h") == datetime.timedelta(1)
 
2924
    True
 
2925
    >>> string_to_delta("1w") == datetime.timedelta(7)
 
2926
    True
 
2927
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
 
2928
    True
2750
2929
    """
2751
2930
 
2752
2931
    try:
2854
3033
 
2855
3034
    options = parser.parse_args()
2856
3035
 
2857
 
    if options.check:
2858
 
        import doctest
2859
 
        fail_count, test_count = doctest.testmod()
2860
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2861
 
 
2862
3036
    # Default values for config file for server-global settings
 
3037
    if gnutls.has_rawpk:
 
3038
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
3039
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
3040
    else:
 
3041
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
3042
                    ":+SIGN-DSA-SHA256")
2863
3043
    server_defaults = {"interface": "",
2864
3044
                       "address": "",
2865
3045
                       "port": "",
2866
3046
                       "debug": "False",
2867
 
                       "priority":
2868
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2869
 
                       ":+SIGN-DSA-SHA256",
 
3047
                       "priority": priority,
2870
3048
                       "servicename": "Mandos",
2871
3049
                       "use_dbus": "True",
2872
3050
                       "use_ipv6": "True",
2877
3055
                       "foreground": "False",
2878
3056
                       "zeroconf": "True",
2879
3057
                       }
 
3058
    del priority
2880
3059
 
2881
3060
    # Parse config file for server-global settings
2882
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
3061
    server_config = configparser.ConfigParser(server_defaults)
2883
3062
    del server_defaults
2884
3063
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2885
 
    # Convert the SafeConfigParser object to a dict
 
3064
    # Convert the ConfigParser object to a dict
2886
3065
    server_settings = server_config.defaults()
2887
3066
    # Use the appropriate methods on the non-string config options
2888
3067
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2955
3134
 
2956
3135
    if server_settings["servicename"] != "Mandos":
2957
3136
        syslogger.setFormatter(
2958
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2959
 
                              ' %(levelname)s: %(message)s'.format(
 
3137
            logging.Formatter("Mandos ({}) [%(process)d]:"
 
3138
                              " %(levelname)s: %(message)s".format(
2960
3139
                                  server_settings["servicename"])))
2961
3140
 
2962
3141
    # Parse config file with clients
2963
 
    client_config = configparser.SafeConfigParser(Client
2964
 
                                                  .client_defaults)
 
3142
    client_config = configparser.ConfigParser(Client.client_defaults)
2965
3143
    client_config.read(os.path.join(server_settings["configdir"],
2966
3144
                                    "clients.conf"))
2967
3145
 
3023
3201
 
3024
3202
        @gnutls.log_func
3025
3203
        def debug_gnutls(level, string):
3026
 
            logger.debug("GnuTLS: %s", string[:-1])
 
3204
            logger.debug("GnuTLS: %s",
 
3205
                         string[:-1].decode("utf-8",
 
3206
                                            errors="replace"))
3027
3207
 
3028
3208
        gnutls.global_set_log_function(debug_gnutls)
3029
3209
 
3038
3218
        # Close all input and output, do double fork, etc.
3039
3219
        daemon()
3040
3220
 
3041
 
    # multiprocessing will use threads, so before we use GLib we need
3042
 
    # to inform GLib that threads will be used.
3043
 
    GLib.threads_init()
 
3221
    if gi.version_info < (3, 10, 2):
 
3222
        # multiprocessing will use threads, so before we use GLib we
 
3223
        # need to inform GLib that threads will be used.
 
3224
        GLib.threads_init()
3044
3225
 
3045
3226
    global main_loop
3046
3227
    # From the Avahi example code
3122
3303
                             if isinstance(s, bytes)
3123
3304
                             else s) for s in
3124
3305
                            value["client_structure"]]
3125
 
                        # .name & .host
3126
 
                        for k in ("name", "host"):
 
3306
                        # .name, .host, and .checker_command
 
3307
                        for k in ("name", "host", "checker_command"):
3127
3308
                            if isinstance(value[k], bytes):
3128
3309
                                value[k] = value[k].decode("utf-8")
 
3310
                        if "key_id" not in value:
 
3311
                            value["key_id"] = ""
 
3312
                        elif "fingerprint" not in value:
 
3313
                            value["fingerprint"] = ""
3129
3314
                    #  old_client_settings
3130
3315
                    # .keys()
3131
3316
                    old_client_settings = {
3135
3320
                        for key, value in
3136
3321
                        bytes_old_client_settings.items()}
3137
3322
                    del bytes_old_client_settings
3138
 
                    # .host
 
3323
                    # .host and .checker_command
3139
3324
                    for value in old_client_settings.values():
3140
 
                        if isinstance(value["host"], bytes):
3141
 
                            value["host"] = (value["host"]
3142
 
                                             .decode("utf-8"))
 
3325
                        for attribute in ("host", "checker_command"):
 
3326
                            if isinstance(value[attribute], bytes):
 
3327
                                value[attribute] = (value[attribute]
 
3328
                                                    .decode("utf-8"))
3143
3329
            os.remove(stored_state_path)
3144
3330
        except IOError as e:
3145
3331
            if e.errno == errno.ENOENT:
3268
3454
                pass
3269
3455
 
3270
3456
            @dbus.service.signal(_interface, signature="ss")
3271
 
            def ClientNotFound(self, fingerprint, address):
 
3457
            def ClientNotFound(self, key_id, address):
3272
3458
                "D-Bus signal"
3273
3459
                pass
3274
3460
 
3398
3584
 
3399
3585
        try:
3400
3586
            with tempfile.NamedTemporaryFile(
3401
 
                    mode='wb',
 
3587
                    mode="wb",
3402
3588
                    suffix=".pickle",
3403
 
                    prefix='clients-',
 
3589
                    prefix="clients-",
3404
3590
                    dir=os.path.dirname(stored_state_path),
3405
3591
                    delete=False) as stored_state:
3406
3592
                pickle.dump((clients, client_settings), stored_state,
3470
3656
                sys.exit(1)
3471
3657
            # End of Avahi example code
3472
3658
 
3473
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3474
 
                          lambda *args, **kwargs:
3475
 
                          (tcp_server.handle_request
3476
 
                           (*args[2:], **kwargs) or True))
 
3659
        GLib.io_add_watch(
 
3660
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3661
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3662
            lambda *args, **kwargs: (tcp_server.handle_request
 
3663
                                     (*args[2:], **kwargs) or True))
3477
3664
 
3478
3665
        logger.debug("Starting main loop")
3479
3666
        main_loop.run()
3489
3676
    # Must run before the D-Bus bus name gets deregistered
3490
3677
    cleanup()
3491
3678
 
3492
 
 
3493
 
if __name__ == '__main__':
3494
 
    main()
 
3679
 
 
3680
def should_only_run_tests():
 
3681
    parser = argparse.ArgumentParser(add_help=False)
 
3682
    parser.add_argument("--check", action="store_true")
 
3683
    args, unknown_args = parser.parse_known_args()
 
3684
    run_tests = args.check
 
3685
    if run_tests:
 
3686
        # Remove --check argument from sys.argv
 
3687
        sys.argv[1:] = unknown_args
 
3688
    return run_tests
 
3689
 
 
3690
# Add all tests from doctest strings
 
3691
def load_tests(loader, tests, none):
 
3692
    import doctest
 
3693
    tests.addTests(doctest.DocTestSuite())
 
3694
    return tests
 
3695
 
 
3696
if __name__ == "__main__":
 
3697
    try:
 
3698
        if should_only_run_tests():
 
3699
            # Call using ./mandos --check [--verbose]
 
3700
            unittest.main()
 
3701
        else:
 
3702
            main()
 
3703
    finally:
 
3704
        logging.shutdown()