2
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-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
 
 
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
 
19
21
# the Free Software Foundation, either version 3 of the License, or
 
20
22
# (at your option) any later version.
 
22
 
#     This program is distributed in the hope that it will be useful,
 
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
25
27
#     GNU General Public License for more details.
 
27
29
# You should have received a copy of the GNU General Public License
 
28
 
# along with this program.  If not, see
 
29
 
# <http://www.gnu.org/licenses/>.
 
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
31
32
# Contact the authors at <mandos@recompile.se>.
 
34
35
from __future__ import (division, absolute_import, print_function,
 
 
227
251
                                     '--passphrase-file',
 
229
253
                                    + self.gnupgargs,
 
230
 
                                    stdin = subprocess.PIPE,
 
231
 
                                    stdout = subprocess.PIPE,
 
232
 
                                    stderr = subprocess.PIPE)
 
233
 
            ciphertext, err = proc.communicate(input = data)
 
 
254
                                    stdin=subprocess.PIPE,
 
 
255
                                    stdout=subprocess.PIPE,
 
 
256
                                    stderr=subprocess.PIPE)
 
 
257
            ciphertext, err = proc.communicate(input=data)
 
234
258
        if proc.returncode != 0:
 
235
259
            raise PGPError(err)
 
236
260
        return ciphertext
 
238
262
    def decrypt(self, data, password):
 
239
263
        passphrase = self.password_encode(password)
 
240
264
        with tempfile.NamedTemporaryFile(
 
241
 
                dir = self.tempdir) as passfile:
 
 
265
                dir=self.tempdir) as passfile:
 
242
266
            passfile.write(passphrase)
 
244
268
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
245
269
                                     '--passphrase-file',
 
247
271
                                    + self.gnupgargs,
 
248
 
                                    stdin = subprocess.PIPE,
 
249
 
                                    stdout = subprocess.PIPE,
 
250
 
                                    stderr = subprocess.PIPE)
 
251
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
 
272
                                    stdin=subprocess.PIPE,
 
 
273
                                    stdout=subprocess.PIPE,
 
 
274
                                    stderr=subprocess.PIPE)
 
 
275
            decrypted_plaintext, err = proc.communicate(input=data)
 
252
276
        if proc.returncode != 0:
 
253
277
            raise PGPError(err)
 
254
278
        return decrypted_plaintext
 
256
281
# Pretend that we have an Avahi module
 
258
 
    """This isn't so much a class as it is a module-like namespace.
 
259
 
    It is instantiated once, and simulates having an Avahi module."""
 
260
 
    IF_UNSPEC = -1              # avahi-common/address.h
 
261
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
 
262
 
    PROTO_INET = 0              # avahi-common/address.h
 
263
 
    PROTO_INET6 = 1             # avahi-common/address.h
 
 
283
    """This isn't so much a class as it is a module-like namespace."""
 
 
284
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
285
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
286
    PROTO_INET = 0               # avahi-common/address.h
 
 
287
    PROTO_INET6 = 1              # avahi-common/address.h
 
264
288
    DBUS_NAME = "org.freedesktop.Avahi"
 
265
289
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
266
290
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
267
291
    DBUS_PATH_SERVER = "/"
 
268
 
    def string_array_to_txt_array(self, t):
 
 
294
    def string_array_to_txt_array(t):
 
269
295
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
270
296
                           for s in t), signature="ay")
 
271
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
 
272
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
 
273
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
 
274
 
    SERVER_INVALID = 0          # avahi-common/defs.h
 
275
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
 
276
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
 
277
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
 
278
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
 
 
297
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
298
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
299
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
300
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
301
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
302
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
303
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
304
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
281
307
class AvahiError(Exception):
 
282
308
    def __init__(self, value, *args, **kwargs):
 
 
473
499
class AvahiServiceToSyslog(AvahiService):
 
474
500
    def rename(self, *args, **kwargs):
 
475
501
        """Add the new name to the syslog messages"""
 
476
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
502
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
477
503
        syslogger.setFormatter(logging.Formatter(
 
478
504
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
479
505
            .format(self.name)))
 
482
509
# Pretend that we have a GnuTLS module
 
483
 
class GnuTLS(object):
 
