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-2018 Teddy Hogeborn
 
 
15
# Copyright © 2008-2018 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,
 
 
86
87
import xml.dom.minidom
 
 
90
# Try to find the value of SO_BINDTODEVICE:
 
 
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
93
    # newer, and it is also the most natural place for it:
 
90
94
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
91
95
except AttributeError:
 
 
97
        # This is where SO_BINDTODEVICE was up to and including Python
 
93
99
        from IN import SO_BINDTODEVICE
 
94
100
    except ImportError:
 
95
 
        SO_BINDTODEVICE = None
 
 
101
        # In Python 2.7 it seems to have been removed entirely.
 
 
102
        # Try running the C preprocessor:
 
 
104
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
106
                                  stdin=subprocess.PIPE,
 
 
107
                                  stdout=subprocess.PIPE)
 
 
108
            stdout = cc.communicate(
 
 
109
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
110
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
111
        except (OSError, ValueError, IndexError):
 
 
113
            SO_BINDTODEVICE = None
 
97
115
if sys.version_info.major == 2:
 
101
119
stored_state_file = "clients.pickle"
 
103
121
logger = logging.getLogger()
 
 
227
247
                                     '--passphrase-file',
 
229
249
                                    + self.gnupgargs,
 
230
 
                                    stdin = subprocess.PIPE,
 
231
 
                                    stdout = subprocess.PIPE,
 
232
 
                                    stderr = subprocess.PIPE)
 
233
 
            ciphertext, err = proc.communicate(input = data)
 
 
250
                                    stdin=subprocess.PIPE,
 
 
251
                                    stdout=subprocess.PIPE,
 
 
252
                                    stderr=subprocess.PIPE)
 
 
253
            ciphertext, err = proc.communicate(input=data)
 
234
254
        if proc.returncode != 0:
 
235
255
            raise PGPError(err)
 
236
256
        return ciphertext
 
238
258
    def decrypt(self, data, password):
 
239
259
        passphrase = self.password_encode(password)
 
240
260
        with tempfile.NamedTemporaryFile(
 
241
 
                dir = self.tempdir) as passfile:
 
 
261
                dir=self.tempdir) as passfile:
 
242
262
            passfile.write(passphrase)
 
244
264
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
245
265
                                     '--passphrase-file',
 
247
267
                                    + self.gnupgargs,
 
248
 
                                    stdin = subprocess.PIPE,
 
249
 
                                    stdout = subprocess.PIPE,
 
250
 
                                    stderr = subprocess.PIPE)
 
251
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
 
268
                                    stdin=subprocess.PIPE,
 
 
269
                                    stdout=subprocess.PIPE,
 
 
270
                                    stderr=subprocess.PIPE)
 
 
271
            decrypted_plaintext, err = proc.communicate(input=data)
 
252
272
        if proc.returncode != 0:
 
253
273
            raise PGPError(err)
 
254
274
        return decrypted_plaintext
 
256
277
# Pretend that we have an Avahi module
 
257
278
class Avahi(object):
 
258
279
    """This isn't so much a class as it is a module-like namespace.
 
259
280
    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
 
 
281
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
282
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
283
    PROTO_INET = 0               # avahi-common/address.h
 
 
284
    PROTO_INET6 = 1              # avahi-common/address.h
 
264
285
    DBUS_NAME = "org.freedesktop.Avahi"
 
265
286
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
266
287
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
267
288
    DBUS_PATH_SERVER = "/"
 
268
290
    def string_array_to_txt_array(self, t):
 
269
291
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
270
292
                           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
 
 
293
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
294
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
295
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
296
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
297
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
298
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
299
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
300
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
281
304
class AvahiError(Exception):
 
282
305
    def __init__(self, value, *args, **kwargs):
 
283
306
        self.value = value
 
 
473
496
class AvahiServiceToSyslog(AvahiService):
 
474
497
    def rename(self, *args, **kwargs):
 
475
498
        """Add the new name to the syslog messages"""
 
476
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
499
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
477
500
        syslogger.setFormatter(logging.Formatter(
 
478
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
479
502
            .format(self.name)))
 
482
506
# Pretend that we have a GnuTLS module
 
483
507
class GnuTLS(object):
 
484
508
    """This isn't so much a class as it is a module-like namespace.
 
