238
202
    def decrypt(self, data, password):
 
239
203
        passphrase = self.password_encode(password)
 
240
 
        with tempfile.NamedTemporaryFile(
 
241
 
                dir = self.tempdir) as passfile:
 
 
204
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
242
206
            passfile.write(passphrase)
 
244
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
208
            proc = subprocess.Popen(['gpg', '--decrypt',
 
245
209
                                     '--passphrase-file',
 
247
211
                                    + self.gnupgargs,
 
248
212
                                    stdin = subprocess.PIPE,
 
249
213
                                    stdout = subprocess.PIPE,
 
250
214
                                    stderr = subprocess.PIPE)
 
251
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
 
215
            decrypted_plaintext, err = proc.communicate(input
 
252
217
        if proc.returncode != 0:
 
253
218
            raise PGPError(err)
 
254
219
        return decrypted_plaintext
 
256
 
# 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
 
264
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
265
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
266
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
267
 
    DBUS_PATH_SERVER = "/"
 
268
 
    def string_array_to_txt_array(self, t):
 
269
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
270
 
                           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
 
281
222
class AvahiError(Exception):
 
282
223
    def __init__(self, value, *args, **kwargs):
 
 
466
383
                                    follow_name_owner_changes=True),
 
467
384
                avahi.DBUS_INTERFACE_SERVER)
 
468
385
        self.server.connect_to_signal("StateChanged",
 
469
 
                                      self.server_state_changed)
 
 
386
                                 self.server_state_changed)
 
470
387
        self.server_state_changed(self.server.GetState())
 
473
390
class AvahiServiceToSyslog(AvahiService):
 
474
 
    def rename(self, *args, **kwargs):
 
475
392
        """Add the new name to the syslog messages"""
 