484
 
    """This isn't so much a class as it is a module-like namespace.
 
485
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
487
 
    _library = ctypes.cdll.LoadLibrary(
 
488
 
        ctypes.util.find_library("gnutls"))
 
489
 
    _need_version = b"3.3.0"
 
491
 
        # Need to use class name "GnuTLS" here, since this method is
 
492
 
        # called before the assignment to the "gnutls" global variable
 
494
 
        if GnuTLS.check_version(self._need_version) is None:
 
495
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
496
 
                               .format(self._need_version))
 
 
510
class gnutls(object):
 
 
511
    """This isn't so much a class as it is a module-like namespace."""
 
 
513
    library = ctypes.util.find_library("gnutls")
 
 
515
        library = ctypes.util.find_library("gnutls-deb0")
 
 
516
    _library = ctypes.cdll.LoadLibrary(library)
 
498
519
    # Unless otherwise indicated, the constants and types below are
 
499
520
    # all from the gnutls/gnutls.h C header file.
 
503
524
    E_INTERRUPTED = -52
 
508
530
    CRD_CERTIFICATE = 1
 
509
531
    E_NO_CERTIFICATE_FOUND = -49
 
 
536
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
510
537
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
513
540
    class session_int(ctypes.Structure):
 
515
542
    session_t = ctypes.POINTER(session_int)
 
516
544
    class certificate_credentials_st(ctypes.Structure):
 
518
546
    certificate_credentials_t = ctypes.POINTER(
 
519
547
        certificate_credentials_st)
 
520
548
    certificate_type_t = ctypes.c_int
 
521
550
    class datum_t(ctypes.Structure):
 
522
551
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
523
552
                    ('size', ctypes.c_uint)]
 
524
554
    class openpgp_crt_int(ctypes.Structure):
 
526
556
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
 
557
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
528
558
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
529
559
    credentials_type_t = ctypes.c_int
 
530
560
    transport_ptr_t = ctypes.c_void_p
 
531
561
    close_request_t = ctypes.c_int
 
534
564
    class Error(Exception):
 
535
 
        # We need to use the class name "GnuTLS" here, since this
 
536
 
        # exception might be raised from within GnuTLS.__init__,
 
537
 
        # which is called before the assignment to the "gnutls"
 
538
 
        # global variable has happened.
 
539
 
        def __init__(self, message = None, code = None, args=()):
 
 
565
        def __init__(self, message=None, code=None, args=()):
 
540
566
            # Default usage is by a message string, but if a return
 
541
567
            # code is passed, convert it to a string with
 
542
568
            # gnutls.strerror()
 
544
570
            if message is None and code is not None:
 
545
 
                message = GnuTLS.strerror(code)
 