485
509
    It is instantiated once, and simulates having a GnuTLS module."""
 
487
 
    _library = ctypes.cdll.LoadLibrary(
 
488
 
        ctypes.util.find_library("gnutls"))
 
 
511
    library = ctypes.util.find_library("gnutls")
 
 
513
        library = ctypes.util.find_library("gnutls-deb0")
 
 
514
    _library = ctypes.cdll.LoadLibrary(library)
 
489
516
    _need_version = b"3.3.0"
 
490
518
    def __init__(self):
 
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))
 
 
519
        # Need to use "self" here, since this method is called before
 
 
520
        # the assignment to the "gnutls" global variable happens.
 
 
521
        if self.check_version(self._need_version) is None:
 
 
522
            raise self.Error("Needs GnuTLS {} or later"
 
 
523
                             .format(self._need_version))
 
498
525
    # Unless otherwise indicated, the constants and types below are
 
499
526
    # all from the gnutls/gnutls.h C header file.
 
503
530
    E_INTERRUPTED = -52
 
 
508
535
    CRD_CERTIFICATE = 1
 
509
536
    E_NO_CERTIFICATE_FOUND = -49
 
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
565
        # We need to use the class name "GnuTLS" here, since this
 
536
566
        # exception might be raised from within GnuTLS.__init__,
 
537
567
        # which is called before the assignment to the "gnutls"
 
538
568
        # global variable has happened.
 
539
 
        def __init__(self, message = None, code = None, args=()):
 
 
569
        def __init__(self, message=None, code=None, args=()):
 
540
570
            # Default usage is by a message string, but if a return
 
541
571
            # code is passed, convert it to a string with
 
542
572
            # gnutls.strerror()
 
 
611
641
                return _error_code(result)
 
612
642
            result = func(*arguments)
 
615
645
    # Unless otherwise indicated, the function declarations below are
 
616
646
    # all from the gnutls/gnutls.h C header file.
 
619
649
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
650
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
651
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
652
    priority_set_direct.restype = _error_code
 
624
654
    init = _library.gnutls_init
 
625
655
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
656
    init.restype = _error_code
 
628
658
    set_default_priority = _library.gnutls_set_default_priority
 
629
659
    set_default_priority.argtypes = [session_t]
 
630
660
    set_default_priority.restype = _error_code
 
632
662
    record_send = _library.gnutls_record_send
 
633
663
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
635
665
    record_send.restype = ctypes.c_ssize_t
 
636
666
    record_send.errcheck = _retry_on_error
 
638
668
    certificate_allocate_credentials = (
 
639
669
        _library.gnutls_certificate_allocate_credentials)
 
640
670
    certificate_allocate_credentials.argtypes = [
 
641
671
        ctypes.POINTER(certificate_credentials_t)]
 
642
672
    certificate_allocate_credentials.restype = _error_code
 
644
674
    certificate_free_credentials = (
 
645
675
        _library.gnutls_certificate_free_credentials)
 
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
676
    certificate_free_credentials.argtypes = [
 
 
677
        certificate_credentials_t]
 
647
678
    certificate_free_credentials.restype = None
 
649
680
    handshake_set_private_extensions = (
 
650
681
        _library.gnutls_handshake_set_private_extensions)
 
651
682
    handshake_set_private_extensions.argtypes = [session_t,
 
653
684
    handshake_set_private_extensions.restype = None
 
655
686
    credentials_set = _library.gnutls_credentials_set
 
656
687
    credentials_set.argtypes = [session_t, credentials_type_t,
 
658
689
    credentials_set.restype = _error_code
 
660
691
    strerror = _library.gnutls_strerror
 
661
692
    strerror.argtypes = [ctypes.c_int]
 
662
693
    strerror.restype = ctypes.c_char_p
 
664
695
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
696
    certificate_type_get.argtypes = [session_t]
 
666
697
    certificate_type_get.restype = _error_code
 
668
699
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
700
    certificate_get_peers.argtypes = [session_t,
 
670
701
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
702
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
673
704
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
705
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
706
    global_set_log_level.restype = None
 
677
708
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
709
    global_set_log_function.argtypes = [log_func]
 
679
710
    global_set_log_function.restype = None
 
681
712
    deinit = _library.gnutls_deinit
 
682
713
    deinit.argtypes = [session_t]
 
683
714
    deinit.restype = None
 
685
716
    handshake = _library.gnutls_handshake
 
686
717
    handshake.argtypes = [session_t]
 
687
718
    handshake.restype = _error_code
 
688
719
    handshake.errcheck = _retry_on_error
 
690
721
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
722
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
723
    transport_set_ptr.restype = None
 
694
725
    bye = _library.gnutls_bye
 
695
726
    bye.argtypes = [session_t, close_request_t]
 
696
727
    bye.restype = _error_code
 
697
728
    bye.errcheck = _retry_on_error
 
699
730
    check_version = _library.gnutls_check_version
 
700
731
    check_version.argtypes = [ctypes.c_char_p]
 
701
732
    check_version.restype = ctypes.c_char_p
 
703
734
    # All the function declarations below are from gnutls/openpgp.h
 
705
736
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
706
737
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
707
738
    openpgp_crt_init.restype = _error_code
 
709
740
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
710
741
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
711
742
                                   ctypes.POINTER(datum_t),
 
712
743
                                   openpgp_crt_fmt_t]
 
713
744
    openpgp_crt_import.restype = _error_code
 
715
746
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
716
747
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
717
748
                                        ctypes.POINTER(ctypes.c_uint)]
 
718
749
    openpgp_crt_verify_self.restype = _error_code
 
720
751
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
721
752
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
722
753
    openpgp_crt_deinit.restype = None
 
724
755
    openpgp_crt_get_fingerprint = (
 
725
756
        _library.gnutls_openpgp_crt_get_fingerprint)
 
726
757
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
1046
1079
            # The exception is when not debugging but nevertheless
 
1047
1080
            # running in the foreground; use the previously
 
1048
1081
            # created wnull.
 
1049
 
            popen_args = { "close_fds": True,
 
 
1082
            popen_args = {"close_fds": True,
 
1052
1085
            if (not self.server_settings["debug"]
 
1053
1086
                and self.server_settings["foreground"]):
 
1054
1087
                popen_args.update({"stdout": wnull,
 
1056
 
            pipe = multiprocessing.Pipe(duplex = False)
 
 
1089
            pipe = multiprocessing.Pipe(duplex=False)
 
1057
1090
            self.checker = multiprocessing.Process(
 
1059
 
                args = (pipe[1], subprocess.call, command),
 
1060
 
                kwargs = popen_args)
 
 
1092
                args=(pipe[1], subprocess.call, command),
 
1061
1094
            self.checker.start()
 
1062
1095
            self.checker_callback_tag = GLib.io_add_watch(
 
1063
1096
                pipe[0].fileno(), GLib.IO_IN,
 
1064
1097
                self.checker_callback, pipe[0], command)
 
1065
1098
        # Re-run this periodically if run by GLib.timeout_add
 
1068
1101
    def stop_checker(self):
 
1069
1102
        """Force the checker process, if any, to stop."""
 
1070
1103
        if self.checker_callback_tag:
 
 
1105
1138
        func._dbus_name = func.__name__
 
1106
1139
        if func._dbus_name.endswith("_dbus_property"):
 
1107
1140
            func._dbus_name = func._dbus_name[:-14]
 
1108
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
 
1141
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
1111
1144
    return decorator
 
1114
1147
def dbus_interface_annotations(dbus_interface):
 
1115
1148
    """Decorator for marking functions returning interface annotations
 
