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 -*-
 
 
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-2019 Teddy Hogeborn
 
15
 
# Copyright © 2008-2019 Björn Påhlsson
 
17
 
# This file is part of Mandos.
 
19
 
# Mandos is free software: you can redistribute it and/or modify it
 
20
 
# under the terms of the GNU General Public License as published by
 
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
 
15
# Copyright © 2008-2016 Björn Påhlsson
 
 
17
# This program is free software: you can redistribute it and/or modify
 
 
18
# it under the terms of the GNU General Public License as published by
 
21
19
# the Free Software Foundation, either version 3 of the License, or
 
22
20
# (at your option) any later version.
 
24
 
#     Mandos is distributed in the hope that it will be useful, but
 
25
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
22
#     This program is distributed in the hope that it will be useful,
 
 
23
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
26
24
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
27
25
#     GNU General Public License for more details.
 
29
27
# You should have received a copy of the GNU General Public License
 
30
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
 
28
# along with this program.  If not, see
 
 
29
# <http://www.gnu.org/licenses/>.
 
32
31
# Contact the authors at <mandos@recompile.se>.
 
35
34
from __future__ import (division, absolute_import, print_function,
 
 
261
246
                                     '--passphrase-file',
 
263
248
                                    + self.gnupgargs,
 
264
 
                                    stdin=subprocess.PIPE,
 
265
 
                                    stdout=subprocess.PIPE,
 
266
 
                                    stderr=subprocess.PIPE)
 
267
 
            ciphertext, err = proc.communicate(input=data)
 
 
249
                                    stdin = subprocess.PIPE,
 
 
250
                                    stdout = subprocess.PIPE,
 
 
251
                                    stderr = subprocess.PIPE)
 
 
252
            ciphertext, err = proc.communicate(input = data)
 
268
253
        if proc.returncode != 0:
 
269
254
            raise PGPError(err)
 
270
255
        return ciphertext
 
272
257
    def decrypt(self, data, password):
 
273
258
        passphrase = self.password_encode(password)
 
274
259
        with tempfile.NamedTemporaryFile(
 
275
 
                dir=self.tempdir) as passfile:
 
 
260
                dir = self.tempdir) as passfile:
 
276
261
            passfile.write(passphrase)
 
278
263
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
279
264
                                     '--passphrase-file',
 
281
266
                                    + self.gnupgargs,
 
282
 
                                    stdin=subprocess.PIPE,
 
283
 
                                    stdout=subprocess.PIPE,
 
284
 
                                    stderr=subprocess.PIPE)
 
285
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
267
                                    stdin = subprocess.PIPE,
 
 
268
                                    stdout = subprocess.PIPE,
 
 
269
                                    stderr = subprocess.PIPE)
 
 
270
            decrypted_plaintext, err = proc.communicate(input = data)
 
286
271
        if proc.returncode != 0:
 
287
272
            raise PGPError(err)
 
288
273
        return decrypted_plaintext
 
291
275
# Pretend that we have an Avahi module
 
293
 
    """This isn't so much a class as it is a module-like namespace."""
 
294
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
295
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
296
 
    PROTO_INET = 0               # avahi-common/address.h
 
297
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
 
277
    """This isn't so much a class as it is a module-like namespace.
 
 
278
    It is instantiated once, and simulates having an Avahi module."""
 
 
279
    IF_UNSPEC = -1              # avahi-common/address.h
 
 
280
    PROTO_UNSPEC = -1           # avahi-common/address.h
 
 
281
    PROTO_INET = 0              # avahi-common/address.h
 
 
282
    PROTO_INET6 = 1             # avahi-common/address.h
 
298
283
    DBUS_NAME = "org.freedesktop.Avahi"
 
299
284
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
300
285
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
301
286
    DBUS_PATH_SERVER = "/"
 
304
 
    def string_array_to_txt_array(t):
 
 
287
    def string_array_to_txt_array(self, t):
 
305
288
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
306
289
                           for s in t), signature="ay")
 
307
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
308
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
309
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
310
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
311
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
312
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
313
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
314
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
 
