419
189
            dbus.UInt16(self.port),
 
420
190
            avahi.string_array_to_txt_array(self.TXT))
 
421
191
        self.group.Commit()
 
423
192
    def entry_group_state_changed(self, state, error):
 
424
193
        """Derived from the Avahi example code"""
 
425
 
        logger.debug("Avahi entry group state change: %i", state)
 
 
194
        logger.debug(u"Avahi state change: %i", state)
 
427
196
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
428
 
            logger.debug("Zeroconf service established.")
 
 
197
            logger.debug(u"Zeroconf service established.")
 
429
198
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
430
 
            logger.info("Zeroconf service name collision.")
 
 
199
            logger.warning(u"Zeroconf service name collision.")
 
432
201
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
433
 
            logger.critical("Avahi: Error in group state changed %s",
 
435
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
 
202
            logger.critical(u"Avahi: Error in group state changed %s",
 
 
204
            raise AvahiGroupError(u"State changed: %s"
 
437
206
    def cleanup(self):
 
438
207
        """Derived from the Avahi example code"""
 
439
208
        if self.group is not None:
 
442
 
            except (dbus.exceptions.UnknownMethodException,
 
443
 
                    dbus.exceptions.DBusException):
 
445
210
            self.group = None
 
448
 
    def server_state_changed(self, state, error=None):
 
 
211
    def server_state_changed(self, state):
 
449
212
        """Derived from the Avahi example code"""
 
450
 
        logger.debug("Avahi server state change: %i", state)
 
452
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
453
 
            avahi.SERVER_REGISTERING: None,
 
454
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
455
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
457
 
        if state in bad_states:
 
458
 
            if bad_states[state] is not None:
 
460
 
                    logger.error(bad_states[state])
 
462
 
                    logger.error(bad_states[state] + ": %r", error)
 
 
213
        if state == avahi.SERVER_COLLISION:
 
 
214
            logger.error(u"Zeroconf server name collision")
 
464
216
        elif state == avahi.SERVER_RUNNING:
 
467
 
            except dbus.exceptions.DBusException as error:
 
468
 
                if (error.get_dbus_name()
 
469
 
                    == "org.freedesktop.Avahi.CollisionError"):
 
470
 
                    logger.info("Local Zeroconf service name"
 
472
 
                    return self.rename(remove=False)
 
474
 
                    logger.critical("D-Bus Exception", exc_info=error)
 
479
 
                logger.debug("Unknown state: %r", state)
 
481
 
                logger.debug("Unknown state: %r: %r", state, error)
 
483
218
    def activate(self):
 
484
219
        """Derived from the Avahi example code"""
 
485
220
        if self.server is None:
 
486
221
            self.server = dbus.Interface(
 
487
222
                self.bus.get_object(avahi.DBUS_NAME,
 
488
 
                                    avahi.DBUS_PATH_SERVER,
 
489
 
                                    follow_name_owner_changes=True),
 
 
223
                                    avahi.DBUS_PATH_SERVER),
 
490
224
                avahi.DBUS_INTERFACE_SERVER)
 
491
 
        self.server.connect_to_signal("StateChanged",
 
492
 
                                      self.server_state_changed)
 
 
225
        self.server.connect_to_signal(u"StateChanged",
 
 
226
                                 self.server_state_changed)
 
493
227
        self.server_state_changed(self.server.GetState())
 
496
 
class AvahiServiceToSyslog(AvahiService):
 
497
 
    def rename(self, *args, **kwargs):
 
498
 
        """Add the new name to the syslog messages"""
 
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
500
 
        syslogger.setFormatter(logging.Formatter(
 
501
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
506
 
# Pretend that we have a GnuTLS module
 
507
 
class GnuTLS(object):
 
508
 
    """This isn't so much a class as it is a module-like namespace.
 
509
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
511
 
    library = ctypes.util.find_library("gnutls")
 
513
 
        library = ctypes.util.find_library("gnutls-deb0")
 
514
 
    _library = ctypes.cdll.LoadLibrary(library)
 
516
 
    _need_version = b"3.3.0"
 
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))
 
525
 
    # Unless otherwise indicated, the constants and types below are
 
526
 
    # all from the gnutls/gnutls.h C header file.
 
536
 
    E_NO_CERTIFICATE_FOUND = -49
 
537
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
540
 
    class session_int(ctypes.Structure):
 
542
 
    session_t = ctypes.POINTER(session_int)
 
544
 
    class certificate_credentials_st(ctypes.Structure):
 
546
 
    certificate_credentials_t = ctypes.POINTER(
 
547
 
        certificate_credentials_st)
 
548
 
    certificate_type_t = ctypes.c_int
 
550
 
    class datum_t(ctypes.Structure):
 
551
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
552
 
                    ('size', ctypes.c_uint)]
 
554
 
    class openpgp_crt_int(ctypes.Structure):
 
556
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
557
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
558
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
559
 
    credentials_type_t = ctypes.c_int
 
560
 
    transport_ptr_t = ctypes.c_void_p
 
561
 
    close_request_t = ctypes.c_int
 
564
 
    class Error(Exception):
 
565
 
        # We need to use the class name "GnuTLS" here, since this
 
566
 
        # exception might be raised from within GnuTLS.__init__,
 
567
 
        # which is called before the assignment to the "gnutls"
 
568
 
        # global variable has happened.
 
569
 
        def __init__(self, message=None, code=None, args=()):
 
570
 
            # Default usage is by a message string, but if a return
 
571
 
            # code is passed, convert it to a string with
 
574
 
            if message is None and code is not None:
 
575
 
                message = GnuTLS.strerror(code)
 
576
 
            return super(GnuTLS.Error, self).__init__(
 
579
 
    class CertificateSecurityError(Error):
 
583
 
    class Credentials(object):
 
585
 
            self._c_object = gnutls.certificate_credentials_t()
 
586
 
            gnutls.certificate_allocate_credentials(
 
587
 
                ctypes.byref(self._c_object))
 
588
 
            self.type = gnutls.CRD_CERTIFICATE
 
591
 
            gnutls.certificate_free_credentials(self._c_object)
 
593
 
    class ClientSession(object):
 
594
 
        def __init__(self, socket, credentials=None):
 
595
 
            self._c_object = gnutls.session_t()
 
596
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
597
 
            gnutls.set_default_priority(self._c_object)
 
598
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
599
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
602
 
            if credentials is None:
 
603
 
                credentials = gnutls.Credentials()
 
604
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
605
 
                                   ctypes.cast(credentials._c_object,
 
607
 
            self.credentials = credentials
 
610
 
            gnutls.deinit(self._c_object)
 
613
 
            return gnutls.handshake(self._c_object)
 
615
 
        def send(self, data):
 
619
 
                data_len -= gnutls.record_send(self._c_object,
 
624
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
626
 
    # Error handling functions
 
627
 
    def _error_code(result):
 
628
 
        """A function to raise exceptions on errors, suitable
 
629
 
        for the 'restype' attribute on ctypes functions"""
 
632
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
633
 
            raise gnutls.CertificateSecurityError(code=result)
 
634
 
        raise gnutls.Error(code=result)
 
636
 
    def _retry_on_error(result, func, arguments):
 
637
 
        """A function to retry on some errors, suitable
 
638
 
        for the 'errcheck' attribute on ctypes functions"""
 
640
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
641
 
                return _error_code(result)
 
642
 
            result = func(*arguments)
 
645
 
    # Unless otherwise indicated, the function declarations below are
 
646
 
    # all from the gnutls/gnutls.h C header file.
 
649
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
650
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
651
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
652
 
    priority_set_direct.restype = _error_code
 
654
 
    init = _library.gnutls_init
 
655
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
656
 
    init.restype = _error_code
 
658
 
    set_default_priority = _library.gnutls_set_default_priority
 
659
 
    set_default_priority.argtypes = [session_t]
 
660
 
    set_default_priority.restype = _error_code
 
662
 
    record_send = _library.gnutls_record_send
 
663
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
665
 
    record_send.restype = ctypes.c_ssize_t
 
666
 
    record_send.errcheck = _retry_on_error
 
668
 
    certificate_allocate_credentials = (
 
669
 
        _library.gnutls_certificate_allocate_credentials)
 
670
 
    certificate_allocate_credentials.argtypes = [
 
671
 
        ctypes.POINTER(certificate_credentials_t)]
 
672
 
    certificate_allocate_credentials.restype = _error_code
 
674
 
    certificate_free_credentials = (
 
675
 
        _library.gnutls_certificate_free_credentials)
 
676
 
    certificate_free_credentials.argtypes = [
 
677
 
        certificate_credentials_t]
 
678
 
    certificate_free_credentials.restype = None
 
680
 
    handshake_set_private_extensions = (
 
681
 
        _library.gnutls_handshake_set_private_extensions)
 
682
 
    handshake_set_private_extensions.argtypes = [session_t,
 
684
 
    handshake_set_private_extensions.restype = None
 
686
 
    credentials_set = _library.gnutls_credentials_set
 
687
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
689
 
    credentials_set.restype = _error_code
 
691
 
    strerror = _library.gnutls_strerror
 
692
 
    strerror.argtypes = [ctypes.c_int]
 
693
 
    strerror.restype = ctypes.c_char_p
 
695
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
696
 
    certificate_type_get.argtypes = [session_t]
 
697
 
    certificate_type_get.restype = _error_code
 
699
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
700
 
    certificate_get_peers.argtypes = [session_t,
 
701
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
702
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
704
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
705
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
706
 
    global_set_log_level.restype = None
 
708
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
709
 
    global_set_log_function.argtypes = [log_func]
 
710
 
    global_set_log_function.restype = None
 
712
 
    deinit = _library.gnutls_deinit
 
713
 
    deinit.argtypes = [session_t]
 
714
 
    deinit.restype = None
 
716
 
    handshake = _library.gnutls_handshake
 
717
 
    handshake.argtypes = [session_t]
 
718
 
    handshake.restype = _error_code
 
719
 
    handshake.errcheck = _retry_on_error
 
721
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
722
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
723
 
    transport_set_ptr.restype = None
 
725
 
    bye = _library.gnutls_bye
 
726
 
    bye.argtypes = [session_t, close_request_t]
 
727
 
    bye.restype = _error_code
 
728
 
    bye.errcheck = _retry_on_error
 
730
 
    check_version = _library.gnutls_check_version
 
731
 
    check_version.argtypes = [ctypes.c_char_p]
 
732
 
    check_version.restype = ctypes.c_char_p
 
734
 
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
737
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
738
 
    openpgp_crt_init.restype = _error_code
 
740
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
741
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
742
 
                                   ctypes.POINTER(datum_t),
 
744
 
    openpgp_crt_import.restype = _error_code
 
746
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
747
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
748
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
749
 
    openpgp_crt_verify_self.restype = _error_code
 
751
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
752
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
753
 
    openpgp_crt_deinit.restype = None
 
755
 
    openpgp_crt_get_fingerprint = (
 
756
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
757
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
761
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
763
 
    # Remove non-public functions
 
764
 
    del _error_code, _retry_on_error
 
765
 
# Create the global "gnutls" object, simulating a module
 
769
 
def call_pipe(connection,       # : multiprocessing.Connection
 
770
 
              func, *args, **kwargs):
 
771
 
    """This function is meant to be called by multiprocessing.Process
 
773
 
    This function runs func(*args, **kwargs), and writes the resulting
 
774
 
    return value on the provided multiprocessing.Connection.
 
776
 
    connection.send(func(*args, **kwargs))
 
780
230
class Client(object):
 
781
231
    """A representation of a client host served by this server.
 
784
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
785
 
    approval_delay: datetime.timedelta(); Time to wait for approval
 
786
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
 
234
    name:       string; from the config file, used in log messages and
 
 
236
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
 
237
                 uniquely identify the client
 
 
238
    secret:     bytestring; sent verbatim (over TLS) to client
 
 
239
    host:       string; available for use by the checker command
 
 
240
    created:    datetime.datetime(); (UTC) object creation
 
 
241
    last_enabled: datetime.datetime(); (UTC)
 
 
243
    last_checked_ok: datetime.datetime(); (UTC) or None
 
 
244
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
 
245
                                      until this client is invalid
 
 
246
    interval:   datetime.timedelta(); How often to start a new checker
 
 
247
    disable_hook:  If set, called by disable() as disable_hook(self)
 
787
248
    checker:    subprocess.Popen(); a running checker process used
 
788
249
                                    to see if the client lives.
 
789
250
                                    'None' if no process is running.
 
790
 
    checker_callback_tag: a GLib event source tag, or None
 
791
 
    checker_command: string; External command which is run to check
 
792
 
                     if client lives.  %() expansions are done at
 
 
251
    checker_initiator_tag: a gobject event source tag, or None
 
 
252
    disable_initiator_tag: - '' -
 
 
253
    checker_callback_tag:  - '' -
 
 
254
    checker_command: string; External command which is run to check if
 
 
255
                     client lives.  %() expansions are done at
 
793
256
                     runtime with vars(self) as dict, so that for
 
794
257
                     instance %(name)s can be used in the command.
 
795
 
    checker_initiator_tag: a GLib event source tag, or None
 
796
 
    created:    datetime.datetime(); (UTC) object creation
 
797
 
    client_structure: Object describing what attributes a client has
 
798
 
                      and is used for storing the client at exit
 
799
258
    current_checker_command: string; current running checker_command
 
800
 
    disable_initiator_tag: a GLib event source tag, or None
 
802
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
803
 
                 uniquely identify the client
 
804
 
    host:       string; available for use by the checker command
 
805
 
    interval:   datetime.timedelta(); How often to start a new checker
 
806
 
    last_approval_request: datetime.datetime(); (UTC) or None
 
807
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
808
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
809
 
                         status of last checker. -1 reflects crashed
 
810
 
                         checker, -2 means no checker completed yet.
 
811
 
    last_checker_signal: The signal which killed the last checker, if
 
812
 
                         last_checker_status is -1
 
813
 
    last_enabled: datetime.datetime(); (UTC) or None
 
814
 
    name:       string; from the config file, used in log messages and
 
816
 
    secret:     bytestring; sent verbatim (over TLS) to client
 
817
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
818
 
                                      until this client is disabled
 
819
 
    extended_timeout:   extra long timeout when secret has been sent
 
820
 
    runtime_expansions: Allowed attributes for runtime expansion.
 
821
 
    expires:    datetime.datetime(); time (UTC) when a client will be
 
823
 
    server_settings: The server_settings dict from main()
 
826
 
    runtime_expansions = ("approval_delay", "approval_duration",
 
827
 
                          "created", "enabled", "expires",
 
828
 
                          "fingerprint", "host", "interval",
 
829
 
                          "last_approval_request", "last_checked_ok",
 
830
 
                          "last_enabled", "name", "timeout")
 
833
 
        "extended_timeout": "PT15M",
 
835
 
        "checker": "fping -q -- %%(host)s",
 
837
 
        "approval_delay": "PT0S",
 
838
 
        "approval_duration": "PT1S",
 
839
 
        "approved_by_default": "True",
 
844
 
    def config_parser(config):
 
845
 
        """Construct a new dict of client settings of this form:
 
846
 
        { client_name: {setting_name: value, ...}, ...}
 
847
 
        with exceptions for any special settings as defined above.
 
848
 
        NOTE: Must be a pure function. Must return the same result
 
849
 
        value given the same arguments.
 
852
 
        for client_name in config.sections():
 
853
 
            section = dict(config.items(client_name))
 
854
 
            client = settings[client_name] = {}
 
856
 
            client["host"] = section["host"]
 
857
 
            # Reformat values from string types to Python types
 
858
 
            client["approved_by_default"] = config.getboolean(
 
859
 
                client_name, "approved_by_default")
 
860
 
            client["enabled"] = config.getboolean(client_name,
 
863
 
            # Uppercase and remove spaces from fingerprint for later
 
864
 
            # comparison purposes with return value from the
 
865
 
            # fingerprint() function
 
866
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
868
 
            if "secret" in section:
 
869
 
                client["secret"] = codecs.decode(section["secret"]
 
872
 
            elif "secfile" in section:
 
873
 
                with open(os.path.expanduser(os.path.expandvars
 
874
 
                                             (section["secfile"])),
 
876
 
                    client["secret"] = secfile.read()
 
878
 
                raise TypeError("No secret or secfile for section {}"
 
880
 
            client["timeout"] = string_to_delta(section["timeout"])
 
881
 
            client["extended_timeout"] = string_to_delta(
 
882
 
                section["extended_timeout"])
 
883
 
            client["interval"] = string_to_delta(section["interval"])
 
884
 
            client["approval_delay"] = string_to_delta(
 
885
 
                section["approval_delay"])
 
886
 
            client["approval_duration"] = string_to_delta(
 
887
 
                section["approval_duration"])
 
888
 
            client["checker_command"] = section["checker"]
 
889
 
            client["last_approval_request"] = None
 
890
 
            client["last_checked_ok"] = None
 
891
 
            client["last_checker_status"] = -2
 
895
 
    def __init__(self, settings, name=None, server_settings=None):
 
 
262
    def _timedelta_to_milliseconds(td):
 
 
263
        "Convert a datetime.timedelta() to milliseconds"
 
 
264
        return ((td.days * 24 * 60 * 60 * 1000)
 
 
265
                + (td.seconds * 1000)
 
 
266
                + (td.microseconds // 1000))
 
 
268
    def timeout_milliseconds(self):
 
 
269
        "Return the 'timeout' attribute in milliseconds"
 
 
270
        return self._timedelta_to_milliseconds(self.timeout)
 
 
272
    def interval_milliseconds(self):
 
 
273
        "Return the 'interval' attribute in milliseconds"
 
 
274
        return self._timedelta_to_milliseconds(self.interval)
 
 
276
    def __init__(self, name = None, disable_hook=None, config=None):
 
 
277
        """Note: the 'checker' key in 'config' sets the
 
 
278
        'checker_command' attribute and *not* the 'checker'
 
897
 
        if server_settings is None:
 
899
 
        self.server_settings = server_settings
 
900
 
        # adding all client settings
 
901
 
        for setting, value in settings.items():
 
902
 
            setattr(self, setting, value)
 
905
 
            if not hasattr(self, "last_enabled"):
 
906
 
                self.last_enabled = datetime.datetime.utcnow()
 
907
 
            if not hasattr(self, "expires"):
 
908
 
                self.expires = (datetime.datetime.utcnow()
 
 
283
        logger.debug(u"Creating client %r", self.name)
 
 
284
        # Uppercase and remove spaces from fingerprint for later
 
 
285
        # comparison purposes with return value from the fingerprint()
 
 
287
        self.fingerprint = (config[u"fingerprint"].upper()
 
 
289
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
 
290
        if u"secret" in config:
 
 
291
            self.secret = config[u"secret"].decode(u"base64")
 
 
292
        elif u"secfile" in config:
 
 
293
            with closing(open(os.path.expanduser
 
 
295
                               (config[u"secfile"])),
 
 
297
                self.secret = secfile.read()
 
911
 
            self.last_enabled = None
 
914
 
        logger.debug("Creating client %r", self.name)
 
915
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
916
 
        self.created = settings.get("created",
 
917
 
                                    datetime.datetime.utcnow())
 
919
 
        # attributes specific for this server instance
 
 
299
            raise TypeError(u"No secret or secfile for client %s"
 
 
301
        self.host = config.get(u"host", u"")
 
 
302
        self.created = datetime.datetime.utcnow()
 
 
304
        self.last_enabled = None
 
 
305
        self.last_checked_ok = None
 
 
306
        self.timeout = string_to_delta(config[u"timeout"])
 
 
307
        self.interval = string_to_delta(config[u"interval"])
 
 
308
        self.disable_hook = disable_hook
 
920
309
        self.checker = None
 
921
310
        self.checker_initiator_tag = None
 
922
311
        self.disable_initiator_tag = None
 
923
312
        self.checker_callback_tag = None
 
 
313
        self.checker_command = config[u"checker"]
 
924
314
        self.current_checker_command = None
 
926
 
        self.approvals_pending = 0
 
927
 
        self.changedstate = multiprocessing_manager.Condition(
 
928
 
            multiprocessing_manager.Lock())
 
929
 
        self.client_structure = [attr
 
930
 
                                 for attr in self.__dict__.keys()
 
931
 
                                 if not attr.startswith("_")]
 
932
 
        self.client_structure.append("client_structure")
 
934
 
        for name, t in inspect.getmembers(
 
935
 
                type(self), lambda obj: isinstance(obj, property)):
 
936
 
            if not name.startswith("_"):
 
937
 
                self.client_structure.append(name)
 
939
 
    # Send notice to process children that client state has changed
 
940
 
    def send_changedstate(self):
 
941
 
        with self.changedstate:
 
942
 
            self.changedstate.notify_all()
 
 
315
        self.last_connect = None
 
944
317
    def enable(self):
 
945
318
        """Start this client's checker and timeout hooks"""
 
946
 
        if getattr(self, "enabled", False):
 
 
319
        if getattr(self, u"enabled", False):
 
947
320
            # Already enabled
 
949
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
951
322
        self.last_enabled = datetime.datetime.utcnow()
 
953
 
        self.send_changedstate()
 
 
323
        # Schedule a new checker to be started an 'interval' from now,
 
 
324
        # and every interval from then on.
 
 
325
        self.checker_initiator_tag = (gobject.timeout_add
 
 
326
                                      (self.interval_milliseconds(),
 
 
328
        # Schedule a disable() when 'timeout' has passed
 
 
329
        self.disable_initiator_tag = (gobject.timeout_add
 
 
330
                                   (self.timeout_milliseconds(),
 
 
333
        # Also start a new checker *right now*.
 
955
336
    def disable(self, quiet=True):
 
956
337
        """Disable this client."""
 
957
338
        if not getattr(self, "enabled", False):
 
960
 
            logger.info("Disabling client %s", self.name)
 
961
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
962
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
341
            logger.info(u"Disabling client %s", self.name)
 
 
342
        if getattr(self, u"disable_initiator_tag", False):
 
 
343
            gobject.source_remove(self.disable_initiator_tag)
 
963
344
            self.disable_initiator_tag = None
 
965
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
966
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
345
        if getattr(self, u"checker_initiator_tag", False):
 
 
346
            gobject.source_remove(self.checker_initiator_tag)
 
967
347
            self.checker_initiator_tag = None
 
968
348
        self.stop_checker()
 
 
349
        if self.disable_hook:
 
 
350
            self.disable_hook(self)
 
969
351
        self.enabled = False
 
971
 
            self.send_changedstate()
 
972
 
        # Do not run this again if called by a GLib.timeout_add
 
 
352
        # Do not run this again if called by a gobject.timeout_add
 
975
355
    def __del__(self):
 
 
356
        self.disable_hook = None
 
978
 
    def init_checker(self):
 
979
 
        # Schedule a new checker to be started an 'interval' from now,
 
980
 
        # and every interval from then on.
 
981
 
        if self.checker_initiator_tag is not None:
 
982
 
            GLib.source_remove(self.checker_initiator_tag)
 
983
 
        self.checker_initiator_tag = GLib.timeout_add(
 
984
 
            int(self.interval.total_seconds() * 1000),
 
986
 
        # Schedule a disable() when 'timeout' has passed
 
987
 
        if self.disable_initiator_tag is not None:
 
988
 
            GLib.source_remove(self.disable_initiator_tag)
 
989
 
        self.disable_initiator_tag = GLib.timeout_add(
 
990
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
991
 
        # Also start a new checker *right now*.
 
994
 
    def checker_callback(self, source, condition, connection,
 
 
359
    def checker_callback(self, pid, condition, command):
 
996
360
        """The checker has completed, so take appropriate actions."""
 
997
361
        self.checker_callback_tag = None
 
998
362
        self.checker = None
 
999
 
        # Read return code from connection (see call_pipe)
 
1000
 
        returncode = connection.recv()
 
1004
 
            self.last_checker_status = returncode
 
1005
 
            self.last_checker_signal = None
 
1006
 
            if self.last_checker_status == 0:
 
1007
 
                logger.info("Checker for %(name)s succeeded",
 
 
363
        if os.WIFEXITED(condition):
 
 
364
            exitstatus = os.WEXITSTATUS(condition)
 
 
366
                logger.info(u"Checker for %(name)s succeeded",
 
1009
368
                self.checked_ok()
 
1011
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
370
                logger.info(u"Checker for %(name)s failed",
 
1013
 
            self.last_checker_status = -1
 
1014
 
            self.last_checker_signal = -returncode
 
1015
 
            logger.warning("Checker for %(name)s crashed?",
 
 
373
            logger.warning(u"Checker for %(name)s crashed?",
 
1019
376
    def checked_ok(self):
 
1020
 
        """Assert that the client has been seen, alive and well."""
 
 
377
        """Bump up the timeout for this client.
 
 
379
        This should only be called when the client has been seen,
 
1021
382
        self.last_checked_ok = datetime.datetime.utcnow()
 
1022
 
        self.last_checker_status = 0
 
1023
 
        self.last_checker_signal = None
 
1026
 
    def bump_timeout(self, timeout=None):
 
1027
 
        """Bump up the timeout for this client."""
 
1029
 
            timeout = self.timeout
 
1030
 
        if self.disable_initiator_tag is not None:
 
1031
 
            GLib.source_remove(self.disable_initiator_tag)
 
1032
 
            self.disable_initiator_tag = None
 
1033
 
        if getattr(self, "enabled", False):
 
1034
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1035
 
                int(timeout.total_seconds() * 1000), self.disable)
 
1036
 
            self.expires = datetime.datetime.utcnow() + timeout
 
1038
 
    def need_approval(self):
 
1039
 
        self.last_approval_request = datetime.datetime.utcnow()
 
 
383
        gobject.source_remove(self.disable_initiator_tag)
 
 
384
        self.disable_initiator_tag = (gobject.timeout_add
 
 
385
                                      (self.timeout_milliseconds(),
 
1041
388
    def start_checker(self):
 
1042
389
        """Start a new checker subprocess if one is not running.
 
1044
391
        If a checker already exists, leave it running and do
 
1046
393
        # The reason for not killing a running checker is that if we
 
1047
 
        # did that, and if a checker (for some reason) started running
 
1048
 
        # slowly and taking more than 'interval' time, then the client
 
1049
 
        # would inevitably timeout, since no checker would get a
 
1050
 
        # chance to run to completion.  If we instead leave running
 
 
394
        # did that, then if a checker (for some reason) started
 
 
395
        # running slowly and taking more than 'interval' time, the
 
 
396
        # client would inevitably timeout, since no checker would get
 
 
397
        # a chance to run to completion.  If we instead leave running
 
1051
398
        # checkers alone, the checker would have to take more time
 
1052
 
        # than 'timeout' for the client to be disabled, which is as it
 
1055
 
        if self.checker is not None and not self.checker.is_alive():
 
1056
 
            logger.warning("Checker was not alive; joining")
 
 
399
        # than 'timeout' for the client to be declared invalid, which
 
 
400
        # is as it should be.
 
 
402
        # If a checker exists, make sure it is not a zombie
 
 
404
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
405
        except (AttributeError, OSError), error:
 
 
406
            if (isinstance(error, OSError)
 
 
407
                and error.errno != errno.ECHILD):
 
 
411
                logger.warning(u"Checker was a zombie")
 
 
412
                gobject.source_remove(self.checker_callback_tag)
 
 
413
                self.checker_callback(pid, status,
 
 
414
                                      self.current_checker_command)
 
1059
415
        # Start a new checker if needed
 
1060
416
        if self.checker is None:
 
1061
 
            # Escape attributes for the shell
 
1063
 
                attr: re.escape(str(getattr(self, attr)))
 
1064
 
                for attr in self.runtime_expansions}
 
1066
 
                command = self.checker_command % escaped_attrs
 
1067
 
            except TypeError as error:
 
1068
 
                logger.error('Could not format string "%s"',
 
1069
 
                             self.checker_command,
 
1071
 
                return True     # Try again later
 
 
418
                # In case checker_command has exactly one % operator
 
 
419
                command = self.checker_command % self.host
 
 
421
                # Escape attributes for the shell
 
 
422
                escaped_attrs = dict((key,
 
 
423
                                      re.escape(unicode(str(val),
 
 
427
                                     vars(self).iteritems())
 
 
429
                    command = self.checker_command % escaped_attrs
 
 
430
                except TypeError, error:
 
 
431
                    logger.error(u'Could not format string "%s":'
 
 
432
                                 u' %s', self.checker_command, error)
 
 
433
                    return True # Try again later
 
1072
434
            self.current_checker_command = command
 
1073
 
            logger.info("Starting checker %r for %s", command,
 
1075
 
            # We don't need to redirect stdout and stderr, since
 
1076
 
            # in normal mode, that is already done by daemon(),
 
1077
 
            # and in debug mode we don't want to.  (Stdin is
 
1078
 
            # always replaced by /dev/null.)
 
1079
 
            # The exception is when not debugging but nevertheless
 
1080
 
            # running in the foreground; use the previously
 
1082
 
            popen_args = {"close_fds": True,
 
1085
 
            if (not self.server_settings["debug"]
 
1086
 
                and self.server_settings["foreground"]):
 
1087
 
                popen_args.update({"stdout": wnull,
 
1089
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1090
 
            self.checker = multiprocessing.Process(
 
1092
 
                args=(pipe[1], subprocess.call, command),
 
1094
 
            self.checker.start()
 
1095
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1096
 
                pipe[0].fileno(), GLib.IO_IN,
 
1097
 
                self.checker_callback, pipe[0], command)
 
1098
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
436
                logger.info(u"Starting checker %r for %s",
 
 
438
                # We don't need to redirect stdout and stderr, since
 
 
439
                # in normal mode, that is already done by daemon(),
 
 
440
                # and in debug mode we don't want to.  (Stdin is
 
 
441
                # always replaced by /dev/null.)
 
 
442
                self.checker = subprocess.Popen(command,
 
 
444
                                                shell=True, cwd=u"/")
 
 
445
                self.checker_callback_tag = (gobject.child_watch_add
 
 
447
                                              self.checker_callback,
 
 
449
                # The checker may have completed before the gobject
 
 
450
                # watch was added.  Check for this.
 
 
451
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
453
                    gobject.source_remove(self.checker_callback_tag)
 
 
454
                    self.checker_callback(pid, status, command)
 
 
455
            except OSError, error:
 
 
456
                logger.error(u"Failed to start subprocess: %s",
 
 
458
        # Re-run this periodically if run by gobject.timeout_add
 
1101
461
    def stop_checker(self):
 
1102
462
        """Force the checker process, if any, to stop."""
 
1103
463
        if self.checker_callback_tag:
 
1104
 
            GLib.source_remove(self.checker_callback_tag)
 
 
464
            gobject.source_remove(self.checker_callback_tag)
 
1105
465
            self.checker_callback_tag = None
 
1106
 
        if getattr(self, "checker", None) is None:
 
 
466
        if getattr(self, u"checker", None) is None:
 
1108
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1109
 
        self.checker.terminate()
 
 
468
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
 
470
            os.kill(self.checker.pid, signal.SIGTERM)
 
 
472
            #if self.checker.poll() is None:
 
 
473
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
 
474
        except OSError, error:
 
 
475
            if error.errno != errno.ESRCH: # No such process
 
1110
477
        self.checker = None
 
1113
 
def dbus_service_property(dbus_interface,
 
 
479
    def still_valid(self):
 
 
480
        """Has the timeout not yet passed for this client?"""
 
 
481
        if not getattr(self, u"enabled", False):
 
 
483
        now = datetime.datetime.utcnow()
 
 
484
        if self.last_checked_ok is None:
 
 
485
            return now < (self.created + self.timeout)
 
 
487
            return now < (self.last_checked_ok + self.timeout)
 
 
490
def dbus_service_property(dbus_interface, signature=u"v",
 
 
491
                          access=u"readwrite", byte_arrays=False):
 
1117
492
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1118
493
    become properties on the D-Bus.
 
1120
495
    The decorated method will be called with no arguments by "Get"
 
1121
496
    and with one argument by "Set".
 
1123
498
    The parameters, where they are supported, are the same as
 
1124
499
    dbus.service.method, except there is only "signature", since the
 
1125
500
    type from Get() and the type sent to Set() is the same.
 
1127
 
    # Encoding deeply encoded byte arrays is not supported yet by the
 
1128
 
    # "Set" method, so we fail early here:
 
1129
 
    if byte_arrays and signature != "ay":
 
1130
 
        raise ValueError("Byte arrays not supported for non-'ay'"
 
1131
 
                         " signature {!r}".format(signature))
 
1133
502
    def decorator(func):
 
1134
503
        func._dbus_is_property = True
 
1135
504
        func._dbus_interface = dbus_interface
 
1136
505
        func._dbus_signature = signature
 
1137
506
        func._dbus_access = access
 
1138
507
        func._dbus_name = func.__name__
 
1139
 
        if func._dbus_name.endswith("_dbus_property"):
 
 
508
        if func._dbus_name.endswith(u"_dbus_property"):
 
1140
509
            func._dbus_name = func._dbus_name[:-14]
 
1141
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
1147
 
def dbus_interface_annotations(dbus_interface):
 
1148
 
    """Decorator for marking functions returning interface annotations
 
1152
 
    @dbus_interface_annotations("org.example.Interface")
 
1153
 
    def _foo(self):  # Function name does not matter
 
1154
 
        return {"org.freedesktop.DBus.Deprecated": "true",
 
1155
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1159
 
    def decorator(func):
 
1160
 
        func._dbus_is_interface = True
 
1161
 
        func._dbus_interface = dbus_interface
 
1162
 
        func._dbus_name = dbus_interface
 
1168
 
def dbus_annotations(annotations):
 
1169
 
    """Decorator to annotate D-Bus methods, signals or properties
 
1172
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
1173
 
                       "org.freedesktop.DBus.Property."
 
1174
 
                       "EmitsChangedSignal": "false"})
 
1175
 
    @dbus_service_property("org.example.Interface", signature="b",
 
1177
 
    def Property_dbus_property(self):
 
1178
 
        return dbus.Boolean(False)
 
1180
 
    See also the DBusObjectWithAnnotations class.
 
1183
 
    def decorator(func):
 
1184
 
        func._dbus_annotations = annotations
 
 
510
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
1187
512
    return decorator
 
1190
515
class DBusPropertyException(dbus.exceptions.DBusException):
 
1191
516
    """A base class for D-Bus property-related exceptions
 
 
518
    def __unicode__(self):
 
 
519
        return unicode(str(self))
 
1196
522
class DBusPropertyAccessException(DBusPropertyException):
 
 
1208
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1209
 
    """A D-Bus object with annotations.
 
1211
 
    Classes inheriting from this can use the dbus_annotations
 
1212
 
    decorator to add annotations to methods or signals.
 
1216
 
    def _is_dbus_thing(thing):
 
1217
 
        """Returns a function testing if an attribute is a D-Bus thing
 
1219
 
        If called like _is_dbus_thing("method") it returns a function
 
1220
 
        suitable for use as predicate to inspect.getmembers().
 
1222
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1225
 
    def _get_all_dbus_things(self, thing):
 
1226
 
        """Returns a generator of (name, attribute) pairs
 
1228
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
1229
 
                 athing.__get__(self))
 
1230
 
                for cls in self.__class__.__mro__
 
1232
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1234
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1236
 
                         path_keyword='object_path',
 
1237
 
                         connection_keyword='connection')
 
1238
 
    def Introspect(self, object_path, connection):
 
1239
 
        """Overloading of standard D-Bus method.
 
1241
 
        Inserts annotation tags on methods and signals.
 
1243
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1246
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1248
 
            for if_tag in document.getElementsByTagName("interface"):
 
1249
 
                # Add annotation tags
 
1250
 
                for typ in ("method", "signal"):
 
1251
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1253
 
                        for name, prop in (self.
 
1254
 
                                           _get_all_dbus_things(typ)):
 
1255
 
                            if (name == tag.getAttribute("name")
 
1256
 
                                and prop._dbus_interface
 
1257
 
                                == if_tag.getAttribute("name")):
 
1258
 
                                annots.update(getattr(
 
1259
 
                                    prop, "_dbus_annotations", {}))
 
1260
 
                        for name, value in annots.items():
 
1261
 
                            ann_tag = document.createElement(
 
1263
 
                            ann_tag.setAttribute("name", name)
 
1264
 
                            ann_tag.setAttribute("value", value)
 
1265
 
                            tag.appendChild(ann_tag)
 
1266
 
                # Add interface annotation tags
 
1267
 
                for annotation, value in dict(
 
1268
 
                    itertools.chain.from_iterable(
 
1269
 
                        annotations().items()
 
1270
 
                        for name, annotations
 
1271
 
                        in self._get_all_dbus_things("interface")
 
1272
 
                        if name == if_tag.getAttribute("name")
 
1274
 
                    ann_tag = document.createElement("annotation")
 
1275
 
                    ann_tag.setAttribute("name", annotation)
 
1276
 
                    ann_tag.setAttribute("value", value)
 
1277
 
                    if_tag.appendChild(ann_tag)
 
1278
 
                # Fix argument name for the Introspect method itself
 
1279
 
                if (if_tag.getAttribute("name")
 
1280
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1281
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1282
 
                        if cn.getAttribute("name") == "Introspect":
 
1283
 
                            for arg in cn.getElementsByTagName("arg"):
 
1284
 
                                if (arg.getAttribute("direction")
 
1286
 
                                    arg.setAttribute("name",
 
1288
 
            xmlstring = document.toxml("utf-8")
 
1290
 
        except (AttributeError, xml.dom.DOMException,
 
1291
 
                xml.parsers.expat.ExpatError) as error:
 
1292
 
            logger.error("Failed to override Introspection method",
 
1297
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
534
class DBusObjectWithProperties(dbus.service.Object):
 
1298
535
    """A D-Bus object with properties.
 
1300
537
    Classes inheriting from this can use the dbus_service_property
 
1301
538
    decorator to expose methods as D-Bus properties.  It exposes the
 
1302
539
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
543
    def _is_dbus_property(obj):
 
 
544
        return getattr(obj, u"_dbus_is_property", False)
 
 
546
    def _get_all_dbus_properties(self):
 
 
547
        """Returns a generator of (name, attribute) pairs
 
 
549
        return ((prop._dbus_name, prop)
 
 
551
                inspect.getmembers(self, self._is_dbus_property))
 
1305
553
    def _get_dbus_property(self, interface_name, property_name):
 
1306
554
        """Returns a bound method if one exists which is a D-Bus
 
1307
555
        property with the specified name and interface.
 
1309
 
        for cls in self.__class__.__mro__:
 
1310
 
            for name, value in inspect.getmembers(
 
1311
 
                    cls, self._is_dbus_thing("property")):
 
1312
 
                if (value._dbus_name == property_name
 
1313
 
                    and value._dbus_interface == interface_name):
 
1314
 
                    return value.__get__(self)
 
 
557
        for name in (property_name,
 
 
558
                     property_name + u"_dbus_property"):
 
 
559
            prop = getattr(self, name, None)
 
 
561
                or not self._is_dbus_property(prop)
 
 
562
                or prop._dbus_name != property_name
 
 
563
                or (interface_name and prop._dbus_interface
 
 
564
                    and interface_name != prop._dbus_interface)):
 
1316
567
        # No such property
 
1317
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1318
 
            self.dbus_object_path, interface_name, property_name))
 
1321
 
    def _get_all_interface_names(cls):
 
1322
 
        """Get a sequence of all interfaces supported by an object"""
 
1323
 
        return (name for name in set(getattr(getattr(x, attr),
 
1324
 
                                             "_dbus_interface", None)
 
1325
 
                                     for x in (inspect.getmro(cls))
 
1327
 
                if name is not None)
 
1329
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
568
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
 
569
                                   + interface_name + u"."
 
 
572
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
1332
574
    def Get(self, interface_name, property_name):
 
1333
575
        """Standard D-Bus property Get() method, see D-Bus standard.
 
1335
577
        prop = self._get_dbus_property(interface_name, property_name)
 
1336
 
        if prop._dbus_access == "write":
 
 
578
        if prop._dbus_access == u"write":
 
1337
579
            raise DBusPropertyAccessException(property_name)
 
1339
 
        if not hasattr(value, "variant_level"):
 
 
581
        if not hasattr(value, u"variant_level"):
 
1341
583
        return type(value)(value, variant_level=value.variant_level+1)
 
1343
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
 
585
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
1344
586
    def Set(self, interface_name, property_name, value):
 
1345
587
        """Standard D-Bus property Set() method, see D-Bus standard.
 
1347
589
        prop = self._get_dbus_property(interface_name, property_name)
 
1348
 
        if prop._dbus_access == "read":
 
 
590
        if prop._dbus_access == u"read":
 
1349
591
            raise DBusPropertyAccessException(property_name)
 
1350
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
1351
 
            # The byte_arrays option is not supported yet on
 
1352
 
            # signatures other than "ay".
 
1353
 
            if prop._dbus_signature != "ay":
 
1354
 
                raise ValueError("Byte arrays not supported for non-"
 
1355
 
                                 "'ay' signature {!r}"
 
1356
 
                                 .format(prop._dbus_signature))
 
1357
 
            value = dbus.ByteArray(b''.join(chr(byte)
 
 
592
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
593
            value = dbus.ByteArray(''.join(unichr(byte)
 
1361
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
1363
 
                         out_signature="a{sv}")
 
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
 
598
                         out_signature=u"a{sv}")
 
1364
599
    def GetAll(self, interface_name):
 
1365
600
        """Standard D-Bus property GetAll() method, see D-Bus
 
1368
603
        Note: Will not include properties with access="write".
 
1371
 
        for name, prop in self._get_all_dbus_things("property"):
 
 
606
        for name, prop in self._get_all_dbus_properties():
 
1372
607
            if (interface_name
 
1373
608
                and interface_name != prop._dbus_interface):
 
1374
609
                # Interface non-empty but did not match
 
1376
611
            # Ignore write-only properties
 
1377
 
            if prop._dbus_access == "write":
 
 
612
            if prop._dbus_access == u"write":
 
1380
 
            if not hasattr(value, "variant_level"):
 
1381
 
                properties[name] = value
 
 
615
            if not hasattr(value, u"variant_level"):
 
1383
 
            properties[name] = type(value)(
 
1384
 
                value, variant_level=value.variant_level + 1)
 
1385
 
        return dbus.Dictionary(properties, signature="sv")
 
1387
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
1388
 
    def PropertiesChanged(self, interface_name, changed_properties,
 
1389
 
                          invalidated_properties):
 
1390
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
 
618
            all[name] = type(value)(value, variant_level=
 
 
619
                                    value.variant_level+1)
 
 
620
        return dbus.Dictionary(all, signature=u"sv")
 
1395
622
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1397
624
                         path_keyword='object_path',
 
1398
625
                         connection_keyword='connection')
 
1399
626
    def Introspect(self, object_path, connection):
 
1400
 
        """Overloading of standard D-Bus method.
 
1402
 
        Inserts property tags and interface annotation tags.
 
 
627
        """Standard D-Bus method, overloaded to insert property tags.
 
1404
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
629
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1408
632
            document = xml.dom.minidom.parseString(xmlstring)
 
1410
633
            def make_tag(document, name, prop):
 
1411
 
                e = document.createElement("property")
 
1412
 
                e.setAttribute("name", name)
 
1413
 
                e.setAttribute("type", prop._dbus_signature)
 
1414
 
                e.setAttribute("access", prop._dbus_access)
 
 
634
                e = document.createElement(u"property")
 
 
635
                e.setAttribute(u"name", name)
 
 
636
                e.setAttribute(u"type", prop._dbus_signature)
 
 
637
                e.setAttribute(u"access", prop._dbus_access)
 
1417
 
            for if_tag in document.getElementsByTagName("interface"):
 
 
639
            for if_tag in document.getElementsByTagName(u"interface"):
 
1419
640
                for tag in (make_tag(document, name, prop)
 
1421
 
                            in self._get_all_dbus_things("property")
 
 
642
                            in self._get_all_dbus_properties()
 
1422
643
                            if prop._dbus_interface
 
1423
 
                            == if_tag.getAttribute("name")):
 
 
644
                            == if_tag.getAttribute(u"name")):
 
1424
645
                    if_tag.appendChild(tag)
 
1425
 
                # Add annotation tags for properties
 
1426
 
                for tag in if_tag.getElementsByTagName("property"):
 
1428
 
                    for name, prop in self._get_all_dbus_things(
 
1430
 
                        if (name == tag.getAttribute("name")
 
1431
 
                            and prop._dbus_interface
 
1432
 
                            == if_tag.getAttribute("name")):
 
1433
 
                            annots.update(getattr(
 
1434
 
                                prop, "_dbus_annotations", {}))
 
1435
 
                    for name, value in annots.items():
 
1436
 
                        ann_tag = document.createElement(
 
1438
 
                        ann_tag.setAttribute("name", name)
 
1439
 
                        ann_tag.setAttribute("value", value)
 
1440
 
                        tag.appendChild(ann_tag)
 
1441
646
                # Add the names to the return values for the
 
1442
647
                # "org.freedesktop.DBus.Properties" methods
 
1443
 
                if (if_tag.getAttribute("name")
 
1444
 
                    == "org.freedesktop.DBus.Properties"):
 
1445
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1446
 
                        if cn.getAttribute("name") == "Get":
 
1447
 
                            for arg in cn.getElementsByTagName("arg"):
 
1448
 
                                if (arg.getAttribute("direction")
 
1450
 
                                    arg.setAttribute("name", "value")
 
1451
 
                        elif cn.getAttribute("name") == "GetAll":
 
1452
 
                            for arg in cn.getElementsByTagName("arg"):
 
1453
 
                                if (arg.getAttribute("direction")
 
1455
 
                                    arg.setAttribute("name", "props")
 
1456
 
            xmlstring = document.toxml("utf-8")
 
1458
 
        except (AttributeError, xml.dom.DOMException,
 
1459
 
                xml.parsers.expat.ExpatError) as error:
 
1460
 
            logger.error("Failed to override Introspection method",
 
1466
 
    dbus.OBJECT_MANAGER_IFACE
 
1467
 
except AttributeError:
 
1468
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1471
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1472
 
    """A D-Bus object with an ObjectManager.
 
1474
 
    Classes inheriting from this exposes the standard
 
1475
 
    GetManagedObjects call and the InterfacesAdded and
 
1476
 
    InterfacesRemoved signals on the standard
 
1477
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1479
 
    Note: No signals are sent automatically; they must be sent
 
1482
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1483
 
                         out_signature="a{oa{sa{sv}}}")
 
1484
 
    def GetManagedObjects(self):
 
1485
 
        """This function must be overridden"""
 
1486
 
        raise NotImplementedError()
 
1488
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1489
 
                         signature="oa{sa{sv}}")
 
1490
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1493
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1494
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1497
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1499
 
                         path_keyword='object_path',
 
1500
 
                         connection_keyword='connection')
 
1501
 
    def Introspect(self, object_path, connection):
 
1502
 
        """Overloading of standard D-Bus method.
 
1504
 
        Override return argument name of GetManagedObjects to be
 
1505
 
        "objpath_interfaces_and_properties"
 
1507
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1511
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1513
 
            for if_tag in document.getElementsByTagName("interface"):
 
1514
 
                # Fix argument name for the GetManagedObjects method
 
1515
 
                if (if_tag.getAttribute("name")
 
1516
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1517
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1518
 
                        if (cn.getAttribute("name")
 
1519
 
                            == "GetManagedObjects"):
 
1520
 
                            for arg in cn.getElementsByTagName("arg"):
 
1521
 
                                if (arg.getAttribute("direction")
 
1525
 
                                        "objpath_interfaces"
 
1527
 
            xmlstring = document.toxml("utf-8")
 
1529
 
        except (AttributeError, xml.dom.DOMException,
 
1530
 
                xml.parsers.expat.ExpatError) as error:
 
1531
 
            logger.error("Failed to override Introspection method",
 
1536
 
def datetime_to_dbus(dt, variant_level=0):
 
1537
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1539
 
        return dbus.String("", variant_level=variant_level)
 
1540
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1543
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1544
 
    """A class decorator; applied to a subclass of
 
1545
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1546
 
    interface names according to the "alt_interface_names" mapping.
 
1549
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1550
 
                                    "net.example.AlternateInterface"})
 
1551
 
    class SampleDBusObject(dbus.service.Object):
 
1552
 
        @dbus.service.method("org.example.Interface")
 
1553
 
        def SampleDBusMethod():
 
1556
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1557
 
    reachable via two interfaces: "org.example.Interface" and
 
1558
 
    "net.example.AlternateInterface", the latter of which will have
 
1559
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1560
 
    "true", unless "deprecate" is passed with a False value.
 
1562
 
    This works for methods and signals, and also for D-Bus properties
 
1563
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1564
 
    dbus_interface_annotations decorator).
 
1568
 
        for orig_interface_name, alt_interface_name in (
 
1569
 
                alt_interface_names.items()):
 
1571
 
            interface_names = set()
 
1572
 
            # Go though all attributes of the class
 
1573
 
            for attrname, attribute in inspect.getmembers(cls):
 
1574
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1575
 
                # with the wrong interface name
 
1576
 
                if (not hasattr(attribute, "_dbus_interface")
 
1577
 
                    or not attribute._dbus_interface.startswith(
 
1578
 
                        orig_interface_name)):
 
1580
 
                # Create an alternate D-Bus interface name based on
 
1582
 
                alt_interface = attribute._dbus_interface.replace(
 
1583
 
                    orig_interface_name, alt_interface_name)
 
1584
 
                interface_names.add(alt_interface)
 
1585
 
                # Is this a D-Bus signal?
 
1586
 
                if getattr(attribute, "_dbus_is_signal", False):
 
1587
 
                    # Extract the original non-method undecorated
 
1588
 
                    # function by black magic
 
1589
 
                    if sys.version_info.major == 2:
 
1590
 
                        nonmethod_func = (dict(
 
1591
 
                            zip(attribute.func_code.co_freevars,
 
1592
 
                                attribute.__closure__))
 
1593
 
                                          ["func"].cell_contents)
 
1595
 
                        nonmethod_func = (dict(
 
1596
 
                            zip(attribute.__code__.co_freevars,
 
1597
 
                                attribute.__closure__))
 
1598
 
                                          ["func"].cell_contents)
 
1599
 
                    # Create a new, but exactly alike, function
 
1600
 
                    # object, and decorate it to be a new D-Bus signal
 
1601
 
                    # with the alternate D-Bus interface name
 
1602
 
                    new_function = copy_function(nonmethod_func)
 
1603
 
                    new_function = (dbus.service.signal(
 
1605
 
                        attribute._dbus_signature)(new_function))
 
1606
 
                    # Copy annotations, if any
 
1608
 
                        new_function._dbus_annotations = dict(
 
1609
 
                            attribute._dbus_annotations)
 
1610
 
                    except AttributeError:
 
1613
 
                    # Define a creator of a function to call both the
 
1614
 
                    # original and alternate functions, so both the
 
1615
 
                    # original and alternate signals gets sent when
 
1616
 
                    # the function is called
 
1617
 
                    def fixscope(func1, func2):
 
1618
 
                        """This function is a scope container to pass
 
1619
 
                        func1 and func2 to the "call_both" function
 
1620
 
                        outside of its arguments"""
 
1622
 
                        @functools.wraps(func2)
 
1623
 
                        def call_both(*args, **kwargs):
 
1624
 
                            """This function will emit two D-Bus
 
1625
 
                            signals by calling func1 and func2"""
 
1626
 
                            func1(*args, **kwargs)
 
1627
 
                            func2(*args, **kwargs)
 
1628
 
                        # Make wrapper function look like a D-Bus
 
1630
 
                        for name, attr in inspect.getmembers(func2):
 
1631
 
                            if name.startswith("_dbus_"):
 
1632
 
                                setattr(call_both, name, attr)
 
1635
 
                    # Create the "call_both" function and add it to
 
1637
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1638
 
                # Is this a D-Bus method?
 
1639
 
                elif getattr(attribute, "_dbus_is_method", False):
 
1640
 
                    # Create a new, but exactly alike, function
 
1641
 
                    # object.  Decorate it to be a new D-Bus method
 
1642
 
                    # with the alternate D-Bus interface name.  Add it
 
1645
 
                        dbus.service.method(
 
1647
 
                            attribute._dbus_in_signature,
 
1648
 
                            attribute._dbus_out_signature)
 
1649
 
                        (copy_function(attribute)))
 
1650
 
                    # Copy annotations, if any
 
1652
 
                        attr[attrname]._dbus_annotations = dict(
 
1653
 
                            attribute._dbus_annotations)
 
1654
 
                    except AttributeError:
 
1656
 
                # Is this a D-Bus property?
 
1657
 
                elif getattr(attribute, "_dbus_is_property", False):
 
1658
 
                    # Create a new, but exactly alike, function
 
1659
 
                    # object, and decorate it to be a new D-Bus
 
1660
 
                    # property with the alternate D-Bus interface
 
1661
 
                    # name.  Add it to the class.
 
1662
 
                    attr[attrname] = (dbus_service_property(
 
1663
 
                        alt_interface, attribute._dbus_signature,
 
1664
 
                        attribute._dbus_access,
 
1665
 
                        attribute._dbus_get_args_options
 
1667
 
                                      (copy_function(attribute)))
 
1668
 
                    # Copy annotations, if any
 
1670
 
                        attr[attrname]._dbus_annotations = dict(
 
1671
 
                            attribute._dbus_annotations)
 
1672
 
                    except AttributeError:
 
1674
 
                # Is this a D-Bus interface?
 
1675
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1676
 
                    # Create a new, but exactly alike, function
 
1677
 
                    # object.  Decorate it to be a new D-Bus interface
 
1678
 
                    # with the alternate D-Bus interface name.  Add it
 
1681
 
                        dbus_interface_annotations(alt_interface)
 
1682
 
                        (copy_function(attribute)))
 
1684
 
                # Deprecate all alternate interfaces
 
1685
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1686
 
                for interface_name in interface_names:
 
1688
 
                    @dbus_interface_annotations(interface_name)
 
1690
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1692
 
                    # Find an unused name
 
1693
 
                    for aname in (iname.format(i)
 
1694
 
                                  for i in itertools.count()):
 
1695
 
                        if aname not in attr:
 
1699
 
                # Replace the class with a new subclass of it with
 
1700
 
                # methods, signals, etc. as created above.
 
1701
 
                if sys.version_info.major == 2:
 
1702
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1705
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1712
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1713
 
                            "se.bsnet.fukt.Mandos"})
 
 
648
                if (if_tag.getAttribute(u"name")
 
 
649
                    == u"org.freedesktop.DBus.Properties"):
 
 
650
                    for cn in if_tag.getElementsByTagName(u"method"):
 
 
651
                        if cn.getAttribute(u"name") == u"Get":
 
 
652
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
653
                                if (arg.getAttribute(u"direction")
 
 
655
                                    arg.setAttribute(u"name", u"value")
 
 
656
                        elif cn.getAttribute(u"name") == u"GetAll":
 
 
657
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
658
                                if (arg.getAttribute(u"direction")
 
 
660
                                    arg.setAttribute(u"name", u"props")
 
 
661
            xmlstring = document.toxml(u"utf-8")
 
 
663
        except (AttributeError, xml.dom.DOMException,
 
 
664
                xml.parsers.expat.ExpatError), error:
 
 
665
            logger.error(u"Failed to override Introspection method",
 
1714
670
class ClientDBus(Client, DBusObjectWithProperties):
 
1715
671
    """A Client class using D-Bus
 
1718
674
    dbus_object_path: dbus.ObjectPath
 
1719
675
    bus: dbus.SystemBus()
 
1722
 
    runtime_expansions = (Client.runtime_expansions
 
1723
 
                          + ("dbus_object_path", ))
 
1725
 
    _interface = "se.recompile.Mandos.Client"
 
1727
677
    # dbus.service.Object doesn't use super(), so we can't either.
 
1729
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
679
    def __init__(self, bus = None, *args, **kwargs):
 
1731
681
        Client.__init__(self, *args, **kwargs)
 
1732
682
        # Only now, when this client is initialized, can it show up on
 
1734
 
        client_object_name = str(self.name).translate(
 
1735
 
            {ord("."): ord("_"),
 
1736
 
             ord("-"): ord("_")})
 
1737
 
        self.dbus_object_path = dbus.ObjectPath(
 
1738
 
            "/clients/" + client_object_name)
 
 
684
        self.dbus_object_path = (dbus.ObjectPath
 
 
686
                                  + self.name.replace(u".", u"_")))
 
1739
687
        DBusObjectWithProperties.__init__(self, self.bus,
 
1740
688
                                          self.dbus_object_path)
 
1742
 
    def notifychangeproperty(transform_func, dbus_name,
 
1743
 
                             type_func=lambda x: x,
 
1745
 
                             invalidate_only=False,
 
1746
 
                             _interface=_interface):
 
1747
 
        """ Modify a variable so that it's a property which announces
 
1748
 
        its changes to DBus.
 
1750
 
        transform_fun: Function that takes a value and a variant_level
 
1751
 
                       and transforms it to a D-Bus type.
 
1752
 
        dbus_name: D-Bus name of the variable
 
1753
 
        type_func: Function that transform the value before sending it
 
1754
 
                   to the D-Bus.  Default: no transform
 
1755
 
        variant_level: D-Bus variant level.  Default: 1
 
1757
 
        attrname = "_{}".format(dbus_name)
 
1759
 
        def setter(self, value):
 
1760
 
            if hasattr(self, "dbus_object_path"):
 
1761
 
                if (not hasattr(self, attrname) or
 
1762
 
                    type_func(getattr(self, attrname, None))
 
1763
 
                    != type_func(value)):
 
1765
 
                        self.PropertiesChanged(
 
1766
 
                            _interface, dbus.Dictionary(),
 
1767
 
                            dbus.Array((dbus_name, )))
 
1769
 
                        dbus_value = transform_func(
 
1771
 
                            variant_level=variant_level)
 
1772
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1774
 
                        self.PropertiesChanged(
 
1776
 
                            dbus.Dictionary({dbus.String(dbus_name):
 
1779
 
            setattr(self, attrname, value)
 
1781
 
        return property(lambda self: getattr(self, attrname), setter)
 
1783
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1784
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1787
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1788
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1790
 
    checker = notifychangeproperty(
 
1791
 
        dbus.Boolean, "CheckerRunning",
 
1792
 
        type_func=lambda checker: checker is not None)
 
1793
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1795
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1796
 
                                               "LastCheckerStatus")
 
1797
 
    last_approval_request = notifychangeproperty(
 
1798
 
        datetime_to_dbus, "LastApprovalRequest")
 
1799
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1800
 
                                               "ApprovedByDefault")
 
1801
 
    approval_delay = notifychangeproperty(
 
1802
 
        dbus.UInt64, "ApprovalDelay",
 
1803
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1804
 
    approval_duration = notifychangeproperty(
 
1805
 
        dbus.UInt64, "ApprovalDuration",
 
1806
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1807
 
    host = notifychangeproperty(dbus.String, "Host")
 
1808
 
    timeout = notifychangeproperty(
 
1809
 
        dbus.UInt64, "Timeout",
 
1810
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1811
 
    extended_timeout = notifychangeproperty(
 
1812
 
        dbus.UInt64, "ExtendedTimeout",
 
1813
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1814
 
    interval = notifychangeproperty(
 
1815
 
        dbus.UInt64, "Interval",
 
1816
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1817
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1818
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1819
 
                                  invalidate_only=True)
 
1821
 
    del notifychangeproperty
 
 
691
    def _datetime_to_dbus(dt, variant_level=0):
 
 
692
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
693
        return dbus.String(dt.isoformat(),
 
 
694
                           variant_level=variant_level)
 
 
697
        oldstate = getattr(self, u"enabled", False)
 
 
698
        r = Client.enable(self)
 
 
699
        if oldstate != self.enabled:
 
 
701
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
702
                                 dbus.Boolean(True, variant_level=1))
 
 
703
            self.PropertyChanged(
 
 
704
                dbus.String(u"last_enabled"),
 
 
705
                self._datetime_to_dbus(self.last_enabled,
 
 
709
    def disable(self, quiet = False):
 
 
710
        oldstate = getattr(self, u"enabled", False)
 
 
711
        r = Client.disable(self, quiet=quiet)
 
 
712
        if not quiet and oldstate != self.enabled:
 
 
714
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
715
                                 dbus.Boolean(False, variant_level=1))
 
1823
718
    def __del__(self, *args, **kwargs):
 
1825
720
            self.remove_from_connection()
 
1826
721
        except LookupError:
 
1828
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
 
723
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
1829
724
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
1830
725
        Client.__del__(self, *args, **kwargs)
 
1832
 
    def checker_callback(self, source, condition,
 
1833
 
                         connection, command, *args, **kwargs):
 
1834
 
        ret = Client.checker_callback(self, source, condition,
 
1835
 
                                      connection, command, *args,
 
1837
 
        exitstatus = self.last_checker_status
 
 
727
    def checker_callback(self, pid, condition, command,
 
 
729
        self.checker_callback_tag = None
 
 
732
        self.PropertyChanged(dbus.String(u"checker_running"),
 
 
733
                             dbus.Boolean(False, variant_level=1))
 
 
734
        if os.WIFEXITED(condition):
 
 
735
            exitstatus = os.WEXITSTATUS(condition)
 
1839
736
            # Emit D-Bus signal
 
1840
737
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
1841
 
                                  # This is specific to GNU libC
 
1842
 
                                  dbus.Int64(exitstatus << 8),
 
 
738
                                  dbus.Int64(condition),
 
1843
739
                                  dbus.String(command))
 
1845
741
            # Emit D-Bus signal
 
1846
742
            self.CheckerCompleted(dbus.Int16(-1),
 
1848
 
                                      # This is specific to GNU libC
 
1850
 
                                      | self.last_checker_signal),
 
 
743
                                  dbus.Int64(condition),
 
1851
744
                                  dbus.String(command))
 
 
746
        return Client.checker_callback(self, pid, condition, command,
 
 
749
    def checked_ok(self, *args, **kwargs):
 
 
750
        r = Client.checked_ok(self, *args, **kwargs)
 
 
752
        self.PropertyChanged(
 
 
753
            dbus.String(u"last_checked_ok"),
 
 
754
            (self._datetime_to_dbus(self.last_checked_ok,
 
1854
758
    def start_checker(self, *args, **kwargs):
 
1855
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
 
759
        old_checker = self.checker
 
 
760
        if self.checker is not None:
 
 
761
            old_checker_pid = self.checker.pid
 
 
763
            old_checker_pid = None
 
1856
764
        r = Client.start_checker(self, *args, **kwargs)
 
1857
765
        # Only if new checker process was started
 
1858
766
        if (self.checker is not None
 
1859
767
            and old_checker_pid != self.checker.pid):
 
1860
768
            # Emit D-Bus signal
 
1861
769
            self.CheckerStarted(self.current_checker_command)
 
1864
 
    def _reset_approved(self):
 
1865
 
        self.approved = None
 
1868
 
    def approve(self, value=True):
 
1869
 
        self.approved = value
 
1870
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
1871
 
                             * 1000), self._reset_approved)
 
1872
 
        self.send_changedstate()
 
1874
 
    #  D-Bus methods, signals & properties
 
 
770
            self.PropertyChanged(
 
 
771
                dbus.String(u"checker_running"),
 
 
772
                dbus.Boolean(True, variant_level=1))
 
 
775
    def stop_checker(self, *args, **kwargs):
 
 
776
        old_checker = getattr(self, u"checker", None)
 
 
777
        r = Client.stop_checker(self, *args, **kwargs)
 
 
778
        if (old_checker is not None
 
 
779
            and getattr(self, u"checker", None) is None):
 
 
780
            self.PropertyChanged(dbus.String(u"checker_running"),
 
 
781
                                 dbus.Boolean(False, variant_level=1))
 
 
784
    ## D-Bus methods & signals
 
 
785
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
 
788
    @dbus.service.method(_interface)
 
 
790
        return self.checked_ok()
 
1880
792
    # CheckerCompleted - signal
 
1881
 
    @dbus.service.signal(_interface, signature="nxs")
 
 
793
    @dbus.service.signal(_interface, signature=u"nxs")
 
1882
794
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
1886
798
    # CheckerStarted - signal
 
1887
 
    @dbus.service.signal(_interface, signature="s")
 
 
799
    @dbus.service.signal(_interface, signature=u"s")
 
1888
800
    def CheckerStarted(self, command):
 
1892
804
    # PropertyChanged - signal
 
1893
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1894
 
    @dbus.service.signal(_interface, signature="sv")
 
 
805
    @dbus.service.signal(_interface, signature=u"sv")
 
1895
806
    def PropertyChanged(self, property, value):
 
1899
810
    # GotSecret - signal
 
1900
811
    @dbus.service.signal(_interface)
 
1901
812
    def GotSecret(self):
 
1903
 
        Is sent after a successful transfer of secret from the Mandos
 
1904
 
        server to mandos-client
 
1908
816
    # Rejected - signal
 
1909
 
    @dbus.service.signal(_interface, signature="s")
 
1910
 
    def Rejected(self, reason):
 
 
817
    @dbus.service.signal(_interface)
 
1914
 
    # NeedApproval - signal
 
1915
 
    @dbus.service.signal(_interface, signature="tb")
 
1916
 
    def NeedApproval(self, timeout, default):
 
1918
 
        return self.need_approval()
 
1923
 
    @dbus.service.method(_interface, in_signature="b")
 
1924
 
    def Approve(self, value):
 
1927
 
    # CheckedOK - method
 
1928
 
    @dbus.service.method(_interface)
 
1929
 
    def CheckedOK(self):
 
1932
822
    # Enable - method
 
1933
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1934
823
    @dbus.service.method(_interface)
 
1935
824
    def Enable(self):
 
1939
828
    # StartChecker - method
 
1940
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1941
829
    @dbus.service.method(_interface)
 
1942
830
    def StartChecker(self):
 
1944
832
        self.start_checker()
 
1946
834
    # Disable - method
 
1947
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1948
835
    @dbus.service.method(_interface)
 
1949
836
    def Disable(self):
 
1953
840
    # StopChecker - method
 
1954
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1955
841
    @dbus.service.method(_interface)
 
1956
842
    def StopChecker(self):
 
1957
843
        self.stop_checker()
 
1961
 
    # ApprovalPending - property
 
1962
 
    @dbus_service_property(_interface, signature="b", access="read")
 
1963
 
    def ApprovalPending_dbus_property(self):
 
1964
 
        return dbus.Boolean(bool(self.approvals_pending))
 
1966
 
    # ApprovedByDefault - property
 
1967
 
    @dbus_service_property(_interface,
 
1970
 
    def ApprovedByDefault_dbus_property(self, value=None):
 
1971
 
        if value is None:       # get
 
1972
 
            return dbus.Boolean(self.approved_by_default)
 
1973
 
        self.approved_by_default = bool(value)
 
1975
 
    # ApprovalDelay - property
 
1976
 
    @dbus_service_property(_interface,
 
1979
 
    def ApprovalDelay_dbus_property(self, value=None):
 
1980
 
        if value is None:       # get
 
1981
 
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1983
 
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1985
 
    # ApprovalDuration - property
 
1986
 
    @dbus_service_property(_interface,
 
1989
 
    def ApprovalDuration_dbus_property(self, value=None):
 
1990
 
        if value is None:       # get
 
1991
 
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1993
 
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1997
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1998
 
    @dbus_service_property(_interface, signature="s", access="read")
 
1999
 
    def Name_dbus_property(self):
 
 
846
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
847
    def name_dbus_property(self):
 
2000
848
        return dbus.String(self.name)
 
2002
 
    # Fingerprint - property
 
2004
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2005
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2006
 
    def Fingerprint_dbus_property(self):
 
 
850
    # fingerprint - property
 
 
851
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
852
    def fingerprint_dbus_property(self):
 
2007
853
        return dbus.String(self.fingerprint)
 
2010
 
    @dbus_service_property(_interface,
 
2013
 
    def Host_dbus_property(self, value=None):
 
 
856
    @dbus_service_property(_interface, signature=u"s",
 
 
858
    def host_dbus_property(self, value=None):
 
2014
859
        if value is None:       # get
 
2015
860
            return dbus.String(self.host)
 
2016
 
        self.host = str(value)
 
2018
 
    # Created - property
 
2020
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2021
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2022
 
    def Created_dbus_property(self):
 
2023
 
        return datetime_to_dbus(self.created)
 
2025
 
    # LastEnabled - property
 
2026
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2027
 
    def LastEnabled_dbus_property(self):
 
2028
 
        return datetime_to_dbus(self.last_enabled)
 
2030
 
    # Enabled - property
 
2031
 
    @dbus_service_property(_interface,
 
2034
 
    def Enabled_dbus_property(self, value=None):
 
 
863
        self.PropertyChanged(dbus.String(u"host"),
 
 
864
                             dbus.String(value, variant_level=1))
 
 
867
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
868
    def created_dbus_property(self):
 
 
869
        return dbus.String(self._datetime_to_dbus(self.created))
 
 
871
    # last_enabled - property
 
 
872
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
873
    def last_enabled_dbus_property(self):
 
 
874
        if self.last_enabled is None:
 
 
875
            return dbus.String(u"")
 
 
876
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
 
879
    @dbus_service_property(_interface, signature=u"b",
 
 
881
    def enabled_dbus_property(self, value=None):
 
2035
882
        if value is None:       # get
 
2036
883
            return dbus.Boolean(self.enabled)
 
2042
 
    # LastCheckedOK - property
 
2043
 
    @dbus_service_property(_interface,
 
2046
 
    def LastCheckedOK_dbus_property(self, value=None):
 
 
889
    # last_checked_ok - property
 
 
890
    @dbus_service_property(_interface, signature=u"s",
 
 
892
    def last_checked_ok_dbus_property(self, value=None):
 
2047
893
        if value is not None:
 
2048
894
            self.checked_ok()
 
2050
 
        return datetime_to_dbus(self.last_checked_ok)
 
2052
 
    # LastCheckerStatus - property
 
2053
 
    @dbus_service_property(_interface, signature="n", access="read")
 
2054
 
    def LastCheckerStatus_dbus_property(self):
 
2055
 
        return dbus.Int16(self.last_checker_status)
 
2057
 
    # Expires - property
 
2058
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2059
 
    def Expires_dbus_property(self):
 
2060
 
        return datetime_to_dbus(self.expires)
 
2062
 
    # LastApprovalRequest - property
 
2063
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2064
 
    def LastApprovalRequest_dbus_property(self):
 
2065
 
        return datetime_to_dbus(self.last_approval_request)
 
2067
 
    # Timeout - property
 
2068
 
    @dbus_service_property(_interface,
 
2071
 
    def Timeout_dbus_property(self, value=None):
 
 
896
        if self.last_checked_ok is None:
 
 
897
            return dbus.String(u"")
 
 
898
        return dbus.String(self._datetime_to_dbus(self
 
 
902
    @dbus_service_property(_interface, signature=u"t",
 
 
904
    def timeout_dbus_property(self, value=None):
 
2072
905
        if value is None:       # get
 
2073
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
2074
 
        old_timeout = self.timeout
 
 
906
            return dbus.UInt64(self.timeout_milliseconds())
 
2075
907
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
2076
 
        # Reschedule disabling
 
2078
 
            now = datetime.datetime.utcnow()
 
2079
 
            self.expires += self.timeout - old_timeout
 
2080
 
            if self.expires <= now:
 
2081
 
                # The timeout has passed
 
2084
 
                if (getattr(self, "disable_initiator_tag", None)
 
2087
 
                GLib.source_remove(self.disable_initiator_tag)
 
2088
 
                self.disable_initiator_tag = GLib.timeout_add(
 
2089
 
                    int((self.expires - now).total_seconds() * 1000),
 
2092
 
    # ExtendedTimeout - property
 
2093
 
    @dbus_service_property(_interface,
 
2096
 
    def ExtendedTimeout_dbus_property(self, value=None):
 
2097
 
        if value is None:       # get
 
2098
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
2100
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
2102
 
    # Interval - property
 
2103
 
    @dbus_service_property(_interface,
 
2106
 
    def Interval_dbus_property(self, value=None):
 
2107
 
        if value is None:       # get
 
2108
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
 
909
        self.PropertyChanged(dbus.String(u"timeout"),
 
 
910
                             dbus.UInt64(value, variant_level=1))
 
 
911
        if getattr(self, u"disable_initiator_tag", None) is None:
 
 
914
        gobject.source_remove(self.disable_initiator_tag)
 
 
915
        self.disable_initiator_tag = None
 
 
917
                       _timedelta_to_milliseconds((self
 
 
923
            # The timeout has passed
 
 
926
            self.disable_initiator_tag = (gobject.timeout_add
 
 
927
                                          (time_to_die, self.disable))
 
 
929
    # interval - property
 
 
930
    @dbus_service_property(_interface, signature=u"t",
 
 
932
    def interval_dbus_property(self, value=None):
 
 
933
        if value is None:       # get
 
 
934
            return dbus.UInt64(self.interval_milliseconds())
 
2109
935
        self.interval = datetime.timedelta(0, 0, 0, value)
 
2110
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
 
937
        self.PropertyChanged(dbus.String(u"interval"),
 
 
938
                             dbus.UInt64(value, variant_level=1))
 
 
939
        if getattr(self, u"checker_initiator_tag", None) is None:
 
2113
 
            # Reschedule checker run
 
2114
 
            GLib.source_remove(self.checker_initiator_tag)
 
2115
 
            self.checker_initiator_tag = GLib.timeout_add(
 
2116
 
                value, self.start_checker)
 
2117
 
            self.start_checker()  # Start one now, too
 
 
941
        # Reschedule checker run
 
 
942
        gobject.source_remove(self.checker_initiator_tag)
 
 
943
        self.checker_initiator_tag = (gobject.timeout_add
 
 
944
                                      (value, self.start_checker))
 
 
945
        self.start_checker()    # Start one now, too
 
2119
 
    # Checker - property
 
2120
 
    @dbus_service_property(_interface,
 
2123
 
    def Checker_dbus_property(self, value=None):
 
 
948
    @dbus_service_property(_interface, signature=u"s",
 
 
950
    def checker_dbus_property(self, value=None):
 
2124
951
        if value is None:       # get
 
2125
952
            return dbus.String(self.checker_command)
 
2126
 
        self.checker_command = str(value)
 
2128
 
    # CheckerRunning - property
 
2129
 
    @dbus_service_property(_interface,
 
2132
 
    def CheckerRunning_dbus_property(self, value=None):
 
 
953
        self.checker_command = value
 
 
955
        self.PropertyChanged(dbus.String(u"checker"),
 
 
956
                             dbus.String(self.checker_command,
 
 
959
    # checker_running - property
 
 
960
    @dbus_service_property(_interface, signature=u"b",
 
 
962
    def checker_running_dbus_property(self, value=None):
 
2133
963
        if value is None:       # get
 
2134
964
            return dbus.Boolean(self.checker is not None)
 
2136
966
            self.start_checker()
 
2138
968
            self.stop_checker()
 
2140
 
    # ObjectPath - property
 
2142
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2143
 
         "org.freedesktop.DBus.Deprecated": "true"})
 
2144
 
    @dbus_service_property(_interface, signature="o", access="read")
 
2145
 
    def ObjectPath_dbus_property(self):
 
2146
 
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
2150
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2152
 
    @dbus_service_property(_interface,
 
2156
 
    def Secret_dbus_property(self, value):
 
2157
 
        self.secret = bytes(value)
 
 
970
    # object_path - property
 
 
971
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
 
972
    def object_path_dbus_property(self):
 
 
973
        return self.dbus_object_path # is already a dbus.ObjectPath
 
 
976
    @dbus_service_property(_interface, signature=u"ay",
 
 
977
                           access=u"write", byte_arrays=True)
 
 
978
    def secret_dbus_property(self, value):
 
 
979
        self.secret = str(value)
 
2162
 
class ProxyClient(object):
 
2163
 
    def __init__(self, child_pipe, fpr, address):
 
2164
 
        self._pipe = child_pipe
 
2165
 
        self._pipe.send(('init', fpr, address))
 
2166
 
        if not self._pipe.recv():
 
2169
 
    def __getattribute__(self, name):
 
2171
 
            return super(ProxyClient, self).__getattribute__(name)
 
2172
 
        self._pipe.send(('getattr', name))
 
2173
 
        data = self._pipe.recv()
 
2174
 
        if data[0] == 'data':
 
2176
 
        if data[0] == 'function':
 
2178
 
            def func(*args, **kwargs):
 
2179
 
                self._pipe.send(('funcall', name, args, kwargs))
 
2180
 
                return self._pipe.recv()[1]
 
2184
 
    def __setattr__(self, name, value):
 
2186
 
            return super(ProxyClient, self).__setattr__(name, value)
 
2187
 
        self._pipe.send(('setattr', name, value))
 
2190
984
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2191
985
    """A class to handle client connections.
 
2193
987
    Instantiated once for each connection to handle it.
 
2194
988
    Note: This will run in its own forked process."""
 
2196
990
    def handle(self):
 
2197
 
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2198
 
            logger.info("TCP connection from: %s",
 
2199
 
                        str(self.client_address))
 
2200
 
            logger.debug("Pipe FD: %d",
 
2201
 
                         self.server.child_pipe.fileno())
 
2203
 
            session = gnutls.ClientSession(self.request)
 
2205
 
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2206
 
            #                       "+AES-256-CBC", "+SHA1",
 
2207
 
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
991
        logger.info(u"TCP connection from: %s",
 
 
992
                    unicode(self.client_address))
 
 
993
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
 
 
994
        # Open IPC pipe to parent process
 
 
995
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
 
996
            session = (gnutls.connection
 
 
997
                       .ClientSession(self.request,
 
 
1001
            line = self.request.makefile().readline()
 
 
1002
            logger.debug(u"Protocol version: %r", line)
 
 
1004
                if int(line.strip().split()[0]) > 1:
 
 
1006
            except (ValueError, IndexError, RuntimeError), error:
 
 
1007
                logger.error(u"Unknown protocol version: %s", error)
 
 
1010
            # Note: gnutls.connection.X509Credentials is really a
 
 
1011
            # generic GnuTLS certificate credentials object so long as
 
 
1012
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1013
            # here despite using OpenPGP certificates.
 
 
1015
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
 
1016
            #                      u"+AES-256-CBC", u"+SHA1",
 
 
1017
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
2209
1019
            # Use a fallback default, since this MUST be set.
 
2210
1020
            priority = self.server.gnutls_priority
 
2211
1021
            if priority is None:
 
2213
 
            gnutls.priority_set_direct(session._c_object,
 
2214
 
                                       priority.encode("utf-8"),
 
2217
 
            # Start communication using the Mandos protocol
 
2218
 
            # Get protocol number
 
2219
 
            line = self.request.makefile().readline()
 
2220
 
            logger.debug("Protocol version: %r", line)
 
2222
 
                if int(line.strip().split()[0]) > 1:
 
2223
 
                    raise RuntimeError(line)
 
2224
 
            except (ValueError, IndexError, RuntimeError) as error:
 
2225
 
                logger.error("Unknown protocol version: %s", error)
 
2228
 
            # Start GnuTLS connection
 
 
1022
                priority = u"NORMAL"
 
 
1023
            (gnutls.library.functions
 
 
1024
             .gnutls_priority_set_direct(session._c_object,
 
2230
1028
                session.handshake()
 
2231
 
            except gnutls.Error as error:
 
2232
 
                logger.warning("Handshake failed: %s", error)
 
 
1029
            except gnutls.errors.GNUTLSError, error:
 
 
1030
                logger.warning(u"Handshake failed: %s", error)
 
2233
1031
                # Do not run session.bye() here: the session is not
 
2234
1032
                # established.  Just abandon the request.
 
2236
 
            logger.debug("Handshake succeeded")
 
2238
 
            approval_required = False
 
 
1034
            logger.debug(u"Handshake succeeded")
 
2241
 
                    fpr = self.fingerprint(
 
2242
 
                        self.peer_certificate(session))
 
2243
 
                except (TypeError, gnutls.Error) as error:
 
2244
 
                    logger.warning("Bad certificate: %s", error)
 
2246
 
                logger.debug("Fingerprint: %s", fpr)
 
2249
 
                    client = ProxyClient(child_pipe, fpr,
 
2250
 
                                         self.client_address)
 
2254
 
                if client.approval_delay:
 
2255
 
                    delay = client.approval_delay
 
2256
 
                    client.approvals_pending += 1
 
2257
 
                    approval_required = True
 
2260
 
                    if not client.enabled:
 
2261
 
                        logger.info("Client %s is disabled",
 
2263
 
                        if self.server.use_dbus:
 
2265
 
                            client.Rejected("Disabled")
 
2268
 
                    if client.approved or not client.approval_delay:
 
2269
 
                        # We are approved or approval is disabled
 
2271
 
                    elif client.approved is None:
 
2272
 
                        logger.info("Client %s needs approval",
 
2274
 
                        if self.server.use_dbus:
 
2276
 
                            client.NeedApproval(
 
2277
 
                                client.approval_delay.total_seconds()
 
2278
 
                                * 1000, client.approved_by_default)
 
2280
 
                        logger.warning("Client %s was not approved",
 
2282
 
                        if self.server.use_dbus:
 
2284
 
                            client.Rejected("Denied")
 
2287
 
                    # wait until timeout or approved
 
2288
 
                    time = datetime.datetime.now()
 
2289
 
                    client.changedstate.acquire()
 
2290
 
                    client.changedstate.wait(delay.total_seconds())
 
2291
 
                    client.changedstate.release()
 
2292
 
                    time2 = datetime.datetime.now()
 
2293
 
                    if (time2 - time) >= delay:
 
2294
 
                        if not client.approved_by_default:
 
2295
 
                            logger.warning("Client %s timed out while"
 
2296
 
                                           " waiting for approval",
 
2298
 
                            if self.server.use_dbus:
 
2300
 
                                client.Rejected("Approval timed out")
 
2305
 
                        delay -= time2 - time
 
2308
 
                    session.send(client.secret)
 
2309
 
                except gnutls.Error as error:
 
2310
 
                    logger.warning("gnutls send failed",
 
2314
 
                logger.info("Sending secret to %s", client.name)
 
2315
 
                # bump the timeout using extended_timeout
 
2316
 
                client.bump_timeout(client.extended_timeout)
 
2317
 
                if self.server.use_dbus:
 
2322
 
                if approval_required:
 
2323
 
                    client.approvals_pending -= 1
 
2326
 
                except gnutls.Error as error:
 
2327
 
                    logger.warning("GnuTLS bye failed",
 
 
1036
                fpr = self.fingerprint(self.peer_certificate(session))
 
 
1037
            except (TypeError, gnutls.errors.GNUTLSError), error:
 
 
1038
                logger.warning(u"Bad certificate: %s", error)
 
 
1041
            logger.debug(u"Fingerprint: %s", fpr)
 
 
1043
            for c in self.server.clients:
 
 
1044
                if c.fingerprint == fpr:
 
 
1048
                ipc.write(u"NOTFOUND %s %s\n"
 
 
1049
                          % (fpr, unicode(self.client_address)))
 
 
1052
            # Have to check if client.still_valid(), since it is
 
 
1053
            # possible that the client timed out while establishing
 
 
1054
            # the GnuTLS session.
 
 
1055
            if not client.still_valid():
 
 
1056
                ipc.write(u"INVALID %s\n" % client.name)
 
 
1059
            ipc.write(u"SENDING %s\n" % client.name)
 
 
1061
            while sent_size < len(client.secret):
 
 
1062
                sent = session.send(client.secret[sent_size:])
 
 
1063
                logger.debug(u"Sent: %d, remaining: %d",
 
 
1064
                             sent, len(client.secret)
 
 
1065
                             - (sent_size + sent))
 
2331
1070
    def peer_certificate(session):
 
2332
1071
        "Return the peer's OpenPGP certificate as a bytestring"
 
2333
1072
        # If not an OpenPGP certificate...
 
2334
 
        if (gnutls.certificate_type_get(session._c_object)
 
2335
 
            != gnutls.CRT_OPENPGP):
 
2336
 
            # ...return invalid data
 
 
1073
        if (gnutls.library.functions
 
 
1074
            .gnutls_certificate_type_get(session._c_object)
 
 
1075
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1076
            # ...do the normal thing
 
 
1077
            return session.peer_certificate
 
2338
1078
        list_size = ctypes.c_uint(1)
 
2339
 
        cert_list = (gnutls.certificate_get_peers
 
 
1079
        cert_list = (gnutls.library.functions
 
 
1080
                     .gnutls_certificate_get_peers
 
2340
1081
                     (session._c_object, ctypes.byref(list_size)))
 
2341
1082
        if not bool(cert_list) and list_size.value != 0:
 
2342
 
            raise gnutls.Error("error getting peer certificate")
 
 
1083
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
2343
1085
        if list_size.value == 0:
 
2345
1087
        cert = cert_list[0]
 
2346
1088
        return ctypes.string_at(cert.data, cert.size)
 
2349
1091
    def fingerprint(openpgp):
 
2350
1092
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2351
1093
        # New GnuTLS "datum" with the OpenPGP public key
 
2352
 
        datum = gnutls.datum_t(
 
2353
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2354
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2355
 
            ctypes.c_uint(len(openpgp)))
 
 
1094
        datum = (gnutls.library.types
 
 
1095
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1098
                                 ctypes.c_uint(len(openpgp))))
 
2356
1099
        # New empty GnuTLS certificate
 
2357
 
        crt = gnutls.openpgp_crt_t()
 
2358
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1100
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1101
        (gnutls.library.functions
 
 
1102
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2359
1103
        # Import the OpenPGP public key into the certificate
 
2360
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2361
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1104
        (gnutls.library.functions
 
 
1105
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1106
                                    gnutls.library.constants
 
 
1107
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2362
1108
        # Verify the self signature in the key
 
2363
1109
        crtverify = ctypes.c_uint()
 
2364
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2365
 
                                       ctypes.byref(crtverify))
 
 
1110
        (gnutls.library.functions
 
 
1111
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1112
                                         ctypes.byref(crtverify)))
 
2366
1113
        if crtverify.value != 0:
 
2367
 
            gnutls.openpgp_crt_deinit(crt)
 
2368
 
            raise gnutls.CertificateSecurityError(code
 
 
1114
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1115
            raise (gnutls.errors.CertificateSecurityError
 
2370
1117
        # New buffer for the fingerprint
 
2371
1118
        buf = ctypes.create_string_buffer(20)
 
2372
1119
        buf_len = ctypes.c_size_t()
 
2373
1120
        # Get the fingerprint from the certificate into the buffer
 
2374
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2375
 
                                           ctypes.byref(buf_len))
 
 
1121
        (gnutls.library.functions
 
 
1122
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1123
                                             ctypes.byref(buf_len)))
 
2376
1124
        # Deinit the certificate
 
2377
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1125
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2378
1126
        # Convert the buffer to a Python bytestring
 
2379
1127
        fpr = ctypes.string_at(buf, buf_len.value)
 
2380
1128
        # Convert the bytestring to hexadecimal notation
 
2381
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
 
1129
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
2385
 
class MultiprocessingMixIn(object):
 
2386
 
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2388
 
    def sub_process_main(self, request, address):
 
2390
 
            self.finish_request(request, address)
 
2392
 
            self.handle_error(request, address)
 
2393
 
        self.close_request(request)
 
2395
 
    def process_request(self, request, address):
 
2396
 
        """Start a new process to process the request."""
 
2397
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2398
 
                                       args=(request, address))
 
2403
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2404
 
    """ adds a pipe to the MixIn """
 
 
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
 
 
1134
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
2406
1135
    def process_request(self, request, client_address):
 
2407
1136
        """Overrides and wraps the original process_request().
 
2409
1138
        This function creates a new pipe in self.pipe
 
2411
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2413
 
        proc = MultiprocessingMixIn.process_request(self, request,
 
2415
 
        self.child_pipe.close()
 
2416
 
        self.add_pipe(parent_pipe, proc)
 
2418
 
    def add_pipe(self, parent_pipe, proc):
 
 
1140
        self.pipe = os.pipe()
 
 
1141
        super(ForkingMixInWithPipe,
 
 
1142
              self).process_request(request, client_address)
 
 
1143
        os.close(self.pipe[1])  # close write end
 
 
1144
        self.add_pipe(self.pipe[0])
 
 
1145
    def add_pipe(self, pipe):
 
2419
1146
        """Dummy function; override as necessary"""
 
2420
 
        raise NotImplementedError()
 
2423
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
 
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
 
2424
1151
                     socketserver.TCPServer, object):
 
2425
1152
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2428
1155
        enabled:        Boolean; whether this server is activated yet
 
2429
1156
        interface:      None or a network interface name (string)
 
2430
1157
        use_ipv6:       Boolean; to use IPv6 or not
 
2433
1159
    def __init__(self, server_address, RequestHandlerClass,
 
2437
 
        """If socketfd is set, use that file descriptor instead of
 
2438
 
        creating a new one with socket.socket().
 
 
1160
                 interface=None, use_ipv6=True):
 
2440
1161
        self.interface = interface
 
2442
1163
            self.address_family = socket.AF_INET6
 
2443
 
        if socketfd is not None:
 
2444
 
            # Save the file descriptor
 
2445
 
            self.socketfd = socketfd
 
2446
 
            # Save the original socket.socket() function
 
2447
 
            self.socket_socket = socket.socket
 
2449
 
            # To implement --socket, we monkey patch socket.socket.
 
2451
 
            # (When socketserver.TCPServer is a new-style class, we
 
2452
 
            # could make self.socket into a property instead of monkey
 
2453
 
            # patching socket.socket.)
 
2455
 
            # Create a one-time-only replacement for socket.socket()
 
2456
 
            @functools.wraps(socket.socket)
 
2457
 
            def socket_wrapper(*args, **kwargs):
 
2458
 
                # Restore original function so subsequent calls are
 
2460
 
                socket.socket = self.socket_socket
 
2461
 
                del self.socket_socket
 
2462
 
                # This time only, return a new socket object from the
 
2463
 
                # saved file descriptor.
 
2464
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2465
 
            # Replace socket.socket() function with wrapper
 
2466
 
            socket.socket = socket_wrapper
 
2467
 
        # The socketserver.TCPServer.__init__ will call
 
2468
 
        # socket.socket(), which might be our replacement,
 
2469
 
        # socket_wrapper(), if socketfd was set.
 
2470
1164
        socketserver.TCPServer.__init__(self, server_address,
 
2471
1165
                                        RequestHandlerClass)
 
2473
1166
    def server_bind(self):
 
2474
1167
        """This overrides the normal server_bind() function
 
2475
1168
        to bind to an interface if one was specified, and also NOT to
 
2476
1169
        bind to an address or port if they were not specified."""
 
2477
 
        global SO_BINDTODEVICE
 
2478
1170
        if self.interface is not None:
 
2479
1171
            if SO_BINDTODEVICE is None:
 
2480
 
                # Fall back to a hard-coded value which seems to be
 
2482
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2483
 
                SO_BINDTODEVICE = 25
 
2485
 
                self.socket.setsockopt(
 
2486
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2487
 
                    (self.interface + "\0").encode("utf-8"))
 
2488
 
            except socket.error as error:
 
2489
 
                if error.errno == errno.EPERM:
 
2490
 
                    logger.error("No permission to bind to"
 
2491
 
                                 " interface %s", self.interface)
 
2492
 
                elif error.errno == errno.ENOPROTOOPT:
 
2493
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2494
 
                                 " cannot bind to interface %s",
 
2496
 
                elif error.errno == errno.ENODEV:
 
2497
 
                    logger.error("Interface %s does not exist,"
 
2498
 
                                 " cannot bind", self.interface)
 
 
1172
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
 
1173
                             u" cannot bind to interface %s",
 
 
1177
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1181
                except socket.error, error:
 
 
1182
                    if error[0] == errno.EPERM:
 
 
1183
                        logger.error(u"No permission to"
 
 
1184
                                     u" bind to interface %s",
 
 
1186
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1187
                        logger.error(u"SO_BINDTODEVICE not available;"
 
 
1188
                                     u" cannot bind to interface %s",
 
2501
1192
        # Only bind(2) the socket if we really need to.
 
2502
1193
        if self.server_address[0] or self.server_address[1]:
 
2503
1194
            if not self.server_address[0]:
 
2504
1195
                if self.address_family == socket.AF_INET6:
 
2505
 
                    any_address = "::"  # in6addr_any
 
 
1196
                    any_address = u"::" # in6addr_any
 
2507
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1198
                    any_address = socket.INADDR_ANY
 
2508
1199
                self.server_address = (any_address,
 
2509
1200
                                       self.server_address[1])
 
2510
1201
            elif not self.server_address[1]:
 
2511
 
                self.server_address = (self.server_address[0], 0)
 
 
1202
                self.server_address = (self.server_address[0],
 
2512
1204
#                 if self.interface:
 
2513
1205
#                     self.server_address = (self.server_address[0],
 
 
2521
1213
class MandosServer(IPv6_TCPServer):
 
2522
1214
    """Mandos server.
 
2525
1217
        clients:        set of Client objects
 
2526
1218
        gnutls_priority GnuTLS priority string
 
2527
1219
        use_dbus:       Boolean; to emit D-Bus signals or not
 
2529
 
    Assumes a GLib.MainLoop event loop.
 
 
1221
    Assumes a gobject.MainLoop event loop.
 
2532
1223
    def __init__(self, server_address, RequestHandlerClass,
 
2536
 
                 gnutls_priority=None,
 
 
1224
                 interface=None, use_ipv6=True, clients=None,
 
 
1225
                 gnutls_priority=None, use_dbus=True):
 
2539
1226
        self.enabled = False
 
2540
1227
        self.clients = clients
 
2541
1228
        if self.clients is None:
 
 
1229
            self.clients = set()
 
2543
1230
        self.use_dbus = use_dbus
 
2544
1231
        self.gnutls_priority = gnutls_priority
 
2545
1232
        IPv6_TCPServer.__init__(self, server_address,
 
2546
1233
                                RequestHandlerClass,
 
2547
 
                                interface=interface,
 
 
1234
                                interface = interface,
 
 
1235
                                use_ipv6 = use_ipv6)
 
2551
1236
    def server_activate(self):
 
2552
1237
        if self.enabled:
 
2553
1238
            return socketserver.TCPServer.server_activate(self)
 
2555
1239
    def enable(self):
 
2556
1240
        self.enabled = True
 
2558
 
    def add_pipe(self, parent_pipe, proc):
 
 
1241
    def add_pipe(self, pipe):
 
2559
1242
        # Call "handle_ipc" for both data and EOF events
 
2561
 
            parent_pipe.fileno(),
 
2562
 
            GLib.IO_IN | GLib.IO_HUP,
 
2563
 
            functools.partial(self.handle_ipc,
 
2564
 
                              parent_pipe=parent_pipe,
 
2567
 
    def handle_ipc(self, source, condition,
 
2570
 
                   client_object=None):
 
2571
 
        # error, or the other end of multiprocessing.Pipe has closed
 
2572
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2573
 
            # Wait for other process to exit
 
2577
 
        # Read a request from the child
 
2578
 
        request = parent_pipe.recv()
 
2579
 
        command = request[0]
 
2581
 
        if command == 'init':
 
2582
 
            fpr = request[1].decode("ascii")
 
2583
 
            address = request[2]
 
2585
 
            for c in self.clients.values():
 
2586
 
                if c.fingerprint == fpr:
 
2590
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2591
 
                            "dress: %s", fpr, address)
 
2594
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
2596
 
                parent_pipe.send(False)
 
2600
 
                parent_pipe.fileno(),
 
2601
 
                GLib.IO_IN | GLib.IO_HUP,
 
2602
 
                functools.partial(self.handle_ipc,
 
2603
 
                                  parent_pipe=parent_pipe,
 
2605
 
                                  client_object=client))
 
2606
 
            parent_pipe.send(True)
 
2607
 
            # remove the old hook in favor of the new above hook on
 
2610
 
        if command == 'funcall':
 
2611
 
            funcname = request[1]
 
2615
 
            parent_pipe.send(('data', getattr(client_object,
 
2619
 
        if command == 'getattr':
 
2620
 
            attrname = request[1]
 
2621
 
            if isinstance(client_object.__getattribute__(attrname),
 
2622
 
                          collections.Callable):
 
2623
 
                parent_pipe.send(('function', ))
 
2626
 
                    'data', client_object.__getattribute__(attrname)))
 
2628
 
        if command == 'setattr':
 
2629
 
            attrname = request[1]
 
2631
 
            setattr(client_object, attrname, value)
 
 
1243
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
 
 
1245
    def handle_ipc(self, source, condition, file_objects={}):
 
 
1247
            gobject.IO_IN: u"IN",   # There is data to read.
 
 
1248
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
 
1250
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
 
1251
            gobject.IO_ERR: u"ERR", # Error condition.
 
 
1252
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
 
1253
                                    # broken, usually for pipes and
 
 
1256
        conditions_string = ' | '.join(name
 
 
1258
                                       condition_names.iteritems()
 
 
1259
                                       if cond & condition)
 
 
1260
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
 
1263
        # Turn the pipe file descriptor into a Python file object
 
 
1264
        if source not in file_objects:
 
 
1265
            file_objects[source] = os.fdopen(source, u"r", 1)
 
 
1267
        # Read a line from the file object
 
 
1268
        cmdline = file_objects[source].readline()
 
 
1269
        if not cmdline:             # Empty line means end of file
 
 
1270
            # close the IPC pipe
 
 
1271
            file_objects[source].close()
 
 
1272
            del file_objects[source]
 
 
1274
            # Stop calling this function
 
 
1277
        logger.debug(u"IPC command: %r", cmdline)
 
 
1279
        # Parse and act on command
 
 
1280
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
 
 
1282
        if cmd == u"NOTFOUND":
 
 
1283
            logger.warning(u"Client not found for fingerprint: %s",
 
 
1287
                mandos_dbus_service.ClientNotFound(args)
 
 
1288
        elif cmd == u"INVALID":
 
 
1289
            for client in self.clients:
 
 
1290
                if client.name == args:
 
 
1291
                    logger.warning(u"Client %s is invalid", args)
 
 
1297
                logger.error(u"Unknown client %s is invalid", args)
 
 
1298
        elif cmd == u"SENDING":
 
 
1299
            for client in self.clients:
 
 
1300
                if client.name == args:
 
 
1301
                    logger.info(u"Sending secret to %s", client.name)
 
 
1308
                logger.error(u"Sending secret to unknown client %s",
 
 
1311
            logger.error(u"Unknown IPC command: %r", cmdline)
 
 
1313
        # Keep calling this function
 
2636
 
def rfc3339_duration_to_delta(duration):
 
2637
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2639
 
    >>> rfc3339_duration_to_delta("P7D")
 
2640
 
    datetime.timedelta(7)
 
2641
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2642
 
    datetime.timedelta(0, 60)
 
2643
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2644
 
    datetime.timedelta(0, 3600)
 
2645
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2646
 
    datetime.timedelta(1)
 
2647
 
    >>> rfc3339_duration_to_delta("P1W")
 
2648
 
    datetime.timedelta(7)
 
2649
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2650
 
    datetime.timedelta(0, 330)
 
2651
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2652
 
    datetime.timedelta(1, 200)
 
2655
 
    # Parsing an RFC 3339 duration with regular expressions is not
 
2656
 
    # possible - there would have to be multiple places for the same
 
2657
 
    # values, like seconds.  The current code, while more esoteric, is
 
2658
 
    # cleaner without depending on a parsing library.  If Python had a
 
2659
 
    # built-in library for parsing we would use it, but we'd like to
 
2660
 
    # avoid excessive use of external libraries.
 
2662
 
    # New type for defining tokens, syntax, and semantics all-in-one
 
2663
 
    Token = collections.namedtuple("Token", (
 
2664
 
        "regexp",  # To match token; if "value" is not None, must have
 
2665
 
                   # a "group" containing digits
 
2666
 
        "value",   # datetime.timedelta or None
 
2667
 
        "followers"))           # Tokens valid after this token
 
2668
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2669
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2670
 
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2671
 
    token_second = Token(re.compile(r"(\d+)S"),
 
2672
 
                         datetime.timedelta(seconds=1),
 
2673
 
                         frozenset((token_end, )))
 
2674
 
    token_minute = Token(re.compile(r"(\d+)M"),
 
2675
 
                         datetime.timedelta(minutes=1),
 
2676
 
                         frozenset((token_second, token_end)))
 
2677
 
    token_hour = Token(re.compile(r"(\d+)H"),
 
2678
 
                       datetime.timedelta(hours=1),
 
2679
 
                       frozenset((token_minute, token_end)))
 
2680
 
    token_time = Token(re.compile(r"T"),
 
2682
 
                       frozenset((token_hour, token_minute,
 
2684
 
    token_day = Token(re.compile(r"(\d+)D"),
 
2685
 
                      datetime.timedelta(days=1),
 
2686
 
                      frozenset((token_time, token_end)))
 
2687
 
    token_month = Token(re.compile(r"(\d+)M"),
 
2688
 
                        datetime.timedelta(weeks=4),
 
2689
 
                        frozenset((token_day, token_end)))
 
2690
 
    token_year = Token(re.compile(r"(\d+)Y"),
 
2691
 
                       datetime.timedelta(weeks=52),
 
2692
 
                       frozenset((token_month, token_end)))
 
2693
 
    token_week = Token(re.compile(r"(\d+)W"),
 
2694
 
                       datetime.timedelta(weeks=1),
 
2695
 
                       frozenset((token_end, )))
 
2696
 
    token_duration = Token(re.compile(r"P"), None,
 
2697
 
                           frozenset((token_year, token_month,
 
2698
 
                                      token_day, token_time,
 
2700
 
    # Define starting values:
 
2702
 
    value = datetime.timedelta()
 
2704
 
    # Following valid tokens
 
2705
 
    followers = frozenset((token_duration, ))
 
2706
 
    # String left to parse
 
2708
 
    # Loop until end token is found
 
2709
 
    while found_token is not token_end:
 
2710
 
        # Search for any currently valid tokens
 
2711
 
        for token in followers:
 
2712
 
            match = token.regexp.match(s)
 
2713
 
            if match is not None:
 
2715
 
                if token.value is not None:
 
2716
 
                    # Value found, parse digits
 
2717
 
                    factor = int(match.group(1), 10)
 
2718
 
                    # Add to value so far
 
2719
 
                    value += factor * token.value
 
2720
 
                # Strip token from string
 
2721
 
                s = token.regexp.sub("", s, 1)
 
2724
 
                # Set valid next tokens
 
2725
 
                followers = found_token.followers
 
2728
 
            # No currently valid tokens were found
 
2729
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2735
1317
def string_to_delta(interval):
 
2736
1318
    """Parse a string and return a datetime.timedelta
 
2738
 
    >>> string_to_delta('7d')
 
 
1320
    >>> string_to_delta(u'7d')
 
2739
1321
    datetime.timedelta(7)
 
2740
 
    >>> string_to_delta('60s')
 
 
1322
    >>> string_to_delta(u'60s')
 
2741
1323
    datetime.timedelta(0, 60)
 
2742
 
    >>> string_to_delta('60m')
 
 
1324
    >>> string_to_delta(u'60m')
 
2743
1325
    datetime.timedelta(0, 3600)
 
2744
 
    >>> string_to_delta('24h')
 
 
1326
    >>> string_to_delta(u'24h')
 
2745
1327
    datetime.timedelta(1)
 
2746
 
    >>> string_to_delta('1w')
 
 
1328
    >>> string_to_delta(u'1w')
 
2747
1329
    datetime.timedelta(7)
 
2748
 
    >>> string_to_delta('5m 30s')
 
 
1330
    >>> string_to_delta(u'5m 30s')
 
2749
1331
    datetime.timedelta(0, 330)
 
2753
 
        return rfc3339_duration_to_delta(interval)
 
2757
1333
    timevalue = datetime.timedelta(0)
 
2758
1334
    for s in interval.split():
 
 
1336
            suffix = unicode(s[-1])
 
2761
1337
            value = int(s[:-1])
 
2763
1339
                delta = datetime.timedelta(value)
 
 
1340
            elif suffix == u"s":
 
2765
1341
                delta = datetime.timedelta(0, value)
 
 
1342
            elif suffix == u"m":
 
2767
1343
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
 
1344
            elif suffix == u"h":
 
2769
1345
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
 
1346
            elif suffix == u"w":
 
2771
1347
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
2773
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2774
 
        except IndexError as e:
 
2775
 
            raise ValueError(*(e.args))
 
 
1349
                raise ValueError(u"Unknown suffix %r" % suffix)
 
 
1350
        except (ValueError, IndexError), e:
 
 
1351
            raise ValueError(e.message)
 
2776
1352
        timevalue += delta
 
2777
1353
    return timevalue
 
2780
 
def daemon(nochdir=False, noclose=False):
 
 
1356
def if_nametoindex(interface):
 
 
1357
    """Call the C function if_nametoindex(), or equivalent
 
 
1359
    Note: This function cannot accept a unicode string."""
 
 
1360
    global if_nametoindex
 
 
1362
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
 
1363
                          (ctypes.util.find_library(u"c"))
 
 
1365
    except (OSError, AttributeError):
 
 
1366
        logger.warning(u"Doing if_nametoindex the hard way")
 
 
1367
        def if_nametoindex(interface):
 
 
1368
            "Get an interface index the hard way, i.e. using fcntl()"
 
 
1369
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
 
1370
            with closing(socket.socket()) as s:
 
 
1371
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
 
1372
                                    struct.pack(str(u"16s16x"),
 
 
1374
            interface_index = struct.unpack(str(u"I"),
 
 
1376
            return interface_index
 
 
1377
    return if_nametoindex(interface)
 
 
1380
def daemon(nochdir = False, noclose = False):
 
2781
1381
    """See daemon(3).  Standard BSD Unix function.
 
2783
1383
    This should really exist as os.daemon, but it doesn't (yet)."""
 
2787
1387
    if not nochdir:
 
2791
1391
    if not noclose:
 
2792
1392
        # Close all standard open file descriptors
 
2793
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1393
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2794
1394
        if not stat.S_ISCHR(os.fstat(null).st_mode):
 
2795
1395
            raise OSError(errno.ENODEV,
 
2796
 
                          "{} not a character device"
 
2797
 
                          .format(os.devnull))
 
 
1396
                          u"%s not a character device"
 
2798
1398
        os.dup2(null, sys.stdin.fileno())
 
2799
1399
        os.dup2(null, sys.stdout.fileno())
 
2800
1400
        os.dup2(null, sys.stderr.fileno())
 
 
2807
1407
    ##################################################################
 
2808
1408
    # Parsing of options, both command line and config file
 
2810
 
    parser = argparse.ArgumentParser()
 
2811
 
    parser.add_argument("-v", "--version", action="version",
 
2812
 
                        version="%(prog)s {}".format(version),
 
2813
 
                        help="show version number and exit")
 
2814
 
    parser.add_argument("-i", "--interface", metavar="IF",
 
2815
 
                        help="Bind to interface IF")
 
2816
 
    parser.add_argument("-a", "--address",
 
2817
 
                        help="Address to listen for requests on")
 
2818
 
    parser.add_argument("-p", "--port", type=int,
 
2819
 
                        help="Port number to receive requests on")
 
2820
 
    parser.add_argument("--check", action="store_true",
 
2821
 
                        help="Run self-test")
 
2822
 
    parser.add_argument("--debug", action="store_true",
 
2823
 
                        help="Debug mode; run in foreground and log"
 
2824
 
                        " to terminal", default=None)
 
2825
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
2826
 
                        help="Debug level for stdout output")
 
2827
 
    parser.add_argument("--priority", help="GnuTLS"
 
2828
 
                        " priority string (see GnuTLS documentation)")
 
2829
 
    parser.add_argument("--servicename",
 
2830
 
                        metavar="NAME", help="Zeroconf service name")
 
2831
 
    parser.add_argument("--configdir",
 
2832
 
                        default="/etc/mandos", metavar="DIR",
 
2833
 
                        help="Directory to search for configuration"
 
2835
 
    parser.add_argument("--no-dbus", action="store_false",
 
2836
 
                        dest="use_dbus", help="Do not provide D-Bus"
 
2837
 
                        " system bus interface", default=None)
 
2838
 
    parser.add_argument("--no-ipv6", action="store_false",
 
2839
 
                        dest="use_ipv6", help="Do not use IPv6",
 
2841
 
    parser.add_argument("--no-restore", action="store_false",
 
2842
 
                        dest="restore", help="Do not restore stored"
 
2843
 
                        " state", default=None)
 
2844
 
    parser.add_argument("--socket", type=int,
 
2845
 
                        help="Specify a file descriptor to a network"
 
2846
 
                        " socket to use instead of creating one")
 
2847
 
    parser.add_argument("--statedir", metavar="DIR",
 
2848
 
                        help="Directory to save/restore state in")
 
2849
 
    parser.add_argument("--foreground", action="store_true",
 
2850
 
                        help="Run in foreground", default=None)
 
2851
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2852
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
2855
 
    options = parser.parse_args()
 
 
1410
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
 
1411
    parser.add_option("-i", u"--interface", type=u"string",
 
 
1412
                      metavar="IF", help=u"Bind to interface IF")
 
 
1413
    parser.add_option("-a", u"--address", type=u"string",
 
 
1414
                      help=u"Address to listen for requests on")
 
 
1415
    parser.add_option("-p", u"--port", type=u"int",
 
 
1416
                      help=u"Port number to receive requests on")
 
 
1417
    parser.add_option("--check", action=u"store_true",
 
 
1418
                      help=u"Run self-test")
 
 
1419
    parser.add_option("--debug", action=u"store_true",
 
 
1420
                      help=u"Debug mode; run in foreground and log to"
 
 
1422
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
 
1423
                      u" priority string (see GnuTLS documentation)")
 
 
1424
    parser.add_option("--servicename", type=u"string",
 
 
1425
                      metavar=u"NAME", help=u"Zeroconf service name")
 
 
1426
    parser.add_option("--configdir", type=u"string",
 
 
1427
                      default=u"/etc/mandos", metavar=u"DIR",
 
 
1428
                      help=u"Directory to search for configuration"
 
 
1430
    parser.add_option("--no-dbus", action=u"store_false",
 
 
1431
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
 
1432
                      u" system bus interface")
 
 
1433
    parser.add_option("--no-ipv6", action=u"store_false",
 
 
1434
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
 
1435
    options = parser.parse_args()[0]
 
2857
1437
    if options.check:
 
2859
 
        fail_count, test_count = doctest.testmod()
 
2860
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2862
1442
    # Default values for config file for server-global settings
 
2863
 
    server_defaults = {"interface": "",
 
2868
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2869
 
                       ":+SIGN-DSA-SHA256",
 
2870
 
                       "servicename": "Mandos",
 
2876
 
                       "statedir": "/var/lib/mandos",
 
2877
 
                       "foreground": "False",
 
 
1443
    server_defaults = { u"interface": u"",
 
 
1448
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1449
                        u"servicename": u"Mandos",
 
 
1450
                        u"use_dbus": u"True",
 
 
1451
                        u"use_ipv6": u"True",
 
2881
1454
    # Parse config file for server-global settings
 
2882
1455
    server_config = configparser.SafeConfigParser(server_defaults)
 
2883
1456
    del server_defaults
 
2884
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
1457
    server_config.read(os.path.join(options.configdir,
 
2885
1459
    # Convert the SafeConfigParser object to a dict
 
2886
1460
    server_settings = server_config.defaults()
 
2887
1461
    # Use the appropriate methods on the non-string config options
 
2888
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2889
 
                   "foreground", "zeroconf"):
 
2890
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
 
1462
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
 
1463
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
2892
1465
    if server_settings["port"]:
 
2893
 
        server_settings["port"] = server_config.getint("DEFAULT",
 
2895
 
    if server_settings["socket"]:
 
2896
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2898
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2899
 
        # over with an opened os.devnull.  But we don't want this to
 
2900
 
        # happen with a supplied network socket.
 
2901
 
        if 0 <= server_settings["socket"] <= 2:
 
2902
 
            server_settings["socket"] = os.dup(server_settings
 
 
1466
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
2904
1468
    del server_config
 
2906
1470
    # Override the settings from the config file with command line
 
2907
1471
    # options, if set.
 
2908
 
    for option in ("interface", "address", "port", "debug",
 
2909
 
                   "priority", "servicename", "configdir", "use_dbus",
 
2910
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2911
 
                   "socket", "foreground", "zeroconf"):
 
 
1472
    for option in (u"interface", u"address", u"port", u"debug",
 
 
1473
                   u"priority", u"servicename", u"configdir",
 
 
1474
                   u"use_dbus", u"use_ipv6"):
 
2912
1475
        value = getattr(options, option)
 
2913
1476
        if value is not None:
 
2914
1477
            server_settings[option] = value
 
2916
1479
    # Force all strings to be unicode
 
2917
1480
    for option in server_settings.keys():
 
2918
 
        if isinstance(server_settings[option], bytes):
 
2919
 
            server_settings[option] = (server_settings[option]
 
2921
 
    # Force all boolean options to be boolean
 
2922
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2923
 
                   "foreground", "zeroconf"):
 
2924
 
        server_settings[option] = bool(server_settings[option])
 
2925
 
    # Debug implies foreground
 
2926
 
    if server_settings["debug"]:
 
2927
 
        server_settings["foreground"] = True
 
 
1481
        if type(server_settings[option]) is str:
 
 
1482
            server_settings[option] = unicode(server_settings[option])
 
2928
1483
    # Now we have our good server settings in "server_settings"
 
2930
1485
    ##################################################################
 
2932
 
    if (not server_settings["zeroconf"]
 
2933
 
        and not (server_settings["port"]
 
2934
 
                 or server_settings["socket"] != "")):
 
2935
 
        parser.error("Needs port or socket to work without Zeroconf")
 
2937
1487
    # For convenience
 
2938
 
    debug = server_settings["debug"]
 
2939
 
    debuglevel = server_settings["debuglevel"]
 
2940
 
    use_dbus = server_settings["use_dbus"]
 
2941
 
    use_ipv6 = server_settings["use_ipv6"]
 
2942
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
2944
 
    foreground = server_settings["foreground"]
 
2945
 
    zeroconf = server_settings["zeroconf"]
 
2948
 
        initlogger(debug, logging.DEBUG)
 
2953
 
            level = getattr(logging, debuglevel.upper())
 
2954
 
            initlogger(debug, level)
 
2956
 
    if server_settings["servicename"] != "Mandos":
 
2957
 
        syslogger.setFormatter(
 
2958
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2959
 
                              ' %(levelname)s: %(message)s'.format(
 
2960
 
                                  server_settings["servicename"])))
 
 
1488
    debug = server_settings[u"debug"]
 
 
1489
    use_dbus = server_settings[u"use_dbus"]
 
 
1490
    use_ipv6 = server_settings[u"use_ipv6"]
 
 
1493
        syslogger.setLevel(logging.WARNING)
 
 
1494
        console.setLevel(logging.WARNING)
 
 
1496
    if server_settings[u"servicename"] != u"Mandos":
 
 
1497
        syslogger.setFormatter(logging.Formatter
 
 
1498
                               (u'Mandos (%s) [%%(process)d]:'
 
 
1499
                                u' %%(levelname)s: %%(message)s'
 
 
1500
                                % server_settings[u"servicename"]))
 
2962
1502
    # Parse config file with clients
 
2963
 
    client_config = configparser.SafeConfigParser(Client
 
2965
 
    client_config.read(os.path.join(server_settings["configdir"],
 
 
1503
    client_defaults = { u"timeout": u"1h",
 
 
1505
                        u"checker": u"fping -q -- %%(host)s",
 
 
1508
    client_config = configparser.SafeConfigParser(client_defaults)
 
 
1509
    client_config.read(os.path.join(server_settings[u"configdir"],
 
2968
1512
    global mandos_dbus_service
 
2969
1513
    mandos_dbus_service = None
 
2972
 
    if server_settings["socket"] != "":
 
2973
 
        socketfd = server_settings["socket"]
 
2974
 
    tcp_server = MandosServer(
 
2975
 
        (server_settings["address"], server_settings["port"]),
 
2977
 
        interface=(server_settings["interface"] or None),
 
2979
 
        gnutls_priority=server_settings["priority"],
 
2983
 
        pidfilename = "/run/mandos.pid"
 
2984
 
        if not os.path.isdir("/run/."):
 
2985
 
            pidfilename = "/var/run/mandos.pid"
 
2988
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2989
 
        except IOError as e:
 
2990
 
            logger.error("Could not open file %r", pidfilename,
 
2993
 
    for name, group in (("_mandos", "_mandos"),
 
2994
 
                        ("mandos", "mandos"),
 
2995
 
                        ("nobody", "nogroup")):
 
2997
 
            uid = pwd.getpwnam(name).pw_uid
 
2998
 
            gid = pwd.getpwnam(group).pw_gid
 
 
1515
    tcp_server = MandosServer((server_settings[u"address"],
 
 
1516
                               server_settings[u"port"]),
 
 
1518
                              interface=server_settings[u"interface"],
 
 
1521
                              server_settings[u"priority"],
 
 
1523
    pidfilename = u"/var/run/mandos.pid"
 
 
1525
        pidfile = open(pidfilename, u"w")
 
 
1527
        logger.error(u"Could not open file %r", pidfilename)
 
 
1530
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
 
1531
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
 
1534
            uid = pwd.getpwnam(u"mandos").pw_uid
 
 
1535
            gid = pwd.getpwnam(u"mandos").pw_gid
 
3000
1536
        except KeyError:
 
 
1538
                uid = pwd.getpwnam(u"nobody").pw_uid
 
 
1539
                gid = pwd.getpwnam(u"nobody").pw_gid
 
3009
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3011
 
    except OSError as error:
 
3012
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3013
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3014
 
        if error.errno != errno.EPERM:
 
 
1546
    except OSError, error:
 
 
1547
        if error[0] != errno.EPERM:
 
 
1550
    # Enable all possible GnuTLS debugging
 
3018
 
        # Enable all possible GnuTLS debugging
 
3020
1552
        # "Use a log level over 10 to enable all debugging options."
 
3021
1553
        # - GnuTLS manual
 
3022
 
        gnutls.global_set_log_level(11)
 
 
1554
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
1556
        @gnutls.library.types.gnutls_log_func
 
3025
1557
        def debug_gnutls(level, string):
 
3026
 
            logger.debug("GnuTLS: %s", string[:-1])
 
3028
 
        gnutls.global_set_log_function(debug_gnutls)
 
3030
 
        # Redirect stdin so all checkers get /dev/null
 
3031
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
3032
 
        os.dup2(null, sys.stdin.fileno())
 
3036
 
    # Need to fork before connecting to D-Bus
 
3038
 
        # Close all input and output, do double fork, etc.
 
3041
 
    # multiprocessing will use threads, so before we use GLib we need
 
3042
 
    # to inform GLib that threads will be used.
 
 
1558
            logger.debug(u"GnuTLS: %s", string[:-1])
 
 
1560
        (gnutls.library.functions
 
 
1561
         .gnutls_global_set_log_function(debug_gnutls))
 
3045
1563
    global main_loop
 
3046
1564
    # From the Avahi example code
 
3047
 
    DBusGMainLoop(set_as_default=True)
 
3048
 
    main_loop = GLib.MainLoop()
 
 
1565
    DBusGMainLoop(set_as_default=True )
 
 
1566
    main_loop = gobject.MainLoop()
 
3049
1567
    bus = dbus.SystemBus()
 
3050
1568
    # End of Avahi example code
 
3053
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3056
 
            old_bus_name = dbus.service.BusName(
 
3057
 
                "se.bsnet.fukt.Mandos", bus,
 
3059
 
        except dbus.exceptions.DBusException as e:
 
3060
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
1571
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
 
1572
                                            bus, do_not_queue=True)
 
 
1573
        except dbus.exceptions.NameExistsException, e:
 
 
1574
            logger.error(unicode(e) + u", disabling D-Bus")
 
3061
1575
            use_dbus = False
 
3062
 
            server_settings["use_dbus"] = False
 
 
1576
            server_settings[u"use_dbus"] = False
 
3063
1577
            tcp_server.use_dbus = False
 
3065
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3066
 
        service = AvahiServiceToSyslog(
 
3067
 
            name=server_settings["servicename"],
 
3068
 
            servicetype="_mandos._tcp",
 
3071
 
        if server_settings["interface"]:
 
3072
 
            service.interface = if_nametoindex(
 
3073
 
                server_settings["interface"].encode("utf-8"))
 
3075
 
    global multiprocessing_manager
 
3076
 
    multiprocessing_manager = multiprocessing.Manager()
 
 
1578
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
1579
    service = AvahiService(name = server_settings[u"servicename"],
 
 
1580
                           servicetype = u"_mandos._tcp",
 
 
1581
                           protocol = protocol, bus = bus)
 
 
1582
    if server_settings["interface"]:
 
 
1583
        service.interface = (if_nametoindex
 
 
1584
                             (str(server_settings[u"interface"])))
 
3078
1586
    client_class = Client
 
3080
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
3082
 
    client_settings = Client.config_parser(client_config)
 
3083
 
    old_client_settings = {}
 
3086
 
    # This is used to redirect stdout and stderr for checker processes
 
3088
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3089
 
    # Only used if server is running in foreground but not in debug
 
3091
 
    if debug or not foreground:
 
3094
 
    # Get client data and settings from last running state.
 
3095
 
    if server_settings["restore"]:
 
3097
 
            with open(stored_state_path, "rb") as stored_state:
 
3098
 
                if sys.version_info.major == 2:
 
3099
 
                    clients_data, old_client_settings = pickle.load(
 
3102
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3103
 
                        pickle.load(stored_state, encoding="bytes"))
 
3104
 
                    #   Fix bytes to strings
 
3107
 
                    clients_data = {(key.decode("utf-8")
 
3108
 
                                     if isinstance(key, bytes)
 
3111
 
                                    bytes_clients_data.items()}
 
3112
 
                    del bytes_clients_data
 
3113
 
                    for key in clients_data:
 
3114
 
                        value = {(k.decode("utf-8")
 
3115
 
                                  if isinstance(k, bytes) else k): v
 
3117
 
                                 clients_data[key].items()}
 
3118
 
                        clients_data[key] = value
 
3120
 
                        value["client_structure"] = [
 
3122
 
                             if isinstance(s, bytes)
 
3124
 
                            value["client_structure"]]
 
3126
 
                        for k in ("name", "host"):
 
3127
 
                            if isinstance(value[k], bytes):
 
3128
 
                                value[k] = value[k].decode("utf-8")
 
3129
 
                    #  old_client_settings
 
3131
 
                    old_client_settings = {
 
3132
 
                        (key.decode("utf-8")
 
3133
 
                         if isinstance(key, bytes)
 
3136
 
                        bytes_old_client_settings.items()}
 
3137
 
                    del bytes_old_client_settings
 
3139
 
                    for value in old_client_settings.values():
 
3140
 
                        if isinstance(value["host"], bytes):
 
3141
 
                            value["host"] = (value["host"]
 
3143
 
            os.remove(stored_state_path)
 
3144
 
        except IOError as e:
 
3145
 
            if e.errno == errno.ENOENT:
 
3146
 
                logger.warning("Could not load persistent state:"
 
3147
 
                               " {}".format(os.strerror(e.errno)))
 
3149
 
                logger.critical("Could not load persistent state:",
 
3152
 
        except EOFError as e:
 
3153
 
            logger.warning("Could not load persistent state: "
 
3157
 
    with PGPEngine() as pgp:
 
3158
 
        for client_name, client in clients_data.items():
 
3159
 
            # Skip removed clients
 
3160
 
            if client_name not in client_settings:
 
3163
 
            # Decide which value to use after restoring saved state.
 
3164
 
            # We have three different values: Old config file,
 
3165
 
            # new config file, and saved state.
 
3166
 
            # New config value takes precedence if it differs from old
 
3167
 
            # config value, otherwise use saved state.
 
3168
 
            for name, value in client_settings[client_name].items():
 
3170
 
                    # For each value in new config, check if it
 
3171
 
                    # differs from the old config value (Except for
 
3172
 
                    # the "secret" attribute)
 
3173
 
                    if (name != "secret"
 
3175
 
                             old_client_settings[client_name][name])):
 
3176
 
                        client[name] = value
 
3180
 
            # Clients who has passed its expire date can still be
 
3181
 
            # enabled if its last checker was successful.  A Client
 
3182
 
            # whose checker succeeded before we stored its state is
 
3183
 
            # assumed to have successfully run all checkers during
 
3185
 
            if client["enabled"]:
 
3186
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
3187
 
                    if not client["last_checked_ok"]:
 
3189
 
                            "disabling client {} - Client never "
 
3190
 
                            "performed a successful checker".format(
 
3192
 
                        client["enabled"] = False
 
3193
 
                    elif client["last_checker_status"] != 0:
 
3195
 
                            "disabling client {} - Client last"
 
3196
 
                            " checker failed with error code"
 
3199
 
                                client["last_checker_status"]))
 
3200
 
                        client["enabled"] = False
 
3202
 
                        client["expires"] = (
 
3203
 
                            datetime.datetime.utcnow()
 
3204
 
                            + client["timeout"])
 
3205
 
                        logger.debug("Last checker succeeded,"
 
3206
 
                                     " keeping {} enabled".format(
 
3209
 
                client["secret"] = pgp.decrypt(
 
3210
 
                    client["encrypted_secret"],
 
3211
 
                    client_settings[client_name]["secret"])
 
3213
 
                # If decryption fails, we use secret from new settings
 
3214
 
                logger.debug("Failed to decrypt {} old secret".format(
 
3216
 
                client["secret"] = (client_settings[client_name]
 
3219
 
    # Add/remove clients based on new changes made to config
 
3220
 
    for client_name in (set(old_client_settings)
 
3221
 
                        - set(client_settings)):
 
3222
 
        del clients_data[client_name]
 
3223
 
    for client_name in (set(client_settings)
 
3224
 
                        - set(old_client_settings)):
 
3225
 
        clients_data[client_name] = client_settings[client_name]
 
3227
 
    # Create all client objects
 
3228
 
    for client_name, client in clients_data.items():
 
3229
 
        tcp_server.clients[client_name] = client_class(
 
3232
 
            server_settings=server_settings)
 
 
1588
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
1589
    tcp_server.clients.update(set(
 
 
1590
            client_class(name = section,
 
 
1591
                         config= dict(client_config.items(section)))
 
 
1592
            for section in client_config.sections()))
 
3234
1593
    if not tcp_server.clients:
 
3235
 
        logger.warning("No clients defined")
 
3238
 
        if pidfile is not None:
 
 
1594
        logger.warning(u"No clients defined")
 
 
1597
        # Redirect stdin so all checkers get /dev/null
 
 
1598
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1599
        os.dup2(null, sys.stdin.fileno())
 
 
1603
        # No console logging
 
 
1604
        logger.removeHandler(console)
 
 
1605
        # Close all input and output, do double fork, etc.
 
 
1609
        with closing(pidfile):
 
3239
1610
            pid = os.getpid()
 
3242
 
                    print(pid, file=pidfile)
 
3244
 
                logger.error("Could not write to file %r with PID %d",
 
 
1611
            pidfile.write(str(pid) + "\n")
 
3249
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3250
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3251
 
                             lambda: main_loop.quit() and False)
 
 
1614
        logger.error(u"Could not write to file %r with PID %d",
 
 
1617
        # "pidfile" was never created
 
 
1622
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
1623
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
1624
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3255
 
        @alternate_dbus_interfaces(
 
3256
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3257
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
1627
        class MandosDBusService(dbus.service.Object):
 
3258
1628
            """A D-Bus proxy object"""
 
3260
1629
            def __init__(self):
 
3261
 
                dbus.service.Object.__init__(self, bus, "/")
 
3263
 
            _interface = "se.recompile.Mandos"
 
3265
 
            @dbus.service.signal(_interface, signature="o")
 
3266
 
            def ClientAdded(self, objpath):
 
3270
 
            @dbus.service.signal(_interface, signature="ss")
 
3271
 
            def ClientNotFound(self, fingerprint, address):
 
3275
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3277
 
            @dbus.service.signal(_interface, signature="os")
 
 
1630
                dbus.service.Object.__init__(self, bus, u"/")
 
 
1631
            _interface = u"se.bsnet.fukt.Mandos"
 
 
1633
            @dbus.service.signal(_interface, signature=u"oa{sv}")
 
 
1634
            def ClientAdded(self, objpath, properties):
 
 
1638
            @dbus.service.signal(_interface, signature=u"s")
 
 
1639
            def ClientNotFound(self, fingerprint):
 
 
1643
            @dbus.service.signal(_interface, signature=u"os")
 
3278
1644
            def ClientRemoved(self, objpath, name):
 
3282
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3284
 
            @dbus.service.method(_interface, out_signature="ao")
 
 
1648
            @dbus.service.method(_interface, out_signature=u"ao")
 
3285
1649
            def GetAllClients(self):
 
3287
 
                return dbus.Array(c.dbus_object_path for c in
 
3288
 
                                  tcp_server.clients.values())
 
3290
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
1651
                return dbus.Array(c.dbus_object_path
 
 
1652
                                  for c in tcp_server.clients)
 
3292
1654
            @dbus.service.method(_interface,
 
3293
 
                                 out_signature="a{oa{sv}}")
 
 
1655
                                 out_signature=u"a{oa{sv}}")
 
3294
1656
            def GetAllClientsWithProperties(self):
 
3296
1658
                return dbus.Dictionary(
 
3297
 
                    {c.dbus_object_path: c.GetAll(
 
3298
 
                        "se.recompile.Mandos.Client")
 
3299
 
                     for c in tcp_server.clients.values()},
 
3302
 
            @dbus.service.method(_interface, in_signature="o")
 
 
1659
                    ((c.dbus_object_path, c.GetAll(u""))
 
 
1660
                     for c in tcp_server.clients),
 
 
1661
                    signature=u"oa{sv}")
 
 
1663
            @dbus.service.method(_interface, in_signature=u"o")
 
3303
1664
            def RemoveClient(self, object_path):
 
3305
 
                for c in tcp_server.clients.values():
 
 
1666
                for c in tcp_server.clients:
 
3306
1667
                    if c.dbus_object_path == object_path:
 
3307
 
                        del tcp_server.clients[c.name]
 
 
1668
                        tcp_server.clients.remove(c)
 
3308
1669
                        c.remove_from_connection()
 
3309
 
                        # Don't signal the disabling
 
 
1670
                        # Don't signal anything except ClientRemoved
 
3310
1671
                        c.disable(quiet=True)
 
3311
 
                        # Emit D-Bus signal for removal
 
3312
 
                        self.client_removed_signal(c)
 
 
1673
                        self.ClientRemoved(object_path, c.name)
 
3314
1675
                raise KeyError(object_path)
 
3318
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3319
 
                                 out_signature="a{oa{sa{sv}}}")
 
3320
 
            def GetManagedObjects(self):
 
3322
 
                return dbus.Dictionary(
 
3323
 
                    {client.dbus_object_path:
 
3325
 
                         {interface: client.GetAll(interface)
 
3327
 
                          client._get_all_interface_names()})
 
3328
 
                     for client in tcp_server.clients.values()})
 
3330
 
            def client_added_signal(self, client):
 
3331
 
                """Send the new standard signal and the old signal"""
 
3333
 
                    # New standard signal
 
3334
 
                    self.InterfacesAdded(
 
3335
 
                        client.dbus_object_path,
 
3337
 
                            {interface: client.GetAll(interface)
 
3339
 
                             client._get_all_interface_names()}))
 
3341
 
                    self.ClientAdded(client.dbus_object_path)
 
3343
 
            def client_removed_signal(self, client):
 
3344
 
                """Send the new standard signal and the old signal"""
 
3346
 
                    # New standard signal
 
3347
 
                    self.InterfacesRemoved(
 
3348
 
                        client.dbus_object_path,
 
3349
 
                        client._get_all_interface_names())
 
3351
 
                    self.ClientRemoved(client.dbus_object_path,
 
3354
1679
        mandos_dbus_service = MandosDBusService()
 
3356
 
    # Save modules to variables to exempt the modules from being
 
3357
 
    # unloaded before the function registered with atexit() is run.
 
3358
 
    mp = multiprocessing
 
3362
1682
        "Cleanup function; run on exit"
 
3366
 
        mp.active_children()
 
3368
 
        if not (tcp_server.clients or client_settings):
 
3371
 
        # Store client before exiting. Secrets are encrypted with key
 
3372
 
        # based on what config file has. If config file is
 
3373
 
        # removed/edited, old secret will thus be unrecovable.
 
3375
 
        with PGPEngine() as pgp:
 
3376
 
            for client in tcp_server.clients.values():
 
3377
 
                key = client_settings[client.name]["secret"]
 
3378
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3382
 
                # A list of attributes that can not be pickled
 
3384
 
                exclude = {"bus", "changedstate", "secret",
 
3385
 
                           "checker", "server_settings"}
 
3386
 
                for name, typ in inspect.getmembers(dbus.service
 
3390
 
                client_dict["encrypted_secret"] = (client
 
3392
 
                for attr in client.client_structure:
 
3393
 
                    if attr not in exclude:
 
3394
 
                        client_dict[attr] = getattr(client, attr)
 
3396
 
                clients[client.name] = client_dict
 
3397
 
                del client_settings[client.name]["secret"]
 
3400
 
            with tempfile.NamedTemporaryFile(
 
3404
 
                    dir=os.path.dirname(stored_state_path),
 
3405
 
                    delete=False) as stored_state:
 
3406
 
                pickle.dump((clients, client_settings), stored_state,
 
3408
 
                tempname = stored_state.name
 
3409
 
            os.rename(tempname, stored_state_path)
 
3410
 
        except (IOError, OSError) as e:
 
3416
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3417
 
                logger.warning("Could not save persistent state: {}"
 
3418
 
                               .format(os.strerror(e.errno)))
 
3420
 
                logger.warning("Could not save persistent state:",
 
3424
 
        # Delete all clients, and settings from config
 
3425
1685
        while tcp_server.clients:
 
3426
 
            name, client = tcp_server.clients.popitem()
 
 
1686
            client = tcp_server.clients.pop()
 
3428
1688
                client.remove_from_connection()
 
3429
 
            # Don't signal the disabling
 
 
1689
            client.disable_hook = None
 
 
1690
            # Don't signal anything except ClientRemoved
 
3430
1691
            client.disable(quiet=True)
 
3431
 
            # Emit D-Bus signal for removal
 
3433
 
                mandos_dbus_service.client_removed_signal(client)
 
3434
 
        client_settings.clear()
 
 
1694
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
3436
1697
    atexit.register(cleanup)
 
3438
 
    for client in tcp_server.clients.values():
 
 
1699
    for client in tcp_server.clients:
 
3440
 
            # Emit D-Bus signal for adding
 
3441
 
            mandos_dbus_service.client_added_signal(client)
 
3442
 
        # Need to initiate checking of clients
 
3444
 
            client.init_checker()
 
 
1702
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
 
3446
1706
    tcp_server.enable()
 
3447
1707
    tcp_server.server_activate()
 
3449
1709
    # Find out what port we got
 
3451
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
1710
    service.port = tcp_server.socket.getsockname()[1]
 
3453
 
        logger.info("Now listening on address %r, port %d,"
 
3454
 
                    " flowinfo %d, scope_id %d",
 
3455
 
                    *tcp_server.socket.getsockname())
 
 
1712
        logger.info(u"Now listening on address %r, port %d,"
 
 
1713
                    " flowinfo %d, scope_id %d"
 
 
1714
                    % tcp_server.socket.getsockname())
 
3457
 
        logger.info("Now listening on address %r, port %d",
 
3458
 
                    *tcp_server.socket.getsockname())
 
3460
 
    # service.interface = tcp_server.socket.getsockname()[3]
 
 
1716
        logger.info(u"Now listening on address %r, port %d"
 
 
1717
                    % tcp_server.socket.getsockname())
 
 
1719
    #service.interface = tcp_server.socket.getsockname()[3]
 
3464
 
            # From the Avahi example code
 
3467
 
            except dbus.exceptions.DBusException as error:
 
3468
 
                logger.critical("D-Bus Exception", exc_info=error)
 
3471
 
            # End of Avahi example code
 
3473
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3474
 
                          lambda *args, **kwargs:
 
3475
 
                          (tcp_server.handle_request
 
3476
 
                           (*args[2:], **kwargs) or True))
 
3478
 
        logger.debug("Starting main loop")
 
 
1722
        # From the Avahi example code
 
 
1725
        except dbus.exceptions.DBusException, error:
 
 
1726
            logger.critical(u"DBusException: %s", error)
 
 
1729
        # End of Avahi example code
 
 
1731
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
 
1732
                             lambda *args, **kwargs:
 
 
1733
                             (tcp_server.handle_request
 
 
1734
                              (*args[2:], **kwargs) or True))
 
 
1736
        logger.debug(u"Starting main loop")
 
3479
1737
        main_loop.run()
 
3480
 
    except AvahiError as error:
 
3481
 
        logger.critical("Avahi Error", exc_info=error)
 
 
1738
    except AvahiError, error:
 
 
1739
        logger.critical(u"AvahiError: %s", error)
 
3484
1742
    except KeyboardInterrupt:
 
3486
 
            print("", file=sys.stderr)
 
3487
 
        logger.debug("Server received KeyboardInterrupt")
 
3488
 
    logger.debug("Server exiting")
 
 
1745
        logger.debug(u"Server received KeyboardInterrupt")
 
 
1746
    logger.debug(u"Server exiting")
 
3489
1747
    # Must run before the D-Bus bus name gets deregistered
 
3493
1750
if __name__ == '__main__':