1119
1152
    @dbus_interface_annotations("org.example.Interface")
 
1120
1153
    def _foo(self):  # Function name does not matter
 
1121
1154
        return {"org.freedesktop.DBus.Deprecated": "true",
 
1122
1155
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1126
1159
    def decorator(func):
 
1127
1160
        func._dbus_is_interface = True
 
1128
1161
        func._dbus_interface = dbus_interface
 
1129
1162
        func._dbus_name = dbus_interface
 
1132
1165
    return decorator
 
1135
1168
def dbus_annotations(annotations):
 
1136
1169
    """Decorator to annotate D-Bus methods, signals or properties
 
1139
1172
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
1140
1173
                       "org.freedesktop.DBus.Property."
 
1141
1174
                       "EmitsChangedSignal": "false"})
 
 
1197
1230
                for cls in self.__class__.__mro__
 
1198
1231
                for name, athing in
 
1199
1232
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1201
1234
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1202
 
                         out_signature = "s",
 
1203
 
                         path_keyword = 'object_path',
 
1204
 
                         connection_keyword = 'connection')
 
 
1236
                         path_keyword='object_path',
 
 
1237
                         connection_keyword='connection')
 
1205
1238
    def Introspect(self, object_path, connection):
 
1206
1239
        """Overloading of standard D-Bus method.
 
1208
1241
        Inserts annotation tags on methods and signals.
 
1210
1243
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1213
1246
            document = xml.dom.minidom.parseString(xmlstring)
 
1215
1248
            for if_tag in document.getElementsByTagName("interface"):
 
1216
1249
                # Add annotation tags
 
1217
1250
                for typ in ("method", "signal"):
 
 
1428
1461
                         exc_info=error)
 
1429
1462
        return xmlstring
 
1432
1466
    dbus.OBJECT_MANAGER_IFACE
 
1433
1467
except AttributeError:
 
1434
1468
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1436
1471
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
1472
    """A D-Bus object with an ObjectManager.
 
1439
1474
    Classes inheriting from this exposes the standard
 
1440
1475
    GetManagedObjects call and the InterfacesAdded and
 
1441
1476
    InterfacesRemoved signals on the standard
 
1442
1477
    "org.freedesktop.DBus.ObjectManager" interface.
 
1444
1479
    Note: No signals are sent automatically; they must be sent
 
1447
1482
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
 
                         out_signature = "a{oa{sa{sv}}}")
 
 
1483
                         out_signature="a{oa{sa{sv}}}")
 
1449
1484
    def GetManagedObjects(self):
 
1450
1485
        """This function must be overridden"""
 
1451
1486
        raise NotImplementedError()
 
1453
1488
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
 
                         signature = "oa{sa{sv}}")
 
 
1489
                         signature="oa{sa{sv}}")
 
1455
1490
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1458
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1493
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1459
1494
    def InterfacesRemoved(self, object_path, interfaces):
 
1462
1497
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
 
                         out_signature = "s",
 
1464
 
                         path_keyword = 'object_path',
 
1465
 
                         connection_keyword = 'connection')
 
 
1499
                         path_keyword='object_path',
 
 
1500
                         connection_keyword='connection')
 
1466
1501
    def Introspect(self, object_path, connection):
 
1467
1502
        """Overloading of standard D-Bus method.
 
1469
1504
        Override return argument name of GetManagedObjects to be
 
1470
1505
        "objpath_interfaces_and_properties"
 
 
1509
1545
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1510
1546
    interface names according to the "alt_interface_names" mapping.
 
1513
1549
    @alternate_dbus_interfaces({"org.example.Interface":
 
1514
1550
                                    "net.example.AlternateInterface"})
 
1515
1551
    class SampleDBusObject(dbus.service.Object):
 
1516
1552
        @dbus.service.method("org.example.Interface")
 
1517
1553
        def SampleDBusMethod():
 
1520
1556
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1521
1557
    reachable via two interfaces: "org.example.Interface" and
 
1522
1558
    "net.example.AlternateInterface", the latter of which will have
 
1523
1559
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1524
1560
    "true", unless "deprecate" is passed with a False value.
 
1526
1562
    This works for methods and signals, and also for D-Bus properties
 
1527
1563
    (from DBusObjectWithProperties) and interfaces (from the
 
1528
1564
    dbus_interface_annotations decorator).
 
1531
1567
    def wrapper(cls):
 
1532
1568
        for orig_interface_name, alt_interface_name in (
 
1533
1569
                alt_interface_names.items()):
 
 
1675
1713
                            "se.bsnet.fukt.Mandos"})
 
1676
1714
class ClientDBus(Client, DBusObjectWithProperties):
 