290
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
 
 
291
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
 
 
292
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
 
 
293
    SERVER_INVALID = 0          # avahi-common/defs.h
 
 
294
    SERVER_REGISTERING = 1      # avahi-common/defs.h
 
 
295
    SERVER_RUNNING = 2          # avahi-common/defs.h
 
 
296
    SERVER_COLLISION = 3        # avahi-common/defs.h
 
 
297
    SERVER_FAILURE = 4          # avahi-common/defs.h
 
317
300
class AvahiError(Exception):
 
318
301
    def __init__(self, value, *args, **kwargs):
 
 
509
492
class AvahiServiceToSyslog(AvahiService):
 
510
493
    def rename(self, *args, **kwargs):
 
511
494
        """Add the new name to the syslog messages"""
 
512
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
495
        ret = AvahiService.rename(self, *args, **kwargs)
 
513
496
        syslogger.setFormatter(logging.Formatter(
 
514
497
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
515
498
            .format(self.name)))
 
519
501
# Pretend that we have a GnuTLS module
 
521
 
    """This isn't so much a class as it is a module-like namespace."""
 
523
 
    library = ctypes.util.find_library("gnutls")
 
525
 
        library = ctypes.util.find_library("gnutls-deb0")
 
526
 
    _library = ctypes.cdll.LoadLibrary(library)
 
 
502
class GnuTLS(object):
 
 
503
    """This isn't so much a class as it is a module-like namespace.
 
 
504
    It is instantiated once, and simulates having a GnuTLS module."""
 
 
506
    _library = ctypes.cdll.LoadLibrary(
 
 
507
        ctypes.util.find_library("gnutls"))
 
 
508
    _need_version = b"3.3.0"
 
 
510
        # Need to use class name "GnuTLS" here, since this method is
 
 
511
        # called before the assignment to the "gnutls" global variable
 
 
513
        if GnuTLS.check_version(self._need_version) is None:
 
 
514
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
 
515
                               .format(self._need_version))
 
529
517
    # Unless otherwise indicated, the constants and types below are
 
530
518
    # all from the gnutls/gnutls.h C header file.
 
534
522
    E_INTERRUPTED = -52
 
540
527
    CRD_CERTIFICATE = 1
 
541
528
    E_NO_CERTIFICATE_FOUND = -49
 
546
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
547
529
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
550
532
    class session_int(ctypes.Structure):
 
552
534
    session_t = ctypes.POINTER(session_int)
 
554
535
    class certificate_credentials_st(ctypes.Structure):
 
556
537
    certificate_credentials_t = ctypes.POINTER(
 
557
538
        certificate_credentials_st)
 
558
539
    certificate_type_t = ctypes.c_int
 
560
540
    class datum_t(ctypes.Structure):
 
561
541
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
562
542
                    ('size', ctypes.c_uint)]
 
564
543
    class openpgp_crt_int(ctypes.Structure):
 
566
545
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
567
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
 
546
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
568
547
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
569
548
    credentials_type_t = ctypes.c_int
 
570
549
    transport_ptr_t = ctypes.c_void_p
 
571
550
    close_request_t = ctypes.c_int
 
574
553
    class Error(Exception):
 
575
 
        def __init__(self, message=None, code=None, args=()):
 
 
554
        # We need to use the class name "GnuTLS" here, since this
 
 
555
        # exception might be raised from within GnuTLS.__init__,
 
 
556
        # which is called before the assignment to the "gnutls"
 
 
557
        # global variable has happened.
 
 
558
        def __init__(self, message = None, code = None, args=()):
 
576
559
            # Default usage is by a message string, but if a return
 
577
560
            # code is passed, convert it to a string with
 
578
561
            # gnutls.strerror()
 
580
563
            if message is None and code is not None:
 
581
 
                message = gnutls.strerror(code)
 