546
 
            return super(GnuTLS.Error, self).__init__(
 
 
571
                message = gnutls.strerror(code)
 
 
572
            return super(gnutls.Error, self).__init__(
 
549
575
    class CertificateSecurityError(Error):
 
553
579
    class Credentials(object):
 
554
580
        def __init__(self):
 
 
611
643
                return _error_code(result)
 
612
644
            result = func(*arguments)
 
615
647
    # Unless otherwise indicated, the function declarations below are
 
616
648
    # all from the gnutls/gnutls.h C header file.
 
619
651
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
652
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
653
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
654
    priority_set_direct.restype = _error_code
 
624
656
    init = _library.gnutls_init
 
625
657
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
658
    init.restype = _error_code
 
628
660
    set_default_priority = _library.gnutls_set_default_priority
 
629
661
    set_default_priority.argtypes = [session_t]
 
630
662
    set_default_priority.restype = _error_code
 
632
664
    record_send = _library.gnutls_record_send
 
633
665
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
635
667
    record_send.restype = ctypes.c_ssize_t
 
636
668
    record_send.errcheck = _retry_on_error
 
638
670
    certificate_allocate_credentials = (
 
639
671
        _library.gnutls_certificate_allocate_credentials)
 
640
672
    certificate_allocate_credentials.argtypes = [
 
641
673
        ctypes.POINTER(certificate_credentials_t)]
 
642
674
    certificate_allocate_credentials.restype = _error_code
 
644
676
    certificate_free_credentials = (
 
645
677
        _library.gnutls_certificate_free_credentials)
 
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
678
    certificate_free_credentials.argtypes = [
 
 
679
        certificate_credentials_t]
 
647
680
    certificate_free_credentials.restype = None
 
649
682
    handshake_set_private_extensions = (
 
650
683
        _library.gnutls_handshake_set_private_extensions)
 
651
684
    handshake_set_private_extensions.argtypes = [session_t,
 
653
686
    handshake_set_private_extensions.restype = None
 
655
688
    credentials_set = _library.gnutls_credentials_set
 
656
689
    credentials_set.argtypes = [session_t, credentials_type_t,
 
658
691
    credentials_set.restype = _error_code
 
660
693
    strerror = _library.gnutls_strerror
 
661
694
    strerror.argtypes = [ctypes.c_int]
 
662
695
    strerror.restype = ctypes.c_char_p
 
664
697
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
698
    certificate_type_get.argtypes = [session_t]
 
666
699
    certificate_type_get.restype = _error_code
 
668
701
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
702
    certificate_get_peers.argtypes = [session_t,
 
670
703
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
704
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
673
706
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
707
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
708
    global_set_log_level.restype = None
 
677
710
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
711
    global_set_log_function.argtypes = [log_func]
 
679
712
    global_set_log_function.restype = None
 
681
714
    deinit = _library.gnutls_deinit
 
682
715
    deinit.argtypes = [session_t]
 
683
716
    deinit.restype = None
 
685
718
    handshake = _library.gnutls_handshake
 
686
719
    handshake.argtypes = [session_t]
 
687
720
    handshake.restype = _error_code
 
688
721
    handshake.errcheck = _retry_on_error
 
690
723
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
724
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
725
    transport_set_ptr.restype = None
 
694
727
    bye = _library.gnutls_bye
 
695
728
    bye.argtypes = [session_t, close_request_t]
 
696
729
    bye.restype = _error_code
 
697
730
    bye.errcheck = _retry_on_error
 
699
732
    check_version = _library.gnutls_check_version
 
700
733
    check_version.argtypes = [ctypes.c_char_p]
 
701
734
    check_version.restype = ctypes.c_char_p
 
703
 
    # All the function declarations below are from gnutls/openpgp.h
 
705
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
706
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
707
 
    openpgp_crt_init.restype = _error_code
 
709
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
710
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
711
 
                                   ctypes.POINTER(datum_t),
 
713
 
    openpgp_crt_import.restype = _error_code
 
715
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
716
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
717
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
718
 
    openpgp_crt_verify_self.restype = _error_code
 
720
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
721
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
722
 
    openpgp_crt_deinit.restype = None
 
724
 
    openpgp_crt_get_fingerprint = (
 
725
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
726
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
730
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
 
736
    _need_version = b"3.3.0"
 
 
737
    if check_version(_need_version) is None:
 
 
738
        raise self.Error("Needs GnuTLS {} or later"
 
 
739
                         .format(_need_version))
 
 
741
    _tls_rawpk_version = b"3.6.6"
 
 
742
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
746
        class pubkey_st(ctypes.Structure):
 
 
748
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
750
        x509_crt_fmt_t = ctypes.c_int
 
 
752
        # All the function declarations below are from gnutls/abstract.h
 
 
753
        pubkey_init = _library.gnutls_pubkey_init
 
 
754
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
755
        pubkey_init.restype = _error_code
 
 
757
        pubkey_import = _library.gnutls_pubkey_import
 
 
758
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
760
        pubkey_import.restype = _error_code
 
 
762
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
763
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
764
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
765
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
766
        pubkey_get_key_id.restype = _error_code
 
 
768
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
769
        pubkey_deinit.argtypes = [pubkey_t]
 
 
770
        pubkey_deinit.restype = None
 
 
772
        # All the function declarations below are from gnutls/openpgp.h
 
 
774
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
775
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
776
        openpgp_crt_init.restype = _error_code
 
 
778
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
779
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
780
                                       ctypes.POINTER(datum_t),
 
 
782
        openpgp_crt_import.restype = _error_code
 
 
784
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
785
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
786
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
787
        openpgp_crt_verify_self.restype = _error_code
 
 
789
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
790
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
791
        openpgp_crt_deinit.restype = None
 
 
793
        openpgp_crt_get_fingerprint = (
 
 
794
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
795
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
799
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
801
    if check_version(b"3.6.4"):
 
 
802
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
803
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
804
        certificate_type_get2.restype = _error_code
 
732
806
    # Remove non-public functions
 
733
807
    del _error_code, _retry_on_error
 
734
 
# Create the global "gnutls" object, simulating a module
 
737
810
def call_pipe(connection,       # : multiprocessing.Connection
 
738
811
              func, *args, **kwargs):
 
739
812
    """This function is meant to be called by multiprocessing.Process
 
741
814
    This function runs func(*args, **kwargs), and writes the resulting
 
742
815
    return value on the provided multiprocessing.Connection.
 
744
817
    connection.send(func(*args, **kwargs))
 
745
818
    connection.close()
 
747
821
class Client(object):
 
748
822
    """A representation of a client host served by this server.
 
751
825
    approved:   bool(); 'None' if not yet approved/disapproved
 
752
826
    approval_delay: datetime.timedelta(); Time to wait for approval
 
753
827
    approval_duration: datetime.timedelta(); Duration of one approval
 
754
 
    checker:    subprocess.Popen(); a running checker process used
 
755
 
                                    to see if the client lives.
 
756
 
                                    'None' if no process is running.
 
 
828
    checker: multiprocessing.Process(); a running checker process used
 
 
829
             to see if the client lives. 'None' if no process is
 
757
831
    checker_callback_tag: a GLib event source tag, or None
 
758
832
    checker_command: string; External command which is run to check
 
759
833
                     if client lives.  %() expansions are done at
 
 
1428
1508
                         exc_info=error)
 
1429
1509
        return xmlstring
 
1432
1513
    dbus.OBJECT_MANAGER_IFACE
 
1433
1514
except AttributeError:
 
1434
1515
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1436
1518
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
1519
    """A D-Bus object with an ObjectManager.
 
1439
1521
    Classes inheriting from this exposes the standard
 
1440
1522
    GetManagedObjects call and the InterfacesAdded and
 
1441
1523
    InterfacesRemoved signals on the standard
 
1442
1524
    "org.freedesktop.DBus.ObjectManager" interface.
 
1444
1526
    Note: No signals are sent automatically; they must be sent
 
1447
1529
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
 
                         out_signature = "a{oa{sa{sv}}}")
 
 
1530
                         out_signature="a{oa{sa{sv}}}")
 
1449
1531
    def GetManagedObjects(self):
 
1450
1532
        """This function must be overridden"""
 
1451
1533
        raise NotImplementedError()
 
1453
1535
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
 
                         signature = "oa{sa{sv}}")
 
 
1536
                         signature="oa{sa{sv}}")
 
1455
1537
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1458
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1540
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1459
1541
    def InterfacesRemoved(self, object_path, interfaces):
 
1462
1544
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
 
                         out_signature = "s",
 
1464
 
                         path_keyword = 'object_path',
 
1465
 
                         connection_keyword = 'connection')
 
 
1546
                         path_keyword='object_path',
 
 
1547
                         connection_keyword='connection')
 
1466
1548
    def Introspect(self, object_path, connection):
 
1467
1549
        """Overloading of standard D-Bus method.
 
1469
1551
        Override return argument name of GetManagedObjects to be
 
1470
1552
        "objpath_interfaces_and_properties"
 
 
2152
2244
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2153
2245
    """A class to handle client connections.
 
2155
2247
    Instantiated once for each connection to handle it.
 
2156
2248
    Note: This will run in its own forked process."""
 
2158
2250
    def handle(self):
 
2159
2251
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2160
2252
            logger.info("TCP connection from: %s",
 
2161
2253
                        str(self.client_address))
 
2162
2254
            logger.debug("Pipe FD: %d",
 
2163
2255
                         self.server.child_pipe.fileno())
 
2165
2257
            session = gnutls.ClientSession(self.request)
 
2167
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2168
 
            #                      "+AES-256-CBC", "+SHA1",
 
2169
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2259
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2260
            #                       "+AES-256-CBC", "+SHA1",
 
 
2261
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
2171
2263
            # Use a fallback default, since this MUST be set.
 
2172
2264
            priority = self.server.gnutls_priority
 
2173
2265
            if priority is None:
 
2174
2266
                priority = "NORMAL"
 
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
 
 
2267
            gnutls.priority_set_direct(session._c_object,
 
 
2268
                                       priority.encode("utf-8"),
 
2178
2271
            # Start communication using the Mandos protocol
 
2179
2272
            # Get protocol number
 
2180
2273
            line = self.request.makefile().readline()
 
 
2345
2495
class MultiprocessingMixIn(object):
 
2346
2496
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2348
2498
    def sub_process_main(self, request, address):
 
2350
2500
            self.finish_request(request, address)
 
2351
2501
        except Exception:
 
2352
2502
            self.handle_error(request, address)
 
2353
2503
        self.close_request(request)
 
2355
2505
    def process_request(self, request, address):
 
2356
2506
        """Start a new process to process the request."""
 
2357
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2358
 
                                       args = (request, address))
 
 
2507
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2508
                                       args=(request, address))
 
2363
2513
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2364
2514
    """ adds a pipe to the MixIn """
 
2366
2516
    def process_request(self, request, client_address):
 
2367
2517
        """Overrides and wraps the original process_request().
 
2369
2519
        This function creates a new pipe in self.pipe
 
2371
2521
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2373
2523
        proc = MultiprocessingMixIn.process_request(self, request,
 
2374
2524
                                                    client_address)
 
2375
2525
        self.child_pipe.close()
 
2376
2526
        self.add_pipe(parent_pipe, proc)
 
2378
2528
    def add_pipe(self, parent_pipe, proc):
 
2379
2529
        """Dummy function; override as necessary"""
 
2380
2530
        raise NotImplementedError()
 
 
2428
2579
        # socket_wrapper(), if socketfd was set.
 
2429
2580
        socketserver.TCPServer.__init__(self, server_address,
 
2430
2581
                                        RequestHandlerClass)
 
2432
2583
    def server_bind(self):
 
2433
2584
        """This overrides the normal server_bind() function
 
2434
2585
        to bind to an interface if one was specified, and also NOT to
 
2435
2586
        bind to an address or port if they were not specified."""
 
 
2587
        global SO_BINDTODEVICE
 
2436
2588
        if self.interface is not None:
 
2437
2589
            if SO_BINDTODEVICE is None:
 
2438
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
2439
 
                             " cannot bind to interface %s",
 
2443
 
                    self.socket.setsockopt(
 
2444
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2445
 
                        (self.interface + "\0").encode("utf-8"))
 
2446
 
                except socket.error as error:
 
2447
 
                    if error.errno == errno.EPERM:
 
2448
 
                        logger.error("No permission to bind to"
 
2449
 
                                     " interface %s", self.interface)
 
2450
 
                    elif error.errno == errno.ENOPROTOOPT:
 
2451
 
                        logger.error("SO_BINDTODEVICE not available;"
 
2452
 
                                     " cannot bind to interface %s",
 
2454
 
                    elif error.errno == errno.ENODEV:
 
2455
 
                        logger.error("Interface %s does not exist,"
 
2456
 
                                     " cannot bind", self.interface)
 
 
2590
                # Fall back to a hard-coded value which seems to be
 
 
2592
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2593
                SO_BINDTODEVICE = 25
 
 
2595
                self.socket.setsockopt(
 
 
2596
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2597
                    (self.interface + "\0").encode("utf-8"))
 
 
2598
            except socket.error as error:
 
 
2599
                if error.errno == errno.EPERM:
 
 
2600
                    logger.error("No permission to bind to"
 
 
2601
                                 " interface %s", self.interface)
 
 
2602
                elif error.errno == errno.ENOPROTOOPT:
 
 
2603
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2604
                                 " cannot bind to interface %s",
 
 
2606
                elif error.errno == errno.ENODEV:
 
 
2607
                    logger.error("Interface %s does not exist,"
 
 
2608
                                 " cannot bind", self.interface)
 
2459
2611
        # Only bind(2) the socket if we really need to.
 
2460
2612
        if self.server_address[0] or self.server_address[1]:
 
 
2613
            if self.server_address[1]:
 
 
2614
                self.allow_reuse_address = True
 
2461
2615
            if not self.server_address[0]:
 
2462
2616
                if self.address_family == socket.AF_INET6:
 
2463
 
                    any_address = "::" # in6addr_any
 
 
2617
                    any_address = "::"  # in6addr_any
 
2465
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
 
2619
                    any_address = "0.0.0.0"  # INADDR_ANY
 
2466
2620
                self.server_address = (any_address,
 
2467
2621
                                       self.server_address[1])
 
2468
2622
            elif not self.server_address[1]:
 
 
2502
2656
        self.gnutls_priority = gnutls_priority
 
2503
2657
        IPv6_TCPServer.__init__(self, server_address,
 
2504
2658
                                RequestHandlerClass,
 
2505
 
                                interface = interface,
 
2506
 
                                use_ipv6 = use_ipv6,
 
2507
 
                                socketfd = socketfd)
 
 
2659
                                interface=interface,
 
2509
2663
    def server_activate(self):
 
2510
2664
        if self.enabled:
 
2511
2665
            return socketserver.TCPServer.server_activate(self)
 
2513
2667
    def enable(self):
 
2514
2668
        self.enabled = True
 
2516
2670
    def add_pipe(self, parent_pipe, proc):
 
2517
2671
        # Call "handle_ipc" for both data and EOF events
 
2518
2672
        GLib.io_add_watch(
 
2519
2673
            parent_pipe.fileno(),
 
2520
2674
            GLib.IO_IN | GLib.IO_HUP,
 
2521
2675
            functools.partial(self.handle_ipc,
 
2522
 
                              parent_pipe = parent_pipe,
 
 
2676
                              parent_pipe=parent_pipe,
 
2525
2679
    def handle_ipc(self, source, condition,
 
2526
2680
                   parent_pipe=None,
 
2528
2682
                   client_object=None):
 
2529
2683
        # error, or the other end of multiprocessing.Pipe has closed
 
2530
2684
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2531
2685
            # Wait for other process to exit
 
2535
2689
        # Read a request from the child
 
2536
2690
        request = parent_pipe.recv()
 
2537
2691
        command = request[0]
 
2539
2693
        if command == 'init':
 
2541
 
            address = request[2]
 
 
2694
            key_id = request[1].decode("ascii")
 
 
2695
            fpr = request[2].decode("ascii")
 
 
2696
            address = request[3]
 
2543
2698
            for c in self.clients.values():
 
2544
 
                if c.fingerprint == fpr:
 
 
2699
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2701
                if key_id and c.key_id == key_id:
 
 
2704
                if fpr and c.fingerprint == fpr:
 
2548
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2549
 
                            "dress: %s", fpr, address)
 
 
2708
                logger.info("Client not found for key ID: %s, address"
 
 
2709
                            ": %s", key_id or fpr, address)
 
2550
2710
                if self.use_dbus:
 
2551
2711
                    # Emit D-Bus signal
 
2552
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2712
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2554
2714
                parent_pipe.send(False)
 
2557
2717
            GLib.io_add_watch(
 
2558
2718
                parent_pipe.fileno(),
 
2559
2719
                GLib.IO_IN | GLib.IO_HUP,
 
2560
2720
                functools.partial(self.handle_ipc,
 
2561
 
                                  parent_pipe = parent_pipe,
 
2563
 
                                  client_object = client))
 
 
2721
                                  parent_pipe=parent_pipe,
 
 
2723
                                  client_object=client))
 
2564
2724
            parent_pipe.send(True)
 
2565
2725
            # remove the old hook in favor of the new above hook on
 
 
2806
2969
    parser.add_argument("--no-zeroconf", action="store_false",
 
2807
2970
                        dest="zeroconf", help="Do not use Zeroconf",
 
2810
2973
    options = parser.parse_args()
 
2812
2975
    if options.check:
 
2814
2977
        fail_count, test_count = doctest.testmod()
 
2815
2978
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2817
2980
    # Default values for config file for server-global settings
 
2818
 
    server_defaults = { "interface": "",
 
2823
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2824
 
                        ":+SIGN-DSA-SHA256",
 
2825
 
                        "servicename": "Mandos",
 
2831
 
                        "statedir": "/var/lib/mandos",
 
2832
 
                        "foreground": "False",
 
 
2981
    if gnutls.has_rawpk:
 
 
2982
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2983
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2985
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2986
                    ":+SIGN-DSA-SHA256")
 
 
2987
    server_defaults = {"interface": "",
 
 
2991
                       "priority": priority,
 
 
2992
                       "servicename": "Mandos",
 
 
2998
                       "statedir": "/var/lib/mandos",
 
 
2999
                       "foreground": "False",
 
2836
3004
    # Parse config file for server-global settings
 
2837
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3005
    server_config = configparser.ConfigParser(server_defaults)
 
2838
3006
    del server_defaults
 
2839
3007
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2840
 
    # Convert the SafeConfigParser object to a dict
 
 
3008
    # Convert the ConfigParser object to a dict
 
2841
3009
    server_settings = server_config.defaults()
 
2842
3010
    # Use the appropriate methods on the non-string config options
 
2843
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
3011
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3012
                   "foreground", "zeroconf"):
 
2844
3013
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2846
3015
    if server_settings["port"]:
 
 
3019
3188
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3020
3189
        service = AvahiServiceToSyslog(
 
3021
 
            name = server_settings["servicename"],
 
3022
 
            servicetype = "_mandos._tcp",
 
3023
 
            protocol = protocol,
 
 
3190
            name=server_settings["servicename"],
 
 
3191
            servicetype="_mandos._tcp",
 
3025
3194
        if server_settings["interface"]:
 
3026
3195
            service.interface = if_nametoindex(
 
3027
3196
                server_settings["interface"].encode("utf-8"))
 
3029
3198
    global multiprocessing_manager
 
3030
3199
    multiprocessing_manager = multiprocessing.Manager()
 
3032
3201
    client_class = Client
 
3034
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3203
        client_class = functools.partial(ClientDBus, bus=bus)
 
3036
3205
    client_settings = Client.config_parser(client_config)
 
3037
3206
    old_client_settings = {}
 
3038
3207
    clients_data = {}
 
3040
3209
    # This is used to redirect stdout and stderr for checker processes
 
3042
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3211
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3043
3212
    # Only used if server is running in foreground but not in debug
 
3045
3214
    if debug or not foreground:
 
3048
3217
    # Get client data and settings from last running state.
 
3049
3218
    if server_settings["restore"]:
 
3051
3220
            with open(stored_state_path, "rb") as stored_state:
 
3052
 
                if sys.version_info.major == 2:                
 
 
3221
                if sys.version_info.major == 2:
 
3053
3222
                    clients_data, old_client_settings = pickle.load(
 
3056
3225
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
 
                    ### Fix bytes to strings
 
 
3226
                        pickle.load(stored_state, encoding="bytes"))
 
 
3227
                    #   Fix bytes to strings
 
3061
 
                    clients_data = { (key.decode("utf-8")
 
3062
 
                                      if isinstance(key, bytes)
 
3065
 
                                     bytes_clients_data.items() }
 
 
3230
                    clients_data = {(key.decode("utf-8")
 
 
3231
                                     if isinstance(key, bytes)
 
 
3234
                                    bytes_clients_data.items()}
 
3066
3235
                    del bytes_clients_data
 
3067
3236
                    for key in clients_data:
 
3068
 
                        value = { (k.decode("utf-8")
 
3069
 
                                   if isinstance(k, bytes) else k): v
 
3071
 
                                  clients_data[key].items() }
 
 
3237
                        value = {(k.decode("utf-8")
 
 
3238
                                  if isinstance(k, bytes) else k): v
 
 
3240
                                 clients_data[key].items()}
 
3072
3241
                        clients_data[key] = value
 
3073
3242
                        # .client_structure
 
3074
3243
                        value["client_structure"] = [
 
3075
3244
                            (s.decode("utf-8")
 
3076
3245
                             if isinstance(s, bytes)
 
3077
3246
                             else s) for s in
 
3078
 
                            value["client_structure"] ]
 
 
3247
                            value["client_structure"]]
 
3079
3248
                        # .name & .host
 
3080
3249
                        for k in ("name", "host"):
 
3081
3250
                            if isinstance(value[k], bytes):
 
3082
3251
                                value[k] = value[k].decode("utf-8")
 
3083
 
                    ## old_client_settings
 
 
3252
                        if "key_id" not in value:
 
 
3253
                            value["key_id"] = ""
 
 
3254
                        elif "fingerprint" not in value:
 
 
3255
                            value["fingerprint"] = ""
 
 
3256
                    #  old_client_settings
 
3085
3258
                    old_client_settings = {
 
3086
3259
                        (key.decode("utf-8")
 
3087
3260
                         if isinstance(key, bytes)
 
3088
3261
                         else key): value
 
3089
3262
                        for key, value in
 
3090
 
                        bytes_old_client_settings.items() }
 
 
3263
                        bytes_old_client_settings.items()}
 
3091
3264
                    del bytes_old_client_settings
 
3093
3266
                    for value in old_client_settings.values():