1677
1715
    """A Client class using D-Bus
 
1680
1718
    dbus_object_path: dbus.ObjectPath
 
1681
1719
    bus: dbus.SystemBus()
 
1684
1722
    runtime_expansions = (Client.runtime_expansions
 
1685
1723
                          + ("dbus_object_path", ))
 
1687
1725
    _interface = "se.recompile.Mandos.Client"
 
1689
1727
    # dbus.service.Object doesn't use super(), so we can't either.
 
1691
 
    def __init__(self, bus = None, *args, **kwargs):
 
 
1729
    def __init__(self, bus=None, *args, **kwargs):
 
1693
1731
        Client.__init__(self, *args, **kwargs)
 
1694
1732
        # Only now, when this client is initialized, can it show up on
 
 
1731
1769
                        dbus_value = transform_func(
 
1732
1770
                            type_func(value),
 
1733
 
                            variant_level = variant_level)
 
 
1771
                            variant_level=variant_level)
 
1734
1772
                        self.PropertyChanged(dbus.String(dbus_name),
 
1736
1774
                        self.PropertiesChanged(
 
1738
 
                            dbus.Dictionary({ dbus.String(dbus_name):
 
 
1776
                            dbus.Dictionary({dbus.String(dbus_name):
 
1741
1779
            setattr(self, attrname, value)
 
1743
1781
        return property(lambda self: getattr(self, attrname), setter)
 
1745
1783
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1746
1784
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1747
1785
                                             "ApprovalPending",
 
1749
1787
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1750
1788
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1752
1790
    checker = notifychangeproperty(
 
1753
1791
        dbus.Boolean, "CheckerRunning",
 
1754
 
        type_func = lambda checker: checker is not None)
 
 
1792
        type_func=lambda checker: checker is not None)
 
1755
1793
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1756
1794
                                           "LastCheckedOK")
 
1757
1795
    last_checker_status = notifychangeproperty(dbus.Int16,
 
 
1762
1800
                                               "ApprovedByDefault")
 
1763
1801
    approval_delay = notifychangeproperty(
 
1764
1802
        dbus.UInt64, "ApprovalDelay",
 
1765
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1803
        type_func=lambda td: td.total_seconds() * 1000)
 
1766
1804
    approval_duration = notifychangeproperty(
 
1767
1805
        dbus.UInt64, "ApprovalDuration",
 
1768
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1806
        type_func=lambda td: td.total_seconds() * 1000)
 
1769
1807
    host = notifychangeproperty(dbus.String, "Host")
 
1770
1808
    timeout = notifychangeproperty(
 
1771
1809
        dbus.UInt64, "Timeout",
 
1772
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1810
        type_func=lambda td: td.total_seconds() * 1000)
 
1773
1811
    extended_timeout = notifychangeproperty(
 
1774
1812
        dbus.UInt64, "ExtendedTimeout",
 
1775
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1813
        type_func=lambda td: td.total_seconds() * 1000)
 
1776
1814
    interval = notifychangeproperty(
 
1777
1815
        dbus.UInt64, "Interval",
 
1778
 
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1816
        type_func=lambda td: td.total_seconds() * 1000)
 
1779
1817
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1780
1818
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1781
1819
                                  invalidate_only=True)
 
1783
1821
    del notifychangeproperty
 
1785
1823
    def __del__(self, *args, **kwargs):
 
1787
1825
            self.remove_from_connection()
 
 
1822
1860
            # Emit D-Bus signal
 
1823
1861
            self.CheckerStarted(self.current_checker_command)
 
1826
1864
    def _reset_approved(self):
 
1827
1865
        self.approved = None
 
1830
1868
    def approve(self, value=True):
 
1831
1869
        self.approved = value
 
1832
1870
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
1833
1871
                             * 1000), self._reset_approved)
 
1834
1872
        self.send_changedstate()
 
1836
 
    ## D-Bus methods, signals & properties
 
 
1874
    #  D-Bus methods, signals & properties
 
1842
1880
    # CheckerCompleted - signal
 
1843
1881
    @dbus.service.signal(_interface, signature="nxs")
 
1844
1882
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
1848
1886
    # CheckerStarted - signal
 
1849
1887
    @dbus.service.signal(_interface, signature="s")
 
1850
1888
    def CheckerStarted(self, command):
 
1854
1892
    # PropertyChanged - signal
 
1855
1893
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1856
1894
    @dbus.service.signal(_interface, signature="sv")
 
1857
1895
    def PropertyChanged(self, property, value):
 
1861
1899
    # GotSecret - signal
 
1862
1900
    @dbus.service.signal(_interface)
 
1863
1901
    def GotSecret(self):
 
 
1866
1904
        server to mandos-client
 
1870
1908
    # Rejected - signal
 
1871
1909
    @dbus.service.signal(_interface, signature="s")
 
1872
1910
    def Rejected(self, reason):
 
1876
1914
    # NeedApproval - signal
 
1877
1915
    @dbus.service.signal(_interface, signature="tb")
 
1878
1916
    def NeedApproval(self, timeout, default):
 
1880
1918
        return self.need_approval()
 
1884
1922
    # Approve - method
 
1885
1923
    @dbus.service.method(_interface, in_signature="b")
 
1886
1924
    def Approve(self, value):
 
1887
1925
        self.approve(value)
 
1889
1927
    # CheckedOK - method
 
1890
1928
    @dbus.service.method(_interface)
 
1891
1929
    def CheckedOK(self):
 
1892
1930
        self.checked_ok()
 
1894
1932
    # Enable - method
 
1895
1933
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1896
1934
    @dbus.service.method(_interface)
 
1897
1935
    def Enable(self):
 
1901
1939
    # StartChecker - method
 
1902
1940
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1903
1941
    @dbus.service.method(_interface)
 
1904
1942
    def StartChecker(self):
 
1906
1944
        self.start_checker()
 
1908
1946
    # Disable - method
 
1909
1947
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1910
1948
    @dbus.service.method(_interface)
 
1911
1949
    def Disable(self):
 
1915
1953
    # StopChecker - method
 
1916
1954
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1917
1955
    @dbus.service.method(_interface)
 
1918
1956
    def StopChecker(self):
 
1919
1957
        self.stop_checker()
 
1923
1961
    # ApprovalPending - property
 
1924
1962
    @dbus_service_property(_interface, signature="b", access="read")
 
1925
1963
    def ApprovalPending_dbus_property(self):
 
1926
1964
        return dbus.Boolean(bool(self.approvals_pending))
 
1928
1966
    # ApprovedByDefault - property
 
1929
1967
    @dbus_service_property(_interface,
 
 
2010
2048
            self.checked_ok()
 
2012
2050
        return datetime_to_dbus(self.last_checked_ok)
 
2014
2052
    # LastCheckerStatus - property
 
2015
2053
    @dbus_service_property(_interface, signature="n", access="read")
 
2016
2054
    def LastCheckerStatus_dbus_property(self):
 
2017
2055
        return dbus.Int16(self.last_checker_status)
 
2019
2057
    # Expires - property
 
2020
2058
    @dbus_service_property(_interface, signature="s", access="read")
 
2021
2059
    def Expires_dbus_property(self):
 
2022
2060
        return datetime_to_dbus(self.expires)
 
2024
2062
    # LastApprovalRequest - property
 
2025
2063
    @dbus_service_property(_interface, signature="s", access="read")
 
2026
2064
    def LastApprovalRequest_dbus_property(self):
 
2027
2065
        return datetime_to_dbus(self.last_approval_request)
 
2029
2067
    # Timeout - property
 
2030
2068
    @dbus_service_property(_interface,
 
 
2152
2190
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2153
2191
    """A class to handle client connections.
 
2155
2193
    Instantiated once for each connection to handle it.
 
2156
2194
    Note: This will run in its own forked process."""
 
2158
2196
    def handle(self):
 
2159
2197
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2160
2198
            logger.info("TCP connection from: %s",
 
2161
2199
                        str(self.client_address))
 
2162
2200
            logger.debug("Pipe FD: %d",
 
2163
2201
                         self.server.child_pipe.fileno())
 
2165
2203
            session = gnutls.ClientSession(self.request)
 
2167
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2168
 
            #                      "+AES-256-CBC", "+SHA1",
 
2169
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2205
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2206
            #                       "+AES-256-CBC", "+SHA1",
 
 
2207
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
2171
2209
            # Use a fallback default, since this MUST be set.
 
2172
2210
            priority = self.server.gnutls_priority
 
2173
2211
            if priority is None:
 
2174
2212
                priority = "NORMAL"
 
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
 
 
2213
            gnutls.priority_set_direct(session._c_object,
 
 
2214
                                       priority.encode("utf-8"),
 
2178
2217
            # Start communication using the Mandos protocol
 
2179
2218
            # Get protocol number
 
2180
2219
            line = self.request.makefile().readline()
 
 
2345
2384
class MultiprocessingMixIn(object):
 
2346
2385
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2348
2387
    def sub_process_main(self, request, address):
 
2350
2389
            self.finish_request(request, address)
 
2351
2390
        except Exception:
 
2352
2391
            self.handle_error(request, address)
 
2353
2392
        self.close_request(request)
 
2355
2394
    def process_request(self, request, address):
 
2356
2395
        """Start a new process to process the request."""
 
2357
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2358
 
                                       args = (request, address))
 
 
2396
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2397
                                       args=(request, address))
 
2363
2402
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2364
2403
    """ adds a pipe to the MixIn """
 
2366
2405
    def process_request(self, request, client_address):
 
2367
2406
        """Overrides and wraps the original process_request().
 
2369
2408
        This function creates a new pipe in self.pipe
 
2371
2410
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2373
2412
        proc = MultiprocessingMixIn.process_request(self, request,
 
2374
2413
                                                    client_address)
 
2375
2414
        self.child_pipe.close()
 
2376
2415
        self.add_pipe(parent_pipe, proc)
 
2378
2417
    def add_pipe(self, parent_pipe, proc):
 
2379
2418
        """Dummy function; override as necessary"""
 
2380
2419
        raise NotImplementedError()
 
 
2428
2468
        # socket_wrapper(), if socketfd was set.
 
2429
2469
        socketserver.TCPServer.__init__(self, server_address,
 
2430
2470
                                        RequestHandlerClass)
 
2432
2472
    def server_bind(self):
 
2433
2473
        """This overrides the normal server_bind() function
 
2434
2474
        to bind to an interface if one was specified, and also NOT to
 
2435
2475
        bind to an address or port if they were not specified."""
 
 
2476
        global SO_BINDTODEVICE
 
2436
2477
        if self.interface is not None:
 
2437
2478
            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)
 
 
2479
                # Fall back to a hard-coded value which seems to be
 
 
2481
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2482
                SO_BINDTODEVICE = 25
 
 
2484
                self.socket.setsockopt(
 
 
2485
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2486
                    (self.interface + "\0").encode("utf-8"))
 
 
2487
            except socket.error as error:
 
 
2488
                if error.errno == errno.EPERM:
 
 
2489
                    logger.error("No permission to bind to"
 
 
2490
                                 " interface %s", self.interface)
 
 
2491
                elif error.errno == errno.ENOPROTOOPT:
 
 
2492
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2493
                                 " cannot bind to interface %s",
 
 
2495
                elif error.errno == errno.ENODEV:
 
 
2496
                    logger.error("Interface %s does not exist,"
 
 
2497
                                 " cannot bind", self.interface)
 
2459
2500
        # Only bind(2) the socket if we really need to.
 
2460
2501
        if self.server_address[0] or self.server_address[1]:
 
2461
2502
            if not self.server_address[0]:
 
2462
2503
                if self.address_family == socket.AF_INET6:
 
2463
 
                    any_address = "::" # in6addr_any
 
 
2504
                    any_address = "::"  # in6addr_any
 
2465
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
 
2506
                    any_address = "0.0.0.0"  # INADDR_ANY
 
2466
2507
                self.server_address = (any_address,
 
2467
2508
                                       self.server_address[1])
 
2468
2509
            elif not self.server_address[1]:
 
 
2502
2543
        self.gnutls_priority = gnutls_priority
 
2503
2544
        IPv6_TCPServer.__init__(self, server_address,
 
2504
2545
                                RequestHandlerClass,
 
2505
 
                                interface = interface,
 
2506
 
                                use_ipv6 = use_ipv6,
 
2507
 
                                socketfd = socketfd)
 
 
2546
                                interface=interface,
 
2509
2550
    def server_activate(self):
 
2510
2551
        if self.enabled:
 
2511
2552
            return socketserver.TCPServer.server_activate(self)
 
2513
2554
    def enable(self):
 
2514
2555
        self.enabled = True
 
2516
2557
    def add_pipe(self, parent_pipe, proc):
 
2517
2558
        # Call "handle_ipc" for both data and EOF events
 
2518
2559
        GLib.io_add_watch(
 
2519
2560
            parent_pipe.fileno(),
 
2520
2561
            GLib.IO_IN | GLib.IO_HUP,
 
2521
2562
            functools.partial(self.handle_ipc,
 
2522
 
                              parent_pipe = parent_pipe,
 
 
2563
                              parent_pipe=parent_pipe,
 
2525
2566
    def handle_ipc(self, source, condition,
 
2526
2567
                   parent_pipe=None,
 
2528
2569
                   client_object=None):
 
2529
2570
        # error, or the other end of multiprocessing.Pipe has closed
 
2530
2571
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2531
2572
            # Wait for other process to exit
 
2535
2576
        # Read a request from the child
 
2536
2577
        request = parent_pipe.recv()
 
2537
2578
        command = request[0]
 
2539
2580
        if command == 'init':
 
 
2581
            fpr = request[1].decode("ascii")
 
2541
2582
            address = request[2]
 
2543
2584
            for c in self.clients.values():
 
2544
2585
                if c.fingerprint == fpr:
 
 
2609
2650
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2610
2651
    datetime.timedelta(1, 200)
 
2613
2654
    # Parsing an RFC 3339 duration with regular expressions is not
 
2614
2655
    # possible - there would have to be multiple places for the same
 
2615
2656
    # values, like seconds.  The current code, while more esoteric, is
 
2616
2657
    # cleaner without depending on a parsing library.  If Python had a
 
2617
2658
    # built-in library for parsing we would use it, but we'd like to
 
2618
2659
    # avoid excessive use of external libraries.
 
2620
2661
    # New type for defining tokens, syntax, and semantics all-in-one
 
2621
2662
    Token = collections.namedtuple("Token", (
 
2622
2663
        "regexp",  # To match token; if "value" is not None, must have
 
 
2806
2850
    parser.add_argument("--no-zeroconf", action="store_false",
 
2807
2851
                        dest="zeroconf", help="Do not use Zeroconf",
 
2810
2854
    options = parser.parse_args()
 
2812
2856
    if options.check:
 
2814
2858
        fail_count, test_count = doctest.testmod()
 
2815
2859
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2817
2861
    # 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",
 
 
2862
    server_defaults = {"interface": "",
 
 
2867
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2868
                       ":+SIGN-DSA-SHA256",
 
 
2869
                       "servicename": "Mandos",
 
 
2875
                       "statedir": "/var/lib/mandos",
 
 
2876
                       "foreground": "False",
 
2836
2880
    # Parse config file for server-global settings
 
2837
2881
    server_config = configparser.SafeConfigParser(server_defaults)
 
2838
2882
    del server_defaults
 
 
2967
3012
                       .format(uid, gid, os.strerror(error.errno)))
 
2968
3013
        if error.errno != errno.EPERM:
 
2972
3017
        # Enable all possible GnuTLS debugging
 
2974
3019
        # "Use a log level over 10 to enable all debugging options."
 
2975
3020
        # - GnuTLS manual
 
2976
3021
        gnutls.global_set_log_level(11)
 
2978
3023
        @gnutls.log_func
 
2979
3024
        def debug_gnutls(level, string):
 
2980
3025
            logger.debug("GnuTLS: %s", string[:-1])
 
2982
3027
        gnutls.global_set_log_function(debug_gnutls)
 
2984
3029
        # Redirect stdin so all checkers get /dev/null
 
2985
3030
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2986
3031
        os.dup2(null, sys.stdin.fileno())
 
2990
3035
    # Need to fork before connecting to D-Bus
 
2991
3036
    if not foreground:
 
2992
3037
        # Close all input and output, do double fork, etc.
 
2995
3040
    # multiprocessing will use threads, so before we use GLib we need
 
2996
3041
    # to inform GLib that threads will be used.
 
2997
3042
    GLib.threads_init()
 
2999
3044
    global main_loop
 
3000
3045
    # From the Avahi example code
 
3001
3046
    DBusGMainLoop(set_as_default=True)
 
 
3019
3064
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3020
3065
        service = AvahiServiceToSyslog(
 
3021
 
            name = server_settings["servicename"],
 
3022
 
            servicetype = "_mandos._tcp",
 
3023
 
            protocol = protocol,
 
 
3066
            name=server_settings["servicename"],
 
 
3067
            servicetype="_mandos._tcp",
 
3025
3070
        if server_settings["interface"]:
 
3026
3071
            service.interface = if_nametoindex(
 
3027
3072
                server_settings["interface"].encode("utf-8"))
 
3029
3074
    global multiprocessing_manager
 
3030
3075
    multiprocessing_manager = multiprocessing.Manager()
 
3032
3077
    client_class = Client
 
3034
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3079
        client_class = functools.partial(ClientDBus, bus=bus)
 
3036
3081
    client_settings = Client.config_parser(client_config)
 
3037
3082
    old_client_settings = {}
 
3038
3083
    clients_data = {}
 
3040
3085
    # This is used to redirect stdout and stderr for checker processes
 
3042
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3087
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3043
3088
    # Only used if server is running in foreground but not in debug
 
3045
3090
    if debug or not foreground:
 
3048
3093
    # Get client data and settings from last running state.
 
3049
3094
    if server_settings["restore"]:
 
3051
3096
            with open(stored_state_path, "rb") as stored_state:
 
3052
 
                if sys.version_info.major == 2:                
 
 
3097
                if sys.version_info.major == 2:
 
3053
3098
                    clients_data, old_client_settings = pickle.load(
 
3056
3101
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
 
                    ### Fix bytes to strings
 
 
3102
                        pickle.load(stored_state, encoding="bytes"))
 
 
3103
                    #   Fix bytes to strings
 
3061
 
                    clients_data = { (key.decode("utf-8")
 
3062
 
                                      if isinstance(key, bytes)
 
3065
 
                                     bytes_clients_data.items() }
 
 
3106
                    clients_data = {(key.decode("utf-8")
 
 
3107
                                     if isinstance(key, bytes)
 
 
3110
                                    bytes_clients_data.items()}
 
3066
3111
                    del bytes_clients_data
 
3067
3112
                    for key in clients_data:
 
3068
 
                        value = { (k.decode("utf-8")
 
3069
 
                                   if isinstance(k, bytes) else k): v
 
3071
 
                                  clients_data[key].items() }
 
 
3113
                        value = {(k.decode("utf-8")
 
 
3114
                                  if isinstance(k, bytes) else k): v
 
 
3116
                                 clients_data[key].items()}
 
3072
3117
                        clients_data[key] = value
 
3073
3118
                        # .client_structure
 
3074
3119
                        value["client_structure"] = [
 
3075
3120
                            (s.decode("utf-8")
 
3076
3121
                             if isinstance(s, bytes)
 
3077
3122
                             else s) for s in
 
3078
 
                            value["client_structure"] ]
 
 
3123
                            value["client_structure"]]
 
3079
3124
                        # .name & .host
 
3080
3125
                        for k in ("name", "host"):
 
3081
3126
                            if isinstance(value[k], bytes):
 
3082
3127
                                value[k] = value[k].decode("utf-8")
 
3083
 
                    ## old_client_settings
 
 
3128
                    #  old_client_settings
 
3085
3130
                    old_client_settings = {
 
3086
3131
                        (key.decode("utf-8")
 
3087
3132
                         if isinstance(key, bytes)
 
3088
3133
                         else key): value
 
3089
3134
                        for key, value in
 
3090
 
                        bytes_old_client_settings.items() }
 
 
3135
                        bytes_old_client_settings.items()}
 
3091
3136
                    del bytes_old_client_settings
 
3093
3138
                    for value in old_client_settings.values():
 
 
3199
3244
                             pidfilename, pid)
 
3201
3246
        del pidfilename
 
3203
3248
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3204
3249
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3205
3250
                             lambda: main_loop.quit() and False)
 
3209
3254
        @alternate_dbus_interfaces(
 
3210
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
 
3255
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3211
3256
        class MandosDBusService(DBusObjectWithObjectManager):
 
3212
3257
            """A D-Bus proxy object"""
 
3214
3259
            def __init__(self):
 
3215
3260
                dbus.service.Object.__init__(self, bus, "/")
 
3217
3262
            _interface = "se.recompile.Mandos"
 
3219
3264
            @dbus.service.signal(_interface, signature="o")
 
3220
3265
            def ClientAdded(self, objpath):
 
3224
3269
            @dbus.service.signal(_interface, signature="ss")
 
3225
3270
            def ClientNotFound(self, fingerprint, address):
 
3229
3274
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3231
3276
            @dbus.service.signal(_interface, signature="os")
 
3232
3277
            def ClientRemoved(self, objpath, name):
 
3236
3281
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3238
3283
            @dbus.service.method(_interface, out_signature="ao")
 
 
3266
3311
                        self.client_removed_signal(c)
 
3268
3313
                raise KeyError(object_path)
 
3272
3317
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3273
 
                                 out_signature = "a{oa{sa{sv}}}")
 
 
3318
                                 out_signature="a{oa{sa{sv}}}")
 
3274
3319
            def GetManagedObjects(self):
 
3275
3320
                """D-Bus method"""
 
3276
3321
                return dbus.Dictionary(
 
3277
 
                    { client.dbus_object_path:
 
3279
 
                          { interface: client.GetAll(interface)
 
3281
 
                                 client._get_all_interface_names()})
 
3282
 
                      for client in tcp_server.clients.values()})
 
 
3322
                    {client.dbus_object_path:
 
 
3324
                         {interface: client.GetAll(interface)
 
 
3326
                          client._get_all_interface_names()})
 
 
3327
                     for client in tcp_server.clients.values()})
 
3284
3329
            def client_added_signal(self, client):
 
3285
3330
                """Send the new standard signal and the old signal"""
 
 
3327
3377
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3329
3379
                client_dict = {}
 
3331
3381
                # A list of attributes that can not be pickled
 
3333
 
                exclude = { "bus", "changedstate", "secret",
 
3334
 
                            "checker", "server_settings" }
 
 
3383
                exclude = {"bus", "changedstate", "secret",
 
 
3384
                           "checker", "server_settings"}
 
3335
3385
                for name, typ in inspect.getmembers(dbus.service
 
3337
3387
                    exclude.add(name)
 
3339
3389
                client_dict["encrypted_secret"] = (client
 
3340
3390
                                                   .encrypted_secret)
 
3341
3391
                for attr in client.client_structure:
 
3342
3392
                    if attr not in exclude:
 
3343
3393
                        client_dict[attr] = getattr(client, attr)
 
3345
3395
                clients[client.name] = client_dict
 
3346
3396
                del client_settings[client.name]["secret"]
 
3349
3399
            with tempfile.NamedTemporaryFile(