582
 
            return super(gnutls.Error, self).__init__(
 
 
564
                message = GnuTLS.strerror(code)
 
 
565
            return super(GnuTLS.Error, self).__init__(
 
585
568
    class CertificateSecurityError(Error):
 
 
572
    class Credentials(object):
 
590
573
        def __init__(self):
 
591
574
            self._c_object = gnutls.certificate_credentials_t()
 
592
575
            gnutls.certificate_allocate_credentials(
 
593
576
                ctypes.byref(self._c_object))
 
594
577
            self.type = gnutls.CRD_CERTIFICATE
 
596
579
        def __del__(self):
 
597
580
            gnutls.certificate_free_credentials(self._c_object)
 
600
 
        def __init__(self, socket, credentials=None):
 
 
582
    class ClientSession(object):
 
 
583
        def __init__(self, socket, credentials = None):
 
601
584
            self._c_object = gnutls.session_t()
 
602
 
            gnutls_flags = gnutls.CLIENT
 
603
 
            if gnutls.check_version(b"3.5.6"):
 
604
 
                gnutls_flags |= gnutls.NO_TICKETS
 
606
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
607
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
585
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
609
586
            gnutls.set_default_priority(self._c_object)
 
610
587
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
611
588
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
653
630
                return _error_code(result)
 
654
631
            result = func(*arguments)
 
657
634
    # Unless otherwise indicated, the function declarations below are
 
658
635
    # all from the gnutls/gnutls.h C header file.
 
661
638
    priority_set_direct = _library.gnutls_priority_set_direct
 
662
639
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
663
640
                                    ctypes.POINTER(ctypes.c_char_p)]
 
664
641
    priority_set_direct.restype = _error_code
 
666
643
    init = _library.gnutls_init
 
667
644
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
668
645
    init.restype = _error_code
 
670
647
    set_default_priority = _library.gnutls_set_default_priority
 
671
648
    set_default_priority.argtypes = [session_t]
 
672
649
    set_default_priority.restype = _error_code
 
674
651
    record_send = _library.gnutls_record_send
 
675
652
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
677
654
    record_send.restype = ctypes.c_ssize_t
 
678
655
    record_send.errcheck = _retry_on_error
 
680
657
    certificate_allocate_credentials = (
 
681
658
        _library.gnutls_certificate_allocate_credentials)
 
682
659
    certificate_allocate_credentials.argtypes = [
 
683
660
        ctypes.POINTER(certificate_credentials_t)]
 
684
661
    certificate_allocate_credentials.restype = _error_code
 
686
663
    certificate_free_credentials = (
 
687
664
        _library.gnutls_certificate_free_credentials)
 
688
 
    certificate_free_credentials.argtypes = [
 
689
 
        certificate_credentials_t]
 
 
665
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
690
666
    certificate_free_credentials.restype = None
 
692
668
    handshake_set_private_extensions = (
 
693
669
        _library.gnutls_handshake_set_private_extensions)
 
694
670
    handshake_set_private_extensions.argtypes = [session_t,
 
696
672
    handshake_set_private_extensions.restype = None
 
698
674
    credentials_set = _library.gnutls_credentials_set
 
699
675
    credentials_set.argtypes = [session_t, credentials_type_t,
 
701
677
    credentials_set.restype = _error_code
 
703
679
    strerror = _library.gnutls_strerror
 
704
680
    strerror.argtypes = [ctypes.c_int]
 
705
681
    strerror.restype = ctypes.c_char_p
 
707
683
    certificate_type_get = _library.gnutls_certificate_type_get
 
708
684
    certificate_type_get.argtypes = [session_t]
 
709
685
    certificate_type_get.restype = _error_code
 
711
687
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
712
688
    certificate_get_peers.argtypes = [session_t,
 
713
689
                                      ctypes.POINTER(ctypes.c_uint)]
 
714
690
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
716
692
    global_set_log_level = _library.gnutls_global_set_log_level
 
717
693
    global_set_log_level.argtypes = [ctypes.c_int]
 
718
694
    global_set_log_level.restype = None
 
720
696
    global_set_log_function = _library.gnutls_global_set_log_function
 
721
697
    global_set_log_function.argtypes = [log_func]
 
722
698
    global_set_log_function.restype = None
 
724
700
    deinit = _library.gnutls_deinit
 
725
701
    deinit.argtypes = [session_t]
 
726
702
    deinit.restype = None
 
728
704
    handshake = _library.gnutls_handshake
 
729
705
    handshake.argtypes = [session_t]
 
730
706
    handshake.restype = _error_code
 
731
707
    handshake.errcheck = _retry_on_error
 
733
709
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
734
710
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
735
711
    transport_set_ptr.restype = None
 
737
713
    bye = _library.gnutls_bye
 
738
714
    bye.argtypes = [session_t, close_request_t]
 
739
715
    bye.restype = _error_code
 
740
716
    bye.errcheck = _retry_on_error
 
742
718
    check_version = _library.gnutls_check_version
 
743
719
    check_version.argtypes = [ctypes.c_char_p]
 
744
720
    check_version.restype = ctypes.c_char_p
 
746
 
    _need_version = b"3.3.0"
 
747
 
    if check_version(_need_version) is None:
 
748
 
        raise self.Error("Needs GnuTLS {} or later"
 
749
 
                         .format(_need_version))
 
751
 
    _tls_rawpk_version = b"3.6.6"
 
752
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
756
 
        class pubkey_st(ctypes.Structure):
 
758
 
        pubkey_t = ctypes.POINTER(pubkey_st)
 
760
 
        x509_crt_fmt_t = ctypes.c_int
 
762
 
        # All the function declarations below are from gnutls/abstract.h
 
763
 
        pubkey_init = _library.gnutls_pubkey_init
 
764
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
765
 
        pubkey_init.restype = _error_code
 
767
 
        pubkey_import = _library.gnutls_pubkey_import
 
768
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
770
 
        pubkey_import.restype = _error_code
 
772
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
773
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
774
 
                                      ctypes.POINTER(ctypes.c_ubyte),
 
775
 
                                      ctypes.POINTER(ctypes.c_size_t)]
 
776
 
        pubkey_get_key_id.restype = _error_code
 
778
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
779
 
        pubkey_deinit.argtypes = [pubkey_t]
 
780
 
        pubkey_deinit.restype = None
 
782
 
        # All the function declarations below are from gnutls/openpgp.h
 
784
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
785
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
786
 
        openpgp_crt_init.restype = _error_code
 
788
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
789
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
790
 
                                       ctypes.POINTER(datum_t),
 
792
 
        openpgp_crt_import.restype = _error_code
 
794
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
795
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
796
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
797
 
        openpgp_crt_verify_self.restype = _error_code
 
799
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
800
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
801
 
        openpgp_crt_deinit.restype = None
 
803
 
        openpgp_crt_get_fingerprint = (
 
804
 
            _library.gnutls_openpgp_crt_get_fingerprint)
 
805
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
809
 
        openpgp_crt_get_fingerprint.restype = _error_code
 
811
 
    if check_version(b"3.6.4"):
 
812
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
813
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
814
 
        certificate_type_get2.restype = _error_code
 
 
722
    # All the function declarations below are from gnutls/openpgp.h
 
 
724
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
725
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
726
    openpgp_crt_init.restype = _error_code
 
 
728
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
729
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
730
                                   ctypes.POINTER(datum_t),
 
 
732
    openpgp_crt_import.restype = _error_code
 
 
734
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
735
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
736
                                        ctypes.POINTER(ctypes.c_uint)]
 
 
737
    openpgp_crt_verify_self.restype = _error_code
 
 
739
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
740
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
741
    openpgp_crt_deinit.restype = None
 
 
743
    openpgp_crt_get_fingerprint = (
 
 
744
        _library.gnutls_openpgp_crt_get_fingerprint)
 
 
745
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
749
    openpgp_crt_get_fingerprint.restype = _error_code
 
816
751
    # Remove non-public functions
 
817
752
    del _error_code, _retry_on_error
 
 
753
# Create the global "gnutls" object, simulating a module
 
820
756
def call_pipe(connection,       # : multiprocessing.Connection
 
821
757
              func, *args, **kwargs):
 
822
758
    """This function is meant to be called by multiprocessing.Process
 
824
760
    This function runs func(*args, **kwargs), and writes the resulting
 
825
761
    return value on the provided multiprocessing.Connection.
 
827
763
    connection.send(func(*args, **kwargs))
 
828
764
    connection.close()
 
 
766
class Client(object):
 
832
767
    """A representation of a client host served by this server.
 
835
770
    approved:   bool(); 'None' if not yet approved/disapproved
 
836
771
    approval_delay: datetime.timedelta(); Time to wait for approval
 
837
772
    approval_duration: datetime.timedelta(); Duration of one approval
 
838
 
    checker: multiprocessing.Process(); a running checker process used
 
839
 
             to see if the client lives. 'None' if no process is
 
 
773
    checker:    subprocess.Popen(); a running checker process used
 
 
774
                                    to see if the client lives.
 
 
775
                                    'None' if no process is running.
 
841
776
    checker_callback_tag: a GLib event source tag, or None
 
842
777
    checker_command: string; External command which is run to check
 
843
778
                     if client lives.  %() expansions are done at
 
 
1520
1447
                         exc_info=error)
 