476
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
477
 
        syslogger.setFormatter(logging.Formatter(
 
478
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
393
        ret = AvahiService.rename(self)
 
 
394
        syslogger.setFormatter(logging.Formatter
 
 
395
                               ('Mandos ({}) [%(process)d]:'
 
 
396
                                ' %(levelname)s: %(message)s'
 
482
 
# 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))
 
498
 
    # Unless otherwise indicated, the constants and types below are
 
499
 
    # all from the gnutls/gnutls.h C header file.
 
509
 
    E_NO_CERTIFICATE_FOUND = -49
 
510
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
513
 
    class session_int(ctypes.Structure):
 
515
 
    session_t = ctypes.POINTER(session_int)
 
516
 
    class certificate_credentials_st(ctypes.Structure):
 
518
 
    certificate_credentials_t = ctypes.POINTER(
 
519
 
        certificate_credentials_st)
 
520
 
    certificate_type_t = ctypes.c_int
 
521
 
    class datum_t(ctypes.Structure):
 
522
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
523
 
                    ('size', ctypes.c_uint)]
 
524
 
    class openpgp_crt_int(ctypes.Structure):
 
526
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
528
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
529
 
    credentials_type_t = ctypes.c_int
 
530
 
    transport_ptr_t = ctypes.c_void_p
 
531
 
    close_request_t = ctypes.c_int
 
534
 
    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=()):
 
540
 
            # Default usage is by a message string, but if a return
 
541
 
            # code is passed, convert it to a string with
 
544
 
            if message is None and code is not None:
 
545
 
                message = GnuTLS.strerror(code)
 
546
 
            return super(GnuTLS.Error, self).__init__(
 
549
 
    class CertificateSecurityError(Error):
 
553
 
    class Credentials(object):
 
555
 
            self._c_object = gnutls.certificate_credentials_t()
 
556
 
            gnutls.certificate_allocate_credentials(
 
557
 
                ctypes.byref(self._c_object))
 
558
 
            self.type = gnutls.CRD_CERTIFICATE
 
561
 
            gnutls.certificate_free_credentials(self._c_object)
 
563
 
    class ClientSession(object):
 
564
 
        def __init__(self, socket, credentials = None):
 
565
 
            self._c_object = gnutls.session_t()
 
566
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
567
 
            gnutls.set_default_priority(self._c_object)
 
568
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
569
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
572
 
            if credentials is None:
 
573
 
                credentials = gnutls.Credentials()
 
574
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
575
 
                                   ctypes.cast(credentials._c_object,
 
577
 
            self.credentials = credentials
 
580
 
            gnutls.deinit(self._c_object)
 
583
 
            return gnutls.handshake(self._c_object)
 
585
 
        def send(self, data):
 
589
 
                data_len -= gnutls.record_send(self._c_object,
 
594
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
596
 
    # Error handling functions
 
597
 
    def _error_code(result):
 
598
 
        """A function to raise exceptions on errors, suitable
 
599
 
        for the 'restype' attribute on ctypes functions"""
 
602
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
603
 
            raise gnutls.CertificateSecurityError(code = result)
 
604
 
        raise gnutls.Error(code = result)
 
606
 
    def _retry_on_error(result, func, arguments):
 
607
 
        """A function to retry on some errors, suitable
 
608
 
        for the 'errcheck' attribute on ctypes functions"""
 
610
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
611
 
                return _error_code(result)
 
612
 
            result = func(*arguments)
 
615
 
    # Unless otherwise indicated, the function declarations below are
 
616
 
    # all from the gnutls/gnutls.h C header file.
 
619
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
 
    priority_set_direct.restype = _error_code
 
624
 
    init = _library.gnutls_init
 
625
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
 
    init.restype = _error_code
 
628
 
    set_default_priority = _library.gnutls_set_default_priority
 
629
 
    set_default_priority.argtypes = [session_t]
 
630
 
    set_default_priority.restype = _error_code
 
632
 
    record_send = _library.gnutls_record_send
 
633
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
635
 
    record_send.restype = ctypes.c_ssize_t
 
636
 
    record_send.errcheck = _retry_on_error
 
638
 
    certificate_allocate_credentials = (
 
639
 
        _library.gnutls_certificate_allocate_credentials)
 
640
 
    certificate_allocate_credentials.argtypes = [
 
641
 
        ctypes.POINTER(certificate_credentials_t)]
 
642
 
    certificate_allocate_credentials.restype = _error_code
 
644
 
    certificate_free_credentials = (
 
645
 
        _library.gnutls_certificate_free_credentials)
 
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
647
 
    certificate_free_credentials.restype = None
 
649
 
    handshake_set_private_extensions = (
 
650
 
        _library.gnutls_handshake_set_private_extensions)
 
651
 
    handshake_set_private_extensions.argtypes = [session_t,
 
653
 
    handshake_set_private_extensions.restype = None
 
655
 
    credentials_set = _library.gnutls_credentials_set
 
656
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
658
 
    credentials_set.restype = _error_code
 
660
 
    strerror = _library.gnutls_strerror
 
661
 
    strerror.argtypes = [ctypes.c_int]
 
662
 
    strerror.restype = ctypes.c_char_p
 
664
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
 
    certificate_type_get.argtypes = [session_t]
 
666
 
    certificate_type_get.restype = _error_code
 
668
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
 
    certificate_get_peers.argtypes = [session_t,
 
670
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
673
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
 
    global_set_log_level.restype = None
 
677
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
 
    global_set_log_function.argtypes = [log_func]
 
679
 
    global_set_log_function.restype = None
 
681
 
    deinit = _library.gnutls_deinit
 
682
 
    deinit.argtypes = [session_t]
 
683
 
    deinit.restype = None
 
685
 
    handshake = _library.gnutls_handshake
 
686
 
    handshake.argtypes = [session_t]
 
687
 
    handshake.restype = _error_code
 
688
 
    handshake.errcheck = _retry_on_error
 
690
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
 
    transport_set_ptr.restype = None
 
694
 
    bye = _library.gnutls_bye
 
695
 
    bye.argtypes = [session_t, close_request_t]
 
696
 
    bye.restype = _error_code
 
697
 
    bye.errcheck = _retry_on_error
 
699
 
    check_version = _library.gnutls_check_version
 
700
 
    check_version.argtypes = [ctypes.c_char_p]
 
701
 
    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
 
732
 
    # Remove non-public functions
 
733
 
    del _error_code, _retry_on_error
 
734
 
# Create the global "gnutls" object, simulating a module
 
737
 
def call_pipe(connection,       # : multiprocessing.Connection
 
738
 
              func, *args, **kwargs):
 
739
 
    """This function is meant to be called by multiprocessing.Process
 
741
 
    This function runs func(*args, **kwargs), and writes the resulting
 
742
 
    return value on the provided multiprocessing.Connection.
 
744
 
    connection.send(func(*args, **kwargs))
 
747
401
class Client(object):
 
748
402
    """A representation of a client host served by this server.
 
 
946
598
        # Schedule a new checker to be started an 'interval' from now,
 
947
599
        # and every interval from then on.
 
948
600
        if self.checker_initiator_tag is not None:
 
949
 
            GLib.source_remove(self.checker_initiator_tag)
 
950
 
        self.checker_initiator_tag = GLib.timeout_add(
 
951
 
            int(self.interval.total_seconds() * 1000),
 
 
601
            gobject.source_remove(self.checker_initiator_tag)
 
 
602
        self.checker_initiator_tag = (gobject.timeout_add
 
 
604
                                           .total_seconds() * 1000),
 
953
606
        # Schedule a disable() when 'timeout' has passed
 
954
607
        if self.disable_initiator_tag is not None:
 
955
 
            GLib.source_remove(self.disable_initiator_tag)
 
956
 
        self.disable_initiator_tag = GLib.timeout_add(
 
957
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
608
            gobject.source_remove(self.disable_initiator_tag)
 
 
609
        self.disable_initiator_tag = (gobject.timeout_add
 
 
611
                                           .total_seconds() * 1000),
 
958
613
        # Also start a new checker *right now*.
 
959
614
        self.start_checker()
 
961
 
    def checker_callback(self, source, condition, connection,
 
 
616
    def checker_callback(self, pid, condition, command):
 
963
617
        """The checker has completed, so take appropriate actions."""
 
964
618
        self.checker_callback_tag = None
 
965
619
        self.checker = None
 
966
 
        # Read return code from connection (see call_pipe)
 
967
 
        returncode = connection.recv()
 
971
 
            self.last_checker_status = returncode
 
972
 
            self.last_checker_signal = None
 
 
620
        if os.WIFEXITED(condition):
 
 
621
            self.last_checker_status = os.WEXITSTATUS(condition)
 
973
622
            if self.last_checker_status == 0:
 
974
623
                logger.info("Checker for %(name)s succeeded",
 
976
625
                self.checked_ok()
 
978
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
627
                logger.info("Checker for %(name)s failed",
 
980
630
            self.last_checker_status = -1
 
981
 
            self.last_checker_signal = -returncode
 
982
631
            logger.warning("Checker for %(name)s crashed?",
 
986
634
    def checked_ok(self):
 
987
635
        """Assert that the client has been seen, alive and well."""
 
988
636
        self.last_checked_ok = datetime.datetime.utcnow()
 
989
637
        self.last_checker_status = 0
 
990
 
        self.last_checker_signal = None
 
991
638
        self.bump_timeout()
 
993
640
    def bump_timeout(self, timeout=None):
 
 
1019
667
        # than 'timeout' for the client to be disabled, which is as it
 
1022
 
        if self.checker is not None and not self.checker.is_alive():
 
1023
 
            logger.warning("Checker was not alive; joining")
 
 
670
        # If a checker exists, make sure it is not a zombie
 
 
672
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
673
        except AttributeError:
 
 
675
        except OSError as error:
 
 
676
            if error.errno != errno.ECHILD:
 
 
680
                logger.warning("Checker was a zombie")
 
 
681
                gobject.source_remove(self.checker_callback_tag)
 
 
682
                self.checker_callback(pid, status,
 
 
683
                                      self.current_checker_command)
 
1026
684
        # Start a new checker if needed
 
1027
685
        if self.checker is None:
 
1028
686
            # Escape attributes for the shell
 
1030
 
                attr: re.escape(str(getattr(self, attr)))
 
1031
 
                for attr in self.runtime_expansions }
 
 
687
            escaped_attrs = { attr:
 
 
688
                                  re.escape(unicode(getattr(self,
 
 
690
                              for attr in self.runtime_expansions }
 
1033
692
                command = self.checker_command % escaped_attrs
 
1034
693
            except TypeError as error:
 
1035
694
                logger.error('Could not format string "%s"',
 
1036
 
                             self.checker_command,
 
 
695
                             self.checker_command, exc_info=error)
 
 
696
                return True # Try again later
 
 
697
            self.current_checker_command = command
 
 
699
                logger.info("Starting checker %r for %s",
 
 
701
                # We don't need to redirect stdout and stderr, since
 
 
702
                # in normal mode, that is already done by daemon(),
 
 
703
                # and in debug mode we don't want to.  (Stdin is
 
 
704
                # always replaced by /dev/null.)
 
 
705
                # The exception is when not debugging but nevertheless
 
 
706
                # running in the foreground; use the previously
 
 
709
                if (not self.server_settings["debug"]
 
 
710
                    and self.server_settings["foreground"]):
 
 
711
                    popen_args.update({"stdout": wnull,
 
 
713
                self.checker = subprocess.Popen(command,
 
 
717
            except OSError as error:
 
 
718
                logger.error("Failed to start subprocess",
 
1038
 
                return True     # Try again later
 
1039
 
            self.current_checker_command = command
 
1040
 
            logger.info("Starting checker %r for %s", command,
 
1042
 
            # We don't need to redirect stdout and stderr, since
 
1043
 
            # in normal mode, that is already done by daemon(),
 
1044
 
            # and in debug mode we don't want to.  (Stdin is
 
1045
 
            # always replaced by /dev/null.)
 
1046
 
            # The exception is when not debugging but nevertheless
 
1047
 
            # running in the foreground; use the previously
 
1049
 
            popen_args = { "close_fds": True,
 
1052
 
            if (not self.server_settings["debug"]
 
1053
 
                and self.server_settings["foreground"]):
 
1054
 
                popen_args.update({"stdout": wnull,
 
1056
 
            pipe = multiprocessing.Pipe(duplex = False)
 
1057
 
            self.checker = multiprocessing.Process(
 
1059
 
                args = (pipe[1], subprocess.call, command),
 
1060
 
                kwargs = popen_args)
 
1061
 
            self.checker.start()
 
1062
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1063
 
                pipe[0].fileno(), GLib.IO_IN,
 
1064
 
                self.checker_callback, pipe[0], command)
 
1065
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
721
            self.checker_callback_tag = (gobject.child_watch_add
 
 
723
                                          self.checker_callback,
 
 
725
            # The checker may have completed before the gobject
 
 
726
            # watch was added.  Check for this.
 
 
728
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
729
            except OSError as error:
 
 
730
                if error.errno == errno.ECHILD:
 
 
731
                    # This should never happen
 
 
732
                    logger.error("Child process vanished",
 
 
737
                gobject.source_remove(self.checker_callback_tag)
 
 
738
                self.checker_callback(pid, status, command)
 
 
739
        # Re-run this periodically if run by gobject.timeout_add
 
1068
742
    def stop_checker(self):
 
1069
743
        """Force the checker process, if any, to stop."""
 
1070
744
        if self.checker_callback_tag:
 
1071
 
            GLib.source_remove(self.checker_callback_tag)
 
 
745
            gobject.source_remove(self.checker_callback_tag)
 
1072
746
            self.checker_callback_tag = None
 
1073
747
        if getattr(self, "checker", None) is None:
 
1075
749
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1076
 
        self.checker.terminate()
 
 
751
            self.checker.terminate()
 
 
753
            #if self.checker.poll() is None:
 
 
754
            #    self.checker.kill()
 
 
755
        except OSError as error:
 
 
756
            if error.errno != errno.ESRCH: # No such process
 
1077
758
        self.checker = None
 
1080
 
def dbus_service_property(dbus_interface,
 
 
761
def dbus_service_property(dbus_interface, signature="v",
 
 
762
                          access="readwrite", byte_arrays=False):
 
1084
763
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1085
764
    become properties on the D-Bus.
 
 
1192
863
    def _get_all_dbus_things(self, thing):
 
1193
864
        """Returns a generator of (name, attribute) pairs
 
1195
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
866
        return ((getattr(athing.__get__(self), "_dbus_name",
 
1196
868
                 athing.__get__(self))
 
1197
869
                for cls in self.__class__.__mro__
 
1198
870
                for name, athing in
 
1199
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1201
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1202
 
                         out_signature = "s",
 
1203
 
                         path_keyword = 'object_path',
 
1204
 
                         connection_keyword = 'connection')
 
1205
 
    def Introspect(self, object_path, connection):
 
1206
 
        """Overloading of standard D-Bus method.
 
1208
 
        Inserts annotation tags on methods and signals.
 
1210
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1213
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1215
 
            for if_tag in document.getElementsByTagName("interface"):
 
1216
 
                # Add annotation tags
 
1217
 
                for typ in ("method", "signal"):
 
1218
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1220
 
                        for name, prop in (self.
 
1221
 
                                           _get_all_dbus_things(typ)):
 
1222
 
                            if (name == tag.getAttribute("name")
 
1223
 
                                and prop._dbus_interface
 
1224
 
                                == if_tag.getAttribute("name")):
 
1225
 
                                annots.update(getattr(
 
1226
 
                                    prop, "_dbus_annotations", {}))
 
1227
 
                        for name, value in annots.items():
 
1228
 
                            ann_tag = document.createElement(
 
1230
 
                            ann_tag.setAttribute("name", name)
 
1231
 
                            ann_tag.setAttribute("value", value)
 
1232
 
                            tag.appendChild(ann_tag)
 
1233
 
                # Add interface annotation tags
 
1234
 
                for annotation, value in dict(
 
1235
 
                    itertools.chain.from_iterable(
 
1236
 
                        annotations().items()
 
1237
 
                        for name, annotations
 
1238
 
                        in self._get_all_dbus_things("interface")
 
1239
 
                        if name == if_tag.getAttribute("name")
 
1241
 
                    ann_tag = document.createElement("annotation")
 
1242
 
                    ann_tag.setAttribute("name", annotation)
 
1243
 
                    ann_tag.setAttribute("value", value)
 
1244
 
                    if_tag.appendChild(ann_tag)
 
1245
 
                # Fix argument name for the Introspect method itself
 
1246
 
                if (if_tag.getAttribute("name")
 
1247
 
                                == dbus.INTROSPECTABLE_IFACE):
 
1248
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1249
 
                        if cn.getAttribute("name") == "Introspect":
 
1250
 
                            for arg in cn.getElementsByTagName("arg"):
 
1251
 
                                if (arg.getAttribute("direction")
 
1253
 
                                    arg.setAttribute("name",
 
1255
 
            xmlstring = document.toxml("utf-8")
 
1257
 
        except (AttributeError, xml.dom.DOMException,
 
1258
 
                xml.parsers.expat.ExpatError) as error:
 
1259
 
            logger.error("Failed to override Introspection method",
 
1264
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1265
 
    """A D-Bus object with properties.
 
1267
 
    Classes inheriting from this can use the dbus_service_property
 
1268
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
1269
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
871
                inspect.getmembers(cls,
 
 
872
                                   self._is_dbus_thing(thing)))
 
1272
874
    def _get_dbus_property(self, interface_name, property_name):
 
1273
875
        """Returns a bound method if one exists which is a D-Bus
 
1274
876
        property with the specified name and interface.
 
1276
 
        for cls in self.__class__.__mro__:
 
1277
 
            for name, value in inspect.getmembers(
 
1278
 
                    cls, self._is_dbus_thing("property")):
 
 
878
        for cls in  self.__class__.__mro__:
 
 
879
            for name, value in (inspect.getmembers
 
 
881
                                 self._is_dbus_thing("property"))):
 
1279
882
                if (value._dbus_name == property_name
 
1280
883
                    and value._dbus_interface == interface_name):
 
1281
884
                    return value.__get__(self)
 
1283
886
        # No such property
 
1284
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1285
 
            self.dbus_object_path, interface_name, property_name))
 
1288
 
    def _get_all_interface_names(cls):
 
1289
 
        """Get a sequence of all interfaces supported by an object"""
 
1290
 
        return (name for name in set(getattr(getattr(x, attr),
 
1291
 
                                             "_dbus_interface", None)
 
1292
 
                                     for x in (inspect.getmro(cls))
 
1294
 
                if name is not None)
 
1296
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
887
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
888
                                   + interface_name + "."
 
 
891
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1298
892
                         out_signature="v")
 
1299
893
    def Get(self, interface_name, property_name):
 
1300
894
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1428
1025
                         exc_info=error)
 
1429
1026
        return xmlstring
 
1432
 
    dbus.OBJECT_MANAGER_IFACE
 
1433
 
except AttributeError:
 
1434
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1436
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
 
    """A D-Bus object with an ObjectManager.
 
1439
 
    Classes inheriting from this exposes the standard
 
1440
 
    GetManagedObjects call and the InterfacesAdded and
 
1441
 
    InterfacesRemoved signals on the standard
 
1442
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1444
 
    Note: No signals are sent automatically; they must be sent
 
1447
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
 
                         out_signature = "a{oa{sa{sv}}}")
 
1449
 
    def GetManagedObjects(self):
 
1450
 
        """This function must be overridden"""
 
1451
 
        raise NotImplementedError()
 
1453
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
 
                         signature = "oa{sa{sv}}")
 
1455
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1458
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
1459
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1462
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
 
                         out_signature = "s",
 
1464
 
                         path_keyword = 'object_path',
 
1465
 
                         connection_keyword = 'connection')
 
1466
 
    def Introspect(self, object_path, connection):
 
1467
 
        """Overloading of standard D-Bus method.
 
1469
 
        Override return argument name of GetManagedObjects to be
 
1470
 
        "objpath_interfaces_and_properties"
 
1472
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1476
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1478
 
            for if_tag in document.getElementsByTagName("interface"):
 
1479
 
                # Fix argument name for the GetManagedObjects method
 
1480
 
                if (if_tag.getAttribute("name")
 
1481
 
                                == dbus.OBJECT_MANAGER_IFACE):
 
1482
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1483
 
                        if (cn.getAttribute("name")
 
1484
 
                            == "GetManagedObjects"):
 
1485
 
                            for arg in cn.getElementsByTagName("arg"):
 
1486
 
                                if (arg.getAttribute("direction")
 
1490
 
                                        "objpath_interfaces"
 
1492
 
            xmlstring = document.toxml("utf-8")
 
1494
 
        except (AttributeError, xml.dom.DOMException,
 
1495
 
                xml.parsers.expat.ExpatError) as error:
 
1496
 
            logger.error("Failed to override Introspection method",
 
1500
1029
def datetime_to_dbus(dt, variant_level=0):
 
1501
1030
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1503
1032
        return dbus.String("", variant_level = variant_level)
 
1504
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1033
    return dbus.String(dt.isoformat(),
 
 
1034
                       variant_level=variant_level)
 
1507
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1538
1067
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1539
1068
                # with the wrong interface name
 
1540
1069
                if (not hasattr(attribute, "_dbus_interface")
 
1541
 
                    or not attribute._dbus_interface.startswith(
 
1542
 
                        orig_interface_name)):
 
 
1070
                    or not attribute._dbus_interface
 
 
1071
                    .startswith(orig_interface_name)):
 
1544
1073
                # Create an alternate D-Bus interface name based on
 
1545
1074
                # the current name
 
1546
 
                alt_interface = attribute._dbus_interface.replace(
 
1547
 
                    orig_interface_name, alt_interface_name)
 
 
1075
                alt_interface = (attribute._dbus_interface
 
 
1076
                                 .replace(orig_interface_name,
 
 
1077
                                          alt_interface_name))
 
1548
1078
                interface_names.add(alt_interface)
 
1549
1079
                # Is this a D-Bus signal?
 
1550
1080
                if getattr(attribute, "_dbus_is_signal", False):
 
1551
1081
                    # Extract the original non-method undecorated
 
1552
1082
                    # function by black magic
 
1553
 
                    if sys.version_info.major == 2:
 
1554
 
                        nonmethod_func = (dict(
 
 
1083
                    nonmethod_func = (dict(
 
1555
1084
                            zip(attribute.func_code.co_freevars,
 
1556
 
                                attribute.__closure__))
 
1557
 
                                          ["func"].cell_contents)
 
1559
 
                        nonmethod_func = (dict(
 
1560
 
                            zip(attribute.__code__.co_freevars,
 
1561
 
                                attribute.__closure__))
 
1562
 
                                          ["func"].cell_contents)
 
 
1085
                                attribute.__closure__))["func"]
 
1563
1087
                    # Create a new, but exactly alike, function
 
1564
1088
                    # object, and decorate it to be a new D-Bus signal
 
1565
1089
                    # with the alternate D-Bus interface name
 
1566
 
                    new_function = copy_function(nonmethod_func)
 
1567
 
                    new_function = (dbus.service.signal(
 
1569
 
                        attribute._dbus_signature)(new_function))
 
 
1090
                    new_function = (dbus.service.signal
 
 
1092
                                     attribute._dbus_signature)
 
 
1093
                                    (types.FunctionType(
 
 
1094
                                nonmethod_func.func_code,
 
 
1095
                                nonmethod_func.func_globals,
 
 
1096
                                nonmethod_func.func_name,
 
 
1097
                                nonmethod_func.func_defaults,
 
 
1098
                                nonmethod_func.func_closure)))
 
1570
1099
                    # Copy annotations, if any
 
1572
 
                        new_function._dbus_annotations = dict(
 
1573
 
                            attribute._dbus_annotations)
 
 
1101
                        new_function._dbus_annotations = (
 
 
1102
                            dict(attribute._dbus_annotations))
 
1574
1103
                    except AttributeError:
 
1576
1105
                    # Define a creator of a function to call both the
 
 
2310
1821
    def fingerprint(openpgp):
 
2311
1822
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2312
1823
        # New GnuTLS "datum" with the OpenPGP public key
 
2313
 
        datum = gnutls.datum_t(
 
2314
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2315
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2316
 
            ctypes.c_uint(len(openpgp)))
 
 
1824
        datum = (gnutls.library.types
 
 
1825
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1828
                                 ctypes.c_uint(len(openpgp))))
 
2317
1829
        # New empty GnuTLS certificate
 
2318
 
        crt = gnutls.openpgp_crt_t()
 
2319
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1830
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1831
        (gnutls.library.functions
 
 
1832
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2320
1833
        # Import the OpenPGP public key into the certificate
 
2321
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2322
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1834
        (gnutls.library.functions
 
 
1835
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1836
                                    gnutls.library.constants
 
 
1837
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2323
1838
        # Verify the self signature in the key
 
2324
1839
        crtverify = ctypes.c_uint()
 
2325
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2326
 
                                       ctypes.byref(crtverify))
 
 
1840
        (gnutls.library.functions
 
 
1841
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1842
                                         ctypes.byref(crtverify)))
 
2327
1843
        if crtverify.value != 0:
 
2328
 
            gnutls.openpgp_crt_deinit(crt)
 
2329
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
 
1844
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1845
            raise (gnutls.errors.CertificateSecurityError
 
2330
1847
        # New buffer for the fingerprint
 
2331
1848
        buf = ctypes.create_string_buffer(20)
 
2332
1849
        buf_len = ctypes.c_size_t()
 
2333
1850
        # Get the fingerprint from the certificate into the buffer
 
2334
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2335
 
                                           ctypes.byref(buf_len))
 
 
1851
        (gnutls.library.functions
 
 
1852
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1853
                                             ctypes.byref(buf_len)))
 
2336
1854
        # Deinit the certificate
 
2337
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1855
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2338
1856
        # Convert the buffer to a Python bytestring
 
2339
1857
        fpr = ctypes.string_at(buf, buf_len.value)
 
2340
1858
        # Convert the bytestring to hexadecimal notation
 
 
2992
2500
        # Close all input and output, do double fork, etc.
 
2995
 
    # multiprocessing will use threads, so before we use GLib we need
 
2996
 
    # to inform GLib that threads will be used.
 
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
 
2504
    # need to inform gobject that threads will be used.
 
 
2505
    gobject.threads_init()
 
2999
2507
    global main_loop
 
3000
2508
    # From the Avahi example code
 
3001
2509
    DBusGMainLoop(set_as_default=True)
 
3002
 
    main_loop = GLib.MainLoop()
 
 
2510
    main_loop = gobject.MainLoop()
 
3003
2511
    bus = dbus.SystemBus()
 
3004
2512
    # End of Avahi example code
 
3007
2515
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3010
 
            old_bus_name = dbus.service.BusName(
 
3011
 
                "se.bsnet.fukt.Mandos", bus,
 
3013
 
        except dbus.exceptions.DBusException as e:
 
 
2516
                                            bus, do_not_queue=True)
 
 
2517
            old_bus_name = (dbus.service.BusName
 
 
2518
                            ("se.bsnet.fukt.Mandos", bus,
 
 
2520
        except dbus.exceptions.NameExistsException as e:
 
3014
2521
            logger.error("Disabling D-Bus:", exc_info=e)
 
3015
2522
            use_dbus = False
 
3016
2523
            server_settings["use_dbus"] = False
 
3017
2524
            tcp_server.use_dbus = False
 
3019
2526
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3020
 
        service = AvahiServiceToSyslog(
 
3021
 
            name = server_settings["servicename"],
 
3022
 
            servicetype = "_mandos._tcp",
 
3023
 
            protocol = protocol,
 
 
2527
        service = AvahiServiceToSyslog(name =
 
 
2528
                                       server_settings["servicename"],
 
 
2529
                                       servicetype = "_mandos._tcp",
 
 
2530
                                       protocol = protocol, bus = bus)
 
3025
2531
        if server_settings["interface"]:
 
3026
 
            service.interface = if_nametoindex(
 
3027
 
                server_settings["interface"].encode("utf-8"))
 
 
2532
            service.interface = (if_nametoindex
 
 
2533
                                 (server_settings["interface"]
 
3029
2536
    global multiprocessing_manager
 
3030
2537
    multiprocessing_manager = multiprocessing.Manager()
 
 
3049
2556
    if server_settings["restore"]:
 
3051
2558
            with open(stored_state_path, "rb") as stored_state:
 
3052
 
                if sys.version_info.major == 2:                
 
3053
 
                    clients_data, old_client_settings = pickle.load(
 
3056
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
 
                    ### Fix bytes to strings
 
3061
 
                    clients_data = { (key.decode("utf-8")
 
3062
 
                                      if isinstance(key, bytes)
 
3065
 
                                     bytes_clients_data.items() }
 
3066
 
                    del bytes_clients_data
 
3067
 
                    for key in clients_data:
 
3068
 
                        value = { (k.decode("utf-8")
 
3069
 
                                   if isinstance(k, bytes) else k): v
 
3071
 
                                  clients_data[key].items() }
 
3072
 
                        clients_data[key] = value
 
3074
 
                        value["client_structure"] = [
 
3076
 
                             if isinstance(s, bytes)
 
3078
 
                            value["client_structure"] ]
 
3080
 
                        for k in ("name", "host"):
 
3081
 
                            if isinstance(value[k], bytes):
 
3082
 
                                value[k] = value[k].decode("utf-8")
 
3083
 
                    ## old_client_settings
 
3085
 
                    old_client_settings = {
 
3086
 
                        (key.decode("utf-8")
 
3087
 
                         if isinstance(key, bytes)
 
3090
 
                        bytes_old_client_settings.items() }
 
3091
 
                    del bytes_old_client_settings
 
3093
 
                    for value in old_client_settings.values():
 
3094
 
                        if isinstance(value["host"], bytes):
 
3095
 
                            value["host"] = (value["host"]
 
 
2559
                clients_data, old_client_settings = (pickle.load
 
3097
2561
            os.remove(stored_state_path)
 
3098
2562
        except IOError as e:
 
3099
2563
            if e.errno == errno.ENOENT:
 
3100
 
                logger.warning("Could not load persistent state:"
 
3101
 
                               " {}".format(os.strerror(e.errno)))
 
 
2564
                logger.warning("Could not load persistent state: {}"
 
 
2565
                                .format(os.strerror(e.errno)))
 
3103
2567
                logger.critical("Could not load persistent state:",
 
3106
2570
        except EOFError as e:
 
3107
2571
            logger.warning("Could not load persistent state: "
 
 
2572
                           "EOFError:", exc_info=e)
 
3111
2574
    with PGPEngine() as pgp:
 
3112
2575
        for client_name, client in clients_data.items():
 
 
3229
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3231
2693
            @dbus.service.signal(_interface, signature="os")
 
3232
2694
            def ClientRemoved(self, objpath, name):
 
3236
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3238
2698
            @dbus.service.method(_interface, out_signature="ao")
 
3239
2699
            def GetAllClients(self):
 
3241
 
                return dbus.Array(c.dbus_object_path for c in
 
3242
 
                                  tcp_server.clients.values())
 
 
2701
                return dbus.Array(c.dbus_object_path
 
 
2703
                                  tcp_server.clients.itervalues())
 
3244
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3246
2705
            @dbus.service.method(_interface,
 
3247
2706
                                 out_signature="a{oa{sv}}")
 
3248
2707
            def GetAllClientsWithProperties(self):
 
3250
2709
                return dbus.Dictionary(
 
3251
 
                    { c.dbus_object_path: c.GetAll(
 
3252
 
                        "se.recompile.Mandos.Client")
 
3253
 
                      for c in tcp_server.clients.values() },
 
 
2710
                    ((c.dbus_object_path, c.GetAll(""))
 
 
2711
                     for c in tcp_server.clients.itervalues()),
 
3254
2712
                    signature="oa{sv}")
 
3256
2714
            @dbus.service.method(_interface, in_signature="o")
 
3257
2715
            def RemoveClient(self, object_path):
 
3259
 
                for c in tcp_server.clients.values():
 
 
2717
                for c in tcp_server.clients.itervalues():
 
3260
2718
                    if c.dbus_object_path == object_path:
 
3261
2719
                        del tcp_server.clients[c.name]
 
3262
2720
                        c.remove_from_connection()
 
3263
 
                        # Don't signal the disabling
 
 
2721
                        # Don't signal anything except ClientRemoved
 
3264
2722
                        c.disable(quiet=True)
 
3265
 
                        # Emit D-Bus signal for removal
 
3266
 
                        self.client_removed_signal(c)
 
 
2724
                        self.ClientRemoved(object_path, c.name)
 
3268
2726
                raise KeyError(object_path)
 
3272
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3273
 
                                 out_signature = "a{oa{sa{sv}}}")
 
3274
 
            def GetManagedObjects(self):
 
3276
 
                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()})
 
3284
 
            def client_added_signal(self, client):
 
3285
 
                """Send the new standard signal and the old signal"""
 
3287
 
                    # New standard signal
 
3288
 
                    self.InterfacesAdded(
 
3289
 
                        client.dbus_object_path,
 
3291
 
                            { interface: client.GetAll(interface)
 
3293
 
                              client._get_all_interface_names()}))
 
3295
 
                    self.ClientAdded(client.dbus_object_path)
 
3297
 
            def client_removed_signal(self, client):
 
3298
 
                """Send the new standard signal and the old signal"""
 
3300
 
                    # New standard signal
 
3301
 
                    self.InterfacesRemoved(
 
3302
 
                        client.dbus_object_path,
 
3303
 
                        client._get_all_interface_names())
 
3305
 
                    self.ClientRemoved(client.dbus_object_path,
 
3308
2730
        mandos_dbus_service = MandosDBusService()