1521
1448
        return xmlstring
 
1525
1451
    dbus.OBJECT_MANAGER_IFACE
 
1526
1452
except AttributeError:
 
1527
1453
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1530
1455
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1531
1456
    """A D-Bus object with an ObjectManager.
 
1533
1458
    Classes inheriting from this exposes the standard
 
1534
1459
    GetManagedObjects call and the InterfacesAdded and
 
1535
1460
    InterfacesRemoved signals on the standard
 
1536
1461
    "org.freedesktop.DBus.ObjectManager" interface.
 
1538
1463
    Note: No signals are sent automatically; they must be sent
 
1541
1466
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1542
 
                         out_signature="a{oa{sa{sv}}}")
 
 
1467
                         out_signature = "a{oa{sa{sv}}}")
 
1543
1468
    def GetManagedObjects(self):
 
1544
1469
        """This function must be overridden"""
 
1545
1470
        raise NotImplementedError()
 
1547
1472
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1548
 
                         signature="oa{sa{sv}}")
 
 
1473
                         signature = "oa{sa{sv}}")
 
1549
1474
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1552
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1477
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
1553
1478
    def InterfacesRemoved(self, object_path, interfaces):
 
1556
1481
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1558
 
                         path_keyword='object_path',
 
1559
 
                         connection_keyword='connection')
 
 
1482
                         out_signature = "s",
 
 
1483
                         path_keyword = 'object_path',
 
 
1484
                         connection_keyword = 'connection')
 
1560
1485
    def Introspect(self, object_path, connection):
 
1561
1486
        """Overloading of standard D-Bus method.
 
1563
1488
        Override return argument name of GetManagedObjects to be
 
1564
1489
        "objpath_interfaces_and_properties"
 
 
2507
 
class MultiprocessingMixIn:
 
 
2365
class MultiprocessingMixIn(object):
 
2508
2366
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2510
2368
    def sub_process_main(self, request, address):
 
2512
2370
            self.finish_request(request, address)
 
2513
2371
        except Exception:
 
2514
2372
            self.handle_error(request, address)
 
2515
2373
        self.close_request(request)
 
2517
2375
    def process_request(self, request, address):
 
2518
2376
        """Start a new process to process the request."""
 
2519
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2520
 
                                       args=(request, address))
 
 
2377
        proc = multiprocessing.Process(target = self.sub_process_main,
 
 
2378
                                       args = (request, address))
 
2525
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
 
2383
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2526
2384
    """ adds a pipe to the MixIn """
 
2528
2386
    def process_request(self, request, client_address):
 
2529
2387
        """Overrides and wraps the original process_request().
 
2531
2389
        This function creates a new pipe in self.pipe
 
2533
2391
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2535
2393
        proc = MultiprocessingMixIn.process_request(self, request,
 
2536
2394
                                                    client_address)
 
2537
2395
        self.child_pipe.close()
 
2538
2396
        self.add_pipe(parent_pipe, proc)
 
2540
2398
    def add_pipe(self, parent_pipe, proc):
 
2541
2399
        """Dummy function; override as necessary"""
 
2542
2400
        raise NotImplementedError()
 
2545
2403
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2546
 
                     socketserver.TCPServer):
 
 
2404
                     socketserver.TCPServer, object):
 
2547
2405
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2550
2408
        enabled:        Boolean; whether this server is activated yet
 
2551
2409
        interface:      None or a network interface name (string)
 
2552
2410
        use_ipv6:       Boolean; to use IPv6 or not
 
2555
2413
    def __init__(self, server_address, RequestHandlerClass,
 
2556
2414
                 interface=None,
 
 
2668
2523
        self.gnutls_priority = gnutls_priority
 
2669
2524
        IPv6_TCPServer.__init__(self, server_address,
 
2670
2525
                                RequestHandlerClass,
 
2671
 
                                interface=interface,
 
 
2526
                                interface = interface,
 
 
2527
                                use_ipv6 = use_ipv6,
 
 
2528
                                socketfd = socketfd)
 
2675
2530
    def server_activate(self):
 
2676
2531
        if self.enabled:
 
2677
2532
            return socketserver.TCPServer.server_activate(self)
 
2679
2534
    def enable(self):
 
2680
2535
        self.enabled = True
 
2682
2537
    def add_pipe(self, parent_pipe, proc):
 
2683
2538
        # Call "handle_ipc" for both data and EOF events
 
2684
2539
        GLib.io_add_watch(
 
2685
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2686
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2540
            parent_pipe.fileno(),
 
 
2541
            GLib.IO_IN | GLib.IO_HUP,
 
2687
2542
            functools.partial(self.handle_ipc,
 
2688
 
                              parent_pipe=parent_pipe,
 
 
2543
                              parent_pipe = parent_pipe,
 
2691
2546
    def handle_ipc(self, source, condition,
 
2692
2547
                   parent_pipe=None,
 
2694
2549
                   client_object=None):
 
2695
2550
        # error, or the other end of multiprocessing.Pipe has closed
 
2696
2551
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2697
2552
            # Wait for other process to exit
 
2701
2556
        # Read a request from the child
 
2702
2557
        request = parent_pipe.recv()
 
2703
2558
        command = request[0]
 
2705
2560
        if command == 'init':
 
2706
 
            key_id = request[1].decode("ascii")
 
2707
 
            fpr = request[2].decode("ascii")
 
2708
 
            address = request[3]
 
 
2562
            address = request[2]
 
2710
2564
            for c in self.clients.values():
 
2711
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2713
 
                if key_id and c.key_id == key_id:
 
2716
 
                if fpr and c.fingerprint == fpr:
 
 
2565
                if c.fingerprint == fpr:
 
2720
 
                logger.info("Client not found for key ID: %s, address"
 
2721
 
                            ": %s", key_id or fpr, address)
 
 
2569
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2570
                            "dress: %s", fpr, address)
 
2722
2571
                if self.use_dbus:
 
2723
2572
                    # Emit D-Bus signal
 
2724
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
 
2573
                    mandos_dbus_service.ClientNotFound(fpr,
 
2726
2575
                parent_pipe.send(False)
 
2729
2578
            GLib.io_add_watch(
 
2730
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2731
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2579
                parent_pipe.fileno(),
 
 
2580
                GLib.IO_IN | GLib.IO_HUP,
 
2732
2581
                functools.partial(self.handle_ipc,
 
2733
 
                                  parent_pipe=parent_pipe,
 
2735
 
                                  client_object=client))
 
 
2582
                                  parent_pipe = parent_pipe,
 
 
2584
                                  client_object = client))
 
2736
2585
            parent_pipe.send(True)
 
2737
2586
            # remove the old hook in favor of the new above hook on
 
 
2755
2604
                parent_pipe.send((
 
2756
2605
                    'data', client_object.__getattribute__(attrname)))
 
2758
2607
        if command == 'setattr':
 
2759
2608
            attrname = request[1]
 
2760
2609
            value = request[2]
 
2761
2610
            setattr(client_object, attrname, value)
 
2766
2615
def rfc3339_duration_to_delta(duration):
 
2767
2616
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2769
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2771
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2773
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2775
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2777
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2779
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2781
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
 
2618
    >>> rfc3339_duration_to_delta("P7D")
 
 
2619
    datetime.timedelta(7)
 
 
2620
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2621
    datetime.timedelta(0, 60)
 
 
2622
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2623
    datetime.timedelta(0, 3600)
 
 
2624
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2625
    datetime.timedelta(1)
 
 
2626
    >>> rfc3339_duration_to_delta("P1W")
 
 
2627
    datetime.timedelta(7)
 
 
2628
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2629
    datetime.timedelta(0, 330)
 
 
2630
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2631
    datetime.timedelta(1, 200)
 
2785
2634
    # Parsing an RFC 3339 duration with regular expressions is not
 
2786
2635
    # possible - there would have to be multiple places for the same
 
2787
2636
    # values, like seconds.  The current code, while more esoteric, is
 
2788
2637
    # cleaner without depending on a parsing library.  If Python had a
 
2789
2638
    # built-in library for parsing we would use it, but we'd like to
 
2790
2639
    # avoid excessive use of external libraries.
 
2792
2641
    # New type for defining tokens, syntax, and semantics all-in-one
 
2793
2642
    Token = collections.namedtuple("Token", (
 
2794
2643
        "regexp",  # To match token; if "value" is not None, must have
 
 
2981
2827
    parser.add_argument("--no-zeroconf", action="store_false",
 
2982
2828
                        dest="zeroconf", help="Do not use Zeroconf",
 
2985
2831
    options = parser.parse_args()
 
 
2835
        fail_count, test_count = doctest.testmod()
 
 
2836
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2987
2838
    # Default values for config file for server-global settings
 
2988
 
    if gnutls.has_rawpk:
 
2989
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
2990
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
2992
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2993
 
                    ":+SIGN-DSA-SHA256")
 
2994
 
    server_defaults = {"interface": "",
 
2998
 
                       "priority": priority,
 
2999
 
                       "servicename": "Mandos",
 
3005
 
                       "statedir": "/var/lib/mandos",
 
3006
 
                       "foreground": "False",
 
 
2839
    server_defaults = { "interface": "",
 
 
2844
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2845
                        ":+SIGN-DSA-SHA256",
 
 
2846
                        "servicename": "Mandos",
 
 
2852
                        "statedir": "/var/lib/mandos",
 
 
2853
                        "foreground": "False",
 
3011
2857
    # Parse config file for server-global settings
 
3012
 
    server_config = configparser.ConfigParser(server_defaults)
 
 
2858
    server_config = configparser.SafeConfigParser(server_defaults)
 
3013
2859
    del server_defaults
 
3014
2860
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
3015
 
    # Convert the ConfigParser object to a dict
 
 
2861
    # Convert the SafeConfigParser object to a dict
 
3016
2862
    server_settings = server_config.defaults()
 
3017
2863
    # Use the appropriate methods on the non-string config options
 
3018
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3019
 
                   "foreground", "zeroconf"):
 
 
2864
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
3020
2865
        server_settings[option] = server_config.getboolean("DEFAULT",
 
3022
2867
    if server_settings["port"]:
 
 
3195
3040
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3196
3041
        service = AvahiServiceToSyslog(
 
3197
 
            name=server_settings["servicename"],
 
3198
 
            servicetype="_mandos._tcp",
 
 
3042
            name = server_settings["servicename"],
 
 
3043
            servicetype = "_mandos._tcp",
 
 
3044
            protocol = protocol,
 
3201
3046
        if server_settings["interface"]:
 
3202
3047
            service.interface = if_nametoindex(
 
3203
3048
                server_settings["interface"].encode("utf-8"))
 
3205
3050
    global multiprocessing_manager
 
3206
3051
    multiprocessing_manager = multiprocessing.Manager()
 
3208
3053
    client_class = Client
 
3210
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
3055
        client_class = functools.partial(ClientDBus, bus = bus)
 
3212
3057
    client_settings = Client.config_parser(client_config)
 
3213
3058
    old_client_settings = {}
 
3214
3059
    clients_data = {}
 
3216
3061
    # This is used to redirect stdout and stderr for checker processes
 
3218
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3063
    wnull = open(os.devnull, "w") # A writable /dev/null
 
3219
3064
    # Only used if server is running in foreground but not in debug
 
3221
3066
    if debug or not foreground:
 
3224
3069
    # Get client data and settings from last running state.
 
3225
3070
    if server_settings["restore"]:
 
3227
3072
            with open(stored_state_path, "rb") as stored_state:
 
3228
 
                if sys.version_info.major == 2:
 
 
3073
                if sys.version_info.major == 2:                
 
3229
3074
                    clients_data, old_client_settings = pickle.load(
 
3232
3077
                    bytes_clients_data, bytes_old_client_settings = (
 
3233
 
                        pickle.load(stored_state, encoding="bytes"))
 
3234
 
                    #   Fix bytes to strings
 
 
3078
                        pickle.load(stored_state, encoding = "bytes"))
 
 
3079
                    ### Fix bytes to strings
 
3237
 
                    clients_data = {(key.decode("utf-8")
 
3238
 
                                     if isinstance(key, bytes)
 
3241
 
                                    bytes_clients_data.items()}
 
 
3082
                    clients_data = { (key.decode("utf-8")
 
 
3083
                                      if isinstance(key, bytes)
 
 
3086
                                     bytes_clients_data.items() }
 
3242
3087
                    del bytes_clients_data
 
3243
3088
                    for key in clients_data:
 
3244
 
                        value = {(k.decode("utf-8")
 
3245
 
                                  if isinstance(k, bytes) else k): v
 
3247
 
                                 clients_data[key].items()}
 
 
3089
                        value = { (k.decode("utf-8")
 
 
3090
                                   if isinstance(k, bytes) else k): v
 
 
3092
                                  clients_data[key].items() }
 
3248
3093
                        clients_data[key] = value
 
3249
3094
                        # .client_structure
 
3250
3095
                        value["client_structure"] = [
 
3251
3096
                            (s.decode("utf-8")
 
3252
3097
                             if isinstance(s, bytes)
 
3253
3098
                             else s) for s in
 
3254
 
                            value["client_structure"]]
 
3255
 
                        # .name, .host, and .checker_command
 
3256
 
                        for k in ("name", "host", "checker_command"):
 
 
3099
                            value["client_structure"] ]
 
 
3101
                        for k in ("name", "host"):
 
3257
3102
                            if isinstance(value[k], bytes):
 
3258
3103
                                value[k] = value[k].decode("utf-8")
 
3259
 
                        if "key_id" not in value:
 
3260
 
                            value["key_id"] = ""
 
3261
 
                        elif "fingerprint" not in value:
 
3262
 
                            value["fingerprint"] = ""
 
3263
 
                    #  old_client_settings
 
 
3104
                    ## old_client_settings
 
3265
3106
                    old_client_settings = {
 
3266
3107
                        (key.decode("utf-8")
 
3267
3108
                         if isinstance(key, bytes)
 
3268
3109
                         else key): value
 
3269
3110
                        for key, value in
 
3270
 
                        bytes_old_client_settings.items()}
 
 
3111
                        bytes_old_client_settings.items() }
 
3271
3112
                    del bytes_old_client_settings
 
3272
 
                    # .host and .checker_command
 
3273
3114
                    for value in old_client_settings.values():
 
3274
 
                        for attribute in ("host", "checker_command"):
 
3275
 
                            if isinstance(value[attribute], bytes):
 
3276
 
                                value[attribute] = (value[attribute]
 
 
3115
                        if isinstance(value["host"], bytes):
 
 
3116
                            value["host"] = (value["host"]
 
3278
3118
            os.remove(stored_state_path)
 
3279
3119
        except IOError as e:
 
3280
3120
            if e.errno == errno.ENOENT: