192
357
            dbus.UInt16(self.port),
 
193
358
            avahi.string_array_to_txt_array(self.TXT))
 
194
359
        self.group.Commit()
 
195
361
    def entry_group_state_changed(self, state, error):
 
196
362
        """Derived from the Avahi example code"""
 
197
 
        logger.debug(u"Avahi state change: %i", state)
 
 
363
        logger.debug("Avahi entry group state change: %i", state)
 
199
365
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
200
 
            logger.debug(u"Zeroconf service established.")
 
 
366
            logger.debug("Zeroconf service established.")
 
201
367
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
202
 
            logger.warning(u"Zeroconf service name collision.")
 
 
368
            logger.info("Zeroconf service name collision.")
 
204
370
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
205
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
207
 
            raise AvahiGroupError(u"State changed: %s"
 
 
371
            logger.critical("Avahi: Error in group state changed %s",
 
 
373
            raise AvahiGroupError("State changed: {!s}".format(error))
 
209
375
    def cleanup(self):
 
210
376
        """Derived from the Avahi example code"""
 
211
377
        if self.group is not None:
 
 
380
            except (dbus.exceptions.UnknownMethodException,
 
 
381
                    dbus.exceptions.DBusException):
 
213
383
            self.group = None
 
214
 
    def server_state_changed(self, state):
 
 
386
    def server_state_changed(self, state, error=None):
 
215
387
        """Derived from the Avahi example code"""
 
216
 
        if state == avahi.SERVER_COLLISION:
 
217
 
            logger.error(u"Zeroconf server name collision")
 
 
388
        logger.debug("Avahi server state change: %i", state)
 
 
390
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
 
391
            avahi.SERVER_REGISTERING: None,
 
 
392
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
 
393
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
 
395
        if state in bad_states:
 
 
396
            if bad_states[state] is not None:
 
 
398
                    logger.error(bad_states[state])
 
 
400
                    logger.error(bad_states[state] + ": %r", error)
 
219
402
        elif state == avahi.SERVER_RUNNING:
 
 
405
            except dbus.exceptions.DBusException as error:
 
 
406
                if (error.get_dbus_name()
 
 
407
                    == "org.freedesktop.Avahi.CollisionError"):
 
 
408
                    logger.info("Local Zeroconf service name"
 
 
410
                    return self.rename(remove=False)
 
 
412
                    logger.critical("D-Bus Exception", exc_info=error)
 
 
417
                logger.debug("Unknown state: %r", state)
 
 
419
                logger.debug("Unknown state: %r: %r", state, error)
 
221
421
    def activate(self):
 
222
422
        """Derived from the Avahi example code"""
 
223
423
        if self.server is None:
 
224
424
            self.server = dbus.Interface(
 
225
425
                self.bus.get_object(avahi.DBUS_NAME,
 
226
 
                                    avahi.DBUS_PATH_SERVER),
 
 
426
                                    avahi.DBUS_PATH_SERVER,
 
 
427
                                    follow_name_owner_changes=True),
 
227
428
                avahi.DBUS_INTERFACE_SERVER)
 
228
 
        self.server.connect_to_signal(u"StateChanged",
 
229
 
                                 self.server_state_changed)
 
 
429
        self.server.connect_to_signal("StateChanged",
 
 
430
                                      self.server_state_changed)
 
230
431
        self.server_state_changed(self.server.GetState())
 
 
434
class AvahiServiceToSyslog(AvahiService):
 
 
435
    def rename(self, *args, **kwargs):
 
 
436
        """Add the new name to the syslog messages"""
 
 
437
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
438
        syslogger.setFormatter(logging.Formatter(
 
 
439
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
443
# Pretend that we have a GnuTLS module
 
 
444
class GnuTLS(object):
 
 
445
    """This isn't so much a class as it is a module-like namespace.
 
 
446
    It is instantiated once, and simulates having a GnuTLS module."""
 
 
448
    _library = ctypes.cdll.LoadLibrary(
 
 
449
        ctypes.util.find_library("gnutls"))
 
 
450
    _need_version = "3.3.0"
 
 
452
        # Need to use class name "GnuTLS" here, since this method is
 
 
453
        # called before the assignment to the "gnutls" global variable
 
 
455
        if GnuTLS.check_version(self._need_version) is None:
 
 
456
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
 
457
                               .format(self._need_version))
 
 
459
    # Unless otherwise indicated, the constants and types below are
 
 
460
    # all from the gnutls/gnutls.h C header file.
 
 
470
    E_NO_CERTIFICATE_FOUND = -49
 
 
471
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
474
    class session_int(ctypes.Structure):
 
 
476
    session_t = ctypes.POINTER(session_int)
 
 
477
    class certificate_credentials_st(ctypes.Structure):
 
 
479
    certificate_credentials_t = ctypes.POINTER(
 
 
480
        certificate_credentials_st)
 
 
481
    certificate_type_t = ctypes.c_int
 
 
482
    class datum_t(ctypes.Structure):
 
 
483
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
484
                    ('size', ctypes.c_uint)]
 
 
485
    class openpgp_crt_int(ctypes.Structure):
 
 
487
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
488
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
 
489
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
490
    credentials_type_t = ctypes.c_int # 
 
 
491
    transport_ptr_t = ctypes.c_void_p
 
 
492
    close_request_t = ctypes.c_int
 
 
495
    class Error(Exception):
 
 
496
        # We need to use the class name "GnuTLS" here, since this
 
 
497
        # exception might be raised from within GnuTLS.__init__,
 
 
498
        # which is called before the assignment to the "gnutls"
 
 
499
        # global variable has happened.
 
 
500
        def __init__(self, message = None, code = None, args=()):
 
 
501
            # Default usage is by a message string, but if a return
 
 
502
            # code is passed, convert it to a string with
 
 
505
            if message is None and code is not None:
 
 
506
                message = GnuTLS.strerror(code)
 
 
507
            return super(GnuTLS.Error, self).__init__(
 
 
510
    class CertificateSecurityError(Error):
 
 
514
    class Credentials(object):
 
 
516
            self._c_object = gnutls.certificate_credentials_t()
 
 
517
            gnutls.certificate_allocate_credentials(
 
 
518
                ctypes.byref(self._c_object))
 
 
519
            self.type = gnutls.CRD_CERTIFICATE
 
 
522
            gnutls.certificate_free_credentials(self._c_object)
 
 
524
    class ClientSession(object):
 
 
525
        def __init__(self, socket, credentials = None):
 
 
526
            self._c_object = gnutls.session_t()
 
 
527
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
 
528
            gnutls.set_default_priority(self._c_object)
 
 
529
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
530
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
533
            if credentials is None:
 
 
534
                credentials = gnutls.Credentials()
 
 
535
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
536
                                   ctypes.cast(credentials._c_object,
 
 
538
            self.credentials = credentials
 
 
541
            gnutls.deinit(self._c_object)
 
 
544
            return gnutls.handshake(self._c_object)
 
 
546
        def send(self, data):
 
 
550
                data_len -= gnutls.record_send(self._c_object,
 
 
555
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
557
    # Error handling functions
 
 
558
    def _error_code(result):
 
 
559
        """A function to raise exceptions on errors, suitable
 
 
560
        for the 'restype' attribute on ctypes functions"""
 
 
563
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
564
            raise gnutls.CertificateSecurityError(code = result)
 
 
565
        raise gnutls.Error(code = result)
 
 
567
    def _retry_on_error(result, func, arguments):
 
 
568
        """A function to retry on some errors, suitable
 
 
569
        for the 'errcheck' attribute on ctypes functions"""
 
 
571
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
572
                return _error_code(result)
 
 
573
            result = func(*arguments)
 
 
576
    # Unless otherwise indicated, the function declarations below are
 
 
577
    # all from the gnutls/gnutls.h C header file.
 
 
580
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
581
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
582
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
583
    priority_set_direct.restype = _error_code
 
 
585
    init = _library.gnutls_init
 
 
586
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
587
    init.restype = _error_code
 
 
589
    set_default_priority = _library.gnutls_set_default_priority
 
 
590
    set_default_priority.argtypes = [session_t]
 
 
591
    set_default_priority.restype = _error_code
 
 
593
    record_send = _library.gnutls_record_send
 
 
594
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
596
    record_send.restype = ctypes.c_ssize_t
 
 
597
    record_send.errcheck = _retry_on_error
 
 
599
    certificate_allocate_credentials = (
 
 
600
        _library.gnutls_certificate_allocate_credentials)
 
 
601
    certificate_allocate_credentials.argtypes = [
 
 
602
        ctypes.POINTER(certificate_credentials_t)]
 
 
603
    certificate_allocate_credentials.restype = _error_code
 
 
605
    certificate_free_credentials = (
 
 
606
        _library.gnutls_certificate_free_credentials)
 
 
607
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
608
    certificate_free_credentials.restype = None
 
 
610
    handshake_set_private_extensions = (
 
 
611
        _library.gnutls_handshake_set_private_extensions)
 
 
612
    handshake_set_private_extensions.argtypes = [session_t,
 
 
614
    handshake_set_private_extensions.restype = None
 
 
616
    credentials_set = _library.gnutls_credentials_set
 
 
617
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
619
    credentials_set.restype = _error_code
 
 
621
    strerror = _library.gnutls_strerror
 
 
622
    strerror.argtypes = [ctypes.c_int]
 
 
623
    strerror.restype = ctypes.c_char_p
 
 
625
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
626
    certificate_type_get.argtypes = [session_t]
 
 
627
    certificate_type_get.restype = _error_code
 
 
629
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
630
    certificate_get_peers.argtypes = [session_t,
 
 
631
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
632
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
634
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
635
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
636
    global_set_log_level.restype = None
 
 
638
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
639
    global_set_log_function.argtypes = [log_func]
 
 
640
    global_set_log_function.restype = None
 
 
642
    deinit = _library.gnutls_deinit
 
 
643
    deinit.argtypes = [session_t]
 
 
644
    deinit.restype = None
 
 
646
    handshake = _library.gnutls_handshake
 
 
647
    handshake.argtypes = [session_t]
 
 
648
    handshake.restype = _error_code
 
 
649
    handshake.errcheck = _retry_on_error
 
 
651
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
652
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
653
    transport_set_ptr.restype = None
 
 
655
    bye = _library.gnutls_bye
 
 
656
    bye.argtypes = [session_t, close_request_t]
 
 
657
    bye.restype = _error_code
 
 
658
    bye.errcheck = _retry_on_error
 
 
660
    check_version = _library.gnutls_check_version
 
 
661
    check_version.argtypes = [ctypes.c_char_p]
 
 
662
    check_version.restype = ctypes.c_char_p
 
 
664
    # All the function declarations below are from gnutls/openpgp.h
 
 
666
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
667
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
668
    openpgp_crt_init.restype = _error_code
 
 
670
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
671
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
672
                                   ctypes.POINTER(datum_t),
 
 
674
    openpgp_crt_import.restype = _error_code
 
 
676
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
677
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
678
                                        ctypes.POINTER(ctypes.c_uint)]
 
 
679
    openpgp_crt_verify_self.restype = _error_code
 
 
681
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
682
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
683
    openpgp_crt_deinit.restype = None
 
 
685
    openpgp_crt_get_fingerprint = (
 
 
686
        _library.gnutls_openpgp_crt_get_fingerprint)
 
 
687
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
691
    openpgp_crt_get_fingerprint.restype = _error_code
 
 
693
    # Remove non-public functions
 
 
694
    del _error_code, _retry_on_error
 
 
695
# Create the global "gnutls" object, simulating a module
 
 
698
def call_pipe(connection,       # : multiprocessing.Connection
 
 
699
              func, *args, **kwargs):
 
 
700
    """This function is meant to be called by multiprocessing.Process
 
 
702
    This function runs func(*args, **kwargs), and writes the resulting
 
 
703
    return value on the provided multiprocessing.Connection.
 
 
705
    connection.send(func(*args, **kwargs))
 
233
708
class Client(object):
 
234
709
    """A representation of a client host served by this server.
 
237
 
    name:       string; from the config file, used in log messages and
 
 
712
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
713
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
714
    approval_duration: datetime.timedelta(); Duration of one approval
 
 
715
    checker:    subprocess.Popen(); a running checker process used
 
 
716
                                    to see if the client lives.
 
 
717
                                    'None' if no process is running.
 
 
718
    checker_callback_tag: a gobject event source tag, or None
 
 
719
    checker_command: string; External command which is run to check
 
 
720
                     if client lives.  %() expansions are done at
 
 
721
                     runtime with vars(self) as dict, so that for
 
 
722
                     instance %(name)s can be used in the command.
 
 
723
    checker_initiator_tag: a gobject event source tag, or None
 
 
724
    created:    datetime.datetime(); (UTC) object creation
 
 
725
    client_structure: Object describing what attributes a client has
 
 
726
                      and is used for storing the client at exit
 
 
727
    current_checker_command: string; current running checker_command
 
 
728
    disable_initiator_tag: a gobject event source tag, or None
 
239
730
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
240
731
                 uniquely identify the client
 
241
 
    secret:     bytestring; sent verbatim (over TLS) to client
 
242
732
    host:       string; available for use by the checker command
 
243
 
    created:    datetime.datetime(); (UTC) object creation
 
244
 
    last_enabled: datetime.datetime(); (UTC)
 
 
733
    interval:   datetime.timedelta(); How often to start a new checker
 
 
734
    last_approval_request: datetime.datetime(); (UTC) or None
 
246
735
    last_checked_ok: datetime.datetime(); (UTC) or None
 
 
736
    last_checker_status: integer between 0 and 255 reflecting exit
 
 
737
                         status of last checker. -1 reflects crashed
 
 
738
                         checker, -2 means no checker completed yet.
 
 
739
    last_checker_signal: The signal which killed the last checker, if
 
 
740
                         last_checker_status is -1
 
 
741
    last_enabled: datetime.datetime(); (UTC) or None
 
 
742
    name:       string; from the config file, used in log messages and
 
 
744
    secret:     bytestring; sent verbatim (over TLS) to client
 
247
745
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
248
746
                                      until this client is disabled
 
249
 
    interval:   datetime.timedelta(); How often to start a new checker
 
250
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
251
 
    checker:    subprocess.Popen(); a running checker process used
 
252
 
                                    to see if the client lives.
 
253
 
                                    'None' if no process is running.
 
254
 
    checker_initiator_tag: a gobject event source tag, or None
 
255
 
    disable_initiator_tag: - '' -
 
256
 
    checker_callback_tag:  - '' -
 
257
 
    checker_command: string; External command which is run to check if
 
258
 
                     client lives.  %() expansions are done at
 
259
 
                     runtime with vars(self) as dict, so that for
 
260
 
                     instance %(name)s can be used in the command.
 
261
 
    current_checker_command: string; current running checker_command
 
262
 
    approved_delay: datetime.timedelta(); Time to wait for approval
 
263
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
264
 
    approved_duration: datetime.timedelta(); Duration of one approval
 
 
747
    extended_timeout:   extra long timeout when secret has been sent
 
 
748
    runtime_expansions: Allowed attributes for runtime expansion.
 
 
749
    expires:    datetime.datetime(); time (UTC) when a client will be
 
 
751
    server_settings: The server_settings dict from main()
 
 
754
    runtime_expansions = ("approval_delay", "approval_duration",
 
 
755
                          "created", "enabled", "expires",
 
 
756
                          "fingerprint", "host", "interval",
 
 
757
                          "last_approval_request", "last_checked_ok",
 
 
758
                          "last_enabled", "name", "timeout")
 
 
761
        "extended_timeout": "PT15M",
 
 
763
        "checker": "fping -q -- %%(host)s",
 
 
765
        "approval_delay": "PT0S",
 
 
766
        "approval_duration": "PT1S",
 
 
767
        "approved_by_default": "True",
 
268
 
    def _timedelta_to_milliseconds(td):
 
269
 
        "Convert a datetime.timedelta() to milliseconds"
 
270
 
        return ((td.days * 24 * 60 * 60 * 1000)
 
271
 
                + (td.seconds * 1000)
 
272
 
                + (td.microseconds // 1000))
 
274
 
    def timeout_milliseconds(self):
 
275
 
        "Return the 'timeout' attribute in milliseconds"
 
276
 
        return self._timedelta_to_milliseconds(self.timeout)
 
278
 
    def interval_milliseconds(self):
 
279
 
        "Return the 'interval' attribute in milliseconds"
 
280
 
        return self._timedelta_to_milliseconds(self.interval)
 
282
 
    def approved_delay_milliseconds(self):
 
283
 
        return self._timedelta_to_milliseconds(self.approved_delay)
 
285
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
286
 
        """Note: the 'checker' key in 'config' sets the
 
287
 
        'checker_command' attribute and *not* the 'checker'
 
 
772
    def config_parser(config):
 
 
773
        """Construct a new dict of client settings of this form:
 
 
774
        { client_name: {setting_name: value, ...}, ...}
 
 
775
        with exceptions for any special settings as defined above.
 
 
776
        NOTE: Must be a pure function. Must return the same result
 
 
777
        value given the same arguments.
 
 
780
        for client_name in config.sections():
 
 
781
            section = dict(config.items(client_name))
 
 
782
            client = settings[client_name] = {}
 
 
784
            client["host"] = section["host"]
 
 
785
            # Reformat values from string types to Python types
 
 
786
            client["approved_by_default"] = config.getboolean(
 
 
787
                client_name, "approved_by_default")
 
 
788
            client["enabled"] = config.getboolean(client_name,
 
 
791
            # Uppercase and remove spaces from fingerprint for later
 
 
792
            # comparison purposes with return value from the
 
 
793
            # fingerprint() function
 
 
794
            client["fingerprint"] = (section["fingerprint"].upper()
 
 
796
            if "secret" in section:
 
 
797
                client["secret"] = section["secret"].decode("base64")
 
 
798
            elif "secfile" in section:
 
 
799
                with open(os.path.expanduser(os.path.expandvars
 
 
800
                                             (section["secfile"])),
 
 
802
                    client["secret"] = secfile.read()
 
 
804
                raise TypeError("No secret or secfile for section {}"
 
 
806
            client["timeout"] = string_to_delta(section["timeout"])
 
 
807
            client["extended_timeout"] = string_to_delta(
 
 
808
                section["extended_timeout"])
 
 
809
            client["interval"] = string_to_delta(section["interval"])
 
 
810
            client["approval_delay"] = string_to_delta(
 
 
811
                section["approval_delay"])
 
 
812
            client["approval_duration"] = string_to_delta(
 
 
813
                section["approval_duration"])
 
 
814
            client["checker_command"] = section["checker"]
 
 
815
            client["last_approval_request"] = None
 
 
816
            client["last_checked_ok"] = None
 
 
817
            client["last_checker_status"] = -2
 
 
821
    def __init__(self, settings, name = None, server_settings=None):
 
292
 
        logger.debug(u"Creating client %r", self.name)
 
293
 
        # Uppercase and remove spaces from fingerprint for later
 
294
 
        # comparison purposes with return value from the fingerprint()
 
296
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
298
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
299
 
        if u"secret" in config:
 
300
 
            self.secret = config[u"secret"].decode(u"base64")
 
301
 
        elif u"secfile" in config:
 
302
 
            with open(os.path.expanduser(os.path.expandvars
 
303
 
                                         (config[u"secfile"])),
 
305
 
                self.secret = secfile.read()
 
 
823
        if server_settings is None:
 
 
825
        self.server_settings = server_settings
 
 
826
        # adding all client settings
 
 
827
        for setting, value in settings.items():
 
 
828
            setattr(self, setting, value)
 
 
831
            if not hasattr(self, "last_enabled"):
 
 
832
                self.last_enabled = datetime.datetime.utcnow()
 
 
833
            if not hasattr(self, "expires"):
 
 
834
                self.expires = (datetime.datetime.utcnow()
 
307
 
            raise TypeError(u"No secret or secfile for client %s"
 
309
 
        self.host = config.get(u"host", u"")
 
310
 
        self.created = datetime.datetime.utcnow()
 
312
 
        self.last_enabled = None
 
313
 
        self.last_checked_ok = None
 
314
 
        self.timeout = string_to_delta(config[u"timeout"])
 
315
 
        self.interval = string_to_delta(config[u"interval"])
 
316
 
        self.disable_hook = disable_hook
 
 
837
            self.last_enabled = None
 
 
840
        logger.debug("Creating client %r", self.name)
 
 
841
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
 
842
        self.created = settings.get("created",
 
 
843
                                    datetime.datetime.utcnow())
 
 
845
        # attributes specific for this server instance
 
317
846
        self.checker = None
 
318
847
        self.checker_initiator_tag = None
 
319
848
        self.disable_initiator_tag = None
 
320
849
        self.checker_callback_tag = None
 
321
 
        self.checker_command = config[u"checker"]
 
322
850
        self.current_checker_command = None
 
323
 
        self.last_connect = None
 
324
 
        self._approved = None
 
325
 
        self.approved_by_default = config.get(u"approved_by_default",
 
327
852
        self.approvals_pending = 0
 
328
 
        self.approved_delay = string_to_delta(
 
329
 
            config[u"approved_delay"])
 
330
 
        self.approved_duration = string_to_delta(
 
331
 
            config[u"approved_duration"])
 
332
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
 
853
        self.changedstate = multiprocessing_manager.Condition(
 
 
854
            multiprocessing_manager.Lock())
 
 
855
        self.client_structure = [attr
 
 
856
                                 for attr in self.__dict__.iterkeys()
 
 
857
                                 if not attr.startswith("_")]
 
 
858
        self.client_structure.append("client_structure")
 
 
860
        for name, t in inspect.getmembers(
 
 
861
                type(self), lambda obj: isinstance(obj, property)):
 
 
862
            if not name.startswith("_"):
 
 
863
                self.client_structure.append(name)
 
 
865
    # Send notice to process children that client state has changed
 
334
866
    def send_changedstate(self):
 
335
 
        self.changedstate.acquire()
 
336
 
        self.changedstate.notify_all()
 
337
 
        self.changedstate.release()
 
 
867
        with self.changedstate:
 
 
868
            self.changedstate.notify_all()
 
339
870
    def enable(self):
 
340
871
        """Start this client's checker and timeout hooks"""
 
341
 
        if getattr(self, u"enabled", False):
 
 
872
        if getattr(self, "enabled", False):
 
342
873
            # Already enabled
 
344
 
        self.send_changedstate()
 
 
875
        self.expires = datetime.datetime.utcnow() + self.timeout
 
345
877
        self.last_enabled = datetime.datetime.utcnow()
 
346
 
        # Schedule a new checker to be started an 'interval' from now,
 
347
 
        # and every interval from then on.
 
348
 
        self.checker_initiator_tag = (gobject.timeout_add
 
349
 
                                      (self.interval_milliseconds(),
 
351
 
        # Schedule a disable() when 'timeout' has passed
 
352
 
        self.disable_initiator_tag = (gobject.timeout_add
 
353
 
                                   (self.timeout_milliseconds(),
 
356
 
        # Also start a new checker *right now*.
 
 
879
        self.send_changedstate()
 
359
881
    def disable(self, quiet=True):
 
360
882
        """Disable this client."""
 
361
883
        if not getattr(self, "enabled", False):
 
 
886
            logger.info("Disabling client %s", self.name)
 
 
887
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
888
            gobject.source_remove(self.disable_initiator_tag)
 
 
889
            self.disable_initiator_tag = None
 
 
891
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
892
            gobject.source_remove(self.checker_initiator_tag)
 
 
893
            self.checker_initiator_tag = None
 
364
897
            self.send_changedstate()
 
366
 
            logger.info(u"Disabling client %s", self.name)
 
367
 
        if getattr(self, u"disable_initiator_tag", False):
 
368
 
            gobject.source_remove(self.disable_initiator_tag)
 
369
 
            self.disable_initiator_tag = None
 
370
 
        if getattr(self, u"checker_initiator_tag", False):
 
371
 
            gobject.source_remove(self.checker_initiator_tag)
 
372
 
            self.checker_initiator_tag = None
 
374
 
        if self.disable_hook:
 
375
 
            self.disable_hook(self)
 
377
898
        # Do not run this again if called by a gobject.timeout_add
 
380
901
    def __del__(self):
 
381
 
        self.disable_hook = None
 
384
 
    def checker_callback(self, pid, condition, command):
 
 
904
    def init_checker(self):
 
 
905
        # Schedule a new checker to be started an 'interval' from now,
 
 
906
        # and every interval from then on.
 
 
907
        if self.checker_initiator_tag is not None:
 
 
908
            gobject.source_remove(self.checker_initiator_tag)
 
 
909
        self.checker_initiator_tag = gobject.timeout_add(
 
 
910
            int(self.interval.total_seconds() * 1000),
 
 
912
        # Schedule a disable() when 'timeout' has passed
 
 
913
        if self.disable_initiator_tag is not None:
 
 
914
            gobject.source_remove(self.disable_initiator_tag)
 
 
915
        self.disable_initiator_tag = gobject.timeout_add(
 
 
916
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
917
        # Also start a new checker *right now*.
 
 
920
    def checker_callback(self, source, condition, connection,
 
385
922
        """The checker has completed, so take appropriate actions."""
 
386
923
        self.checker_callback_tag = None
 
387
924
        self.checker = None
 
388
 
        if os.WIFEXITED(condition):
 
389
 
            exitstatus = os.WEXITSTATUS(condition)
 
391
 
                logger.info(u"Checker for %(name)s succeeded",
 
 
925
        # Read return code from connection (see call_pipe)
 
 
926
        returncode = connection.recv()
 
 
930
            self.last_checker_status = returncode
 
 
931
            self.last_checker_signal = None
 
 
932
            if self.last_checker_status == 0:
 
 
933
                logger.info("Checker for %(name)s succeeded",
 
393
935
                self.checked_ok()
 
395
 
                logger.info(u"Checker for %(name)s failed",
 
 
937
                logger.info("Checker for %(name)s failed", vars(self))
 
398
 
            logger.warning(u"Checker for %(name)s crashed?",
 
 
939
            self.last_checker_status = -1
 
 
940
            self.last_checker_signal = -returncode
 
 
941
            logger.warning("Checker for %(name)s crashed?",
 
401
945
    def checked_ok(self):
 
402
 
        """Bump up the timeout for this client.
 
404
 
        This should only be called when the client has been seen,
 
 
946
        """Assert that the client has been seen, alive and well."""
 
407
947
        self.last_checked_ok = datetime.datetime.utcnow()
 
408
 
        gobject.source_remove(self.disable_initiator_tag)
 
409
 
        self.disable_initiator_tag = (gobject.timeout_add
 
410
 
                                      (self.timeout_milliseconds(),
 
 
948
        self.last_checker_status = 0
 
 
949
        self.last_checker_signal = None
 
 
952
    def bump_timeout(self, timeout=None):
 
 
953
        """Bump up the timeout for this client."""
 
 
955
            timeout = self.timeout
 
 
956
        if self.disable_initiator_tag is not None:
 
 
957
            gobject.source_remove(self.disable_initiator_tag)
 
 
958
            self.disable_initiator_tag = None
 
 
959
        if getattr(self, "enabled", False):
 
 
960
            self.disable_initiator_tag = gobject.timeout_add(
 
 
961
                int(timeout.total_seconds() * 1000), self.disable)
 
 
962
            self.expires = datetime.datetime.utcnow() + timeout
 
 
964
    def need_approval(self):
 
 
965
        self.last_approval_request = datetime.datetime.utcnow()
 
413
967
    def start_checker(self):
 
414
968
        """Start a new checker subprocess if one is not running.
 
 
553
 
class DBusObjectWithProperties(dbus.service.Object):
 
 
1134
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1135
    """A D-Bus object with annotations.
 
 
1137
    Classes inheriting from this can use the dbus_annotations
 
 
1138
    decorator to add annotations to methods or signals.
 
 
1142
    def _is_dbus_thing(thing):
 
 
1143
        """Returns a function testing if an attribute is a D-Bus thing
 
 
1145
        If called like _is_dbus_thing("method") it returns a function
 
 
1146
        suitable for use as predicate to inspect.getmembers().
 
 
1148
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
1151
    def _get_all_dbus_things(self, thing):
 
 
1152
        """Returns a generator of (name, attribute) pairs
 
 
1154
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
1155
                 athing.__get__(self))
 
 
1156
                for cls in self.__class__.__mro__
 
 
1158
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1160
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1161
                         out_signature = "s",
 
 
1162
                         path_keyword = 'object_path',
 
 
1163
                         connection_keyword = 'connection')
 
 
1164
    def Introspect(self, object_path, connection):
 
 
1165
        """Overloading of standard D-Bus method.
 
 
1167
        Inserts annotation tags on methods and signals.
 
 
1169
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1172
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1174
            for if_tag in document.getElementsByTagName("interface"):
 
 
1175
                # Add annotation tags
 
 
1176
                for typ in ("method", "signal"):
 
 
1177
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1179
                        for name, prop in (self.
 
 
1180
                                           _get_all_dbus_things(typ)):
 
 
1181
                            if (name == tag.getAttribute("name")
 
 
1182
                                and prop._dbus_interface
 
 
1183
                                == if_tag.getAttribute("name")):
 
 
1184
                                annots.update(getattr(
 
 
1185
                                    prop, "_dbus_annotations", {}))
 
 
1186
                        for name, value in annots.items():
 
 
1187
                            ann_tag = document.createElement(
 
 
1189
                            ann_tag.setAttribute("name", name)
 
 
1190
                            ann_tag.setAttribute("value", value)
 
 
1191
                            tag.appendChild(ann_tag)
 
 
1192
                # Add interface annotation tags
 
 
1193
                for annotation, value in dict(
 
 
1194
                    itertools.chain.from_iterable(
 
 
1195
                        annotations().items()
 
 
1196
                        for name, annotations
 
 
1197
                        in self._get_all_dbus_things("interface")
 
 
1198
                        if name == if_tag.getAttribute("name")
 
 
1200
                    ann_tag = document.createElement("annotation")
 
 
1201
                    ann_tag.setAttribute("name", annotation)
 
 
1202
                    ann_tag.setAttribute("value", value)
 
 
1203
                    if_tag.appendChild(ann_tag)
 
 
1204
                # Fix argument name for the Introspect method itself
 
 
1205
                if (if_tag.getAttribute("name")
 
 
1206
                                == dbus.INTROSPECTABLE_IFACE):
 
 
1207
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1208
                        if cn.getAttribute("name") == "Introspect":
 
 
1209
                            for arg in cn.getElementsByTagName("arg"):
 
 
1210
                                if (arg.getAttribute("direction")
 
 
1212
                                    arg.setAttribute("name",
 
 
1214
            xmlstring = document.toxml("utf-8")
 
 
1216
        except (AttributeError, xml.dom.DOMException,
 
 
1217
                xml.parsers.expat.ExpatError) as error:
 
 
1218
            logger.error("Failed to override Introspection method",
 
 
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
554
1224
    """A D-Bus object with properties.
 
556
1226
    Classes inheriting from this can use the dbus_service_property
 
557
1227
    decorator to expose methods as D-Bus properties.  It exposes the
 
558
1228
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
562
 
    def _is_dbus_property(obj):
 
563
 
        return getattr(obj, u"_dbus_is_property", False)
 
565
 
    def _get_all_dbus_properties(self):
 
566
 
        """Returns a generator of (name, attribute) pairs
 
568
 
        return ((prop._dbus_name, prop)
 
570
 
                inspect.getmembers(self, self._is_dbus_property))
 
572
1231
    def _get_dbus_property(self, interface_name, property_name):
 
573
1232
        """Returns a bound method if one exists which is a D-Bus
 
574
1233
        property with the specified name and interface.
 
576
 
        for name in (property_name,
 
577
 
                     property_name + u"_dbus_property"):
 
578
 
            prop = getattr(self, name, None)
 
580
 
                or not self._is_dbus_property(prop)
 
581
 
                or prop._dbus_name != property_name
 
582
 
                or (interface_name and prop._dbus_interface
 
583
 
                    and interface_name != prop._dbus_interface)):
 
 
1235
        for cls in self.__class__.__mro__:
 
 
1236
            for name, value in inspect.getmembers(
 
 
1237
                    cls, self._is_dbus_thing("property")):
 
 
1238
                if (value._dbus_name == property_name
 
 
1239
                    and value._dbus_interface == interface_name):
 
 
1240
                    return value.__get__(self)
 
586
1242
        # No such property
 
587
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
588
 
                                   + interface_name + u"."
 
591
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
 
1243
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1244
            self.dbus_object_path, interface_name, property_name))
 
 
1247
    def _get_all_interface_names(cls):
 
 
1248
        """Get a sequence of all interfaces supported by an object"""
 
 
1249
        return (name for name in set(getattr(getattr(x, attr),
 
 
1250
                                             "_dbus_interface", None)
 
 
1251
                                     for x in (inspect.getmro(cls))
 
 
1253
                if name is not None)
 
 
1255
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
593
1258
    def Get(self, interface_name, property_name):
 
594
1259
        """Standard D-Bus property Get() method, see D-Bus standard.
 
596
1261
        prop = self._get_dbus_property(interface_name, property_name)
 
597
 
        if prop._dbus_access == u"write":
 
 
1262
        if prop._dbus_access == "write":
 
598
1263
            raise DBusPropertyAccessException(property_name)
 
600
 
        if not hasattr(value, u"variant_level"):
 
 
1265
        if not hasattr(value, "variant_level"):
 
602
1267
        return type(value)(value, variant_level=value.variant_level+1)
 
604
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
1269
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
605
1270
    def Set(self, interface_name, property_name, value):
 
606
1271
        """Standard D-Bus property Set() method, see D-Bus standard.
 
608
1273
        prop = self._get_dbus_property(interface_name, property_name)
 
609
 
        if prop._dbus_access == u"read":
 
 
1274
        if prop._dbus_access == "read":
 
610
1275
            raise DBusPropertyAccessException(property_name)
 
611
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
1276
        if prop._dbus_get_args_options["byte_arrays"]:
 
612
1277
            # The byte_arrays option is not supported yet on
 
613
1278
            # signatures other than "ay".
 
614
 
            if prop._dbus_signature != u"ay":
 
616
 
            value = dbus.ByteArray(''.join(unichr(byte)
 
 
1279
            if prop._dbus_signature != "ay":
 
 
1280
                raise ValueError("Byte arrays not supported for non-"
 
 
1281
                                 "'ay' signature {!r}"
 
 
1282
                                 .format(prop._dbus_signature))
 
 
1283
            value = dbus.ByteArray(b''.join(chr(byte)
 
620
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
621
 
                         out_signature=u"a{sv}")
 
 
1287
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
1289
                         out_signature="a{sv}")
 
622
1290
    def GetAll(self, interface_name):
 
623
1291
        """Standard D-Bus property GetAll() method, see D-Bus
 
626
1294
        Note: Will not include properties with access="write".
 
629
 
        for name, prop in self._get_all_dbus_properties():
 
 
1297
        for name, prop in self._get_all_dbus_things("property"):
 
630
1298
            if (interface_name
 
631
1299
                and interface_name != prop._dbus_interface):
 
632
1300
                # Interface non-empty but did not match
 
634
1302
            # Ignore write-only properties
 
635
 
            if prop._dbus_access == u"write":
 
 
1303
            if prop._dbus_access == "write":
 
638
 
            if not hasattr(value, u"variant_level"):
 
 
1306
            if not hasattr(value, "variant_level"):
 
 
1307
                properties[name] = value
 
641
 
            all[name] = type(value)(value, variant_level=
 
642
 
                                    value.variant_level+1)
 
643
 
        return dbus.Dictionary(all, signature=u"sv")
 
 
1309
            properties[name] = type(value)(
 
 
1310
                value, variant_level = value.variant_level + 1)
 
 
1311
        return dbus.Dictionary(properties, signature="sv")
 
 
1313
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
 
1314
    def PropertiesChanged(self, interface_name, changed_properties,
 
 
1315
                          invalidated_properties):
 
 
1316
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
645
1321
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
647
1323
                         path_keyword='object_path',
 
648
1324
                         connection_keyword='connection')
 
649
1325
    def Introspect(self, object_path, connection):
 
650
 
        """Standard D-Bus method, overloaded to insert property tags.
 
 
1326
        """Overloading of standard D-Bus method.
 
 
1328
        Inserts property tags and interface annotation tags.
 
652
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1330
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
655
1334
            document = xml.dom.minidom.parseString(xmlstring)
 
656
1336
            def make_tag(document, name, prop):
 
657
 
                e = document.createElement(u"property")
 
658
 
                e.setAttribute(u"name", name)
 
659
 
                e.setAttribute(u"type", prop._dbus_signature)
 
660
 
                e.setAttribute(u"access", prop._dbus_access)
 
 
1337
                e = document.createElement("property")
 
 
1338
                e.setAttribute("name", name)
 
 
1339
                e.setAttribute("type", prop._dbus_signature)
 
 
1340
                e.setAttribute("access", prop._dbus_access)
 
662
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
1343
            for if_tag in document.getElementsByTagName("interface"):
 
663
1345
                for tag in (make_tag(document, name, prop)
 
665
 
                            in self._get_all_dbus_properties()
 
 
1347
                            in self._get_all_dbus_things("property")
 
666
1348
                            if prop._dbus_interface
 
667
 
                            == if_tag.getAttribute(u"name")):
 
 
1349
                            == if_tag.getAttribute("name")):
 
668
1350
                    if_tag.appendChild(tag)
 
 
1351
                # Add annotation tags for properties
 
 
1352
                for tag in if_tag.getElementsByTagName("property"):
 
 
1354
                    for name, prop in self._get_all_dbus_things(
 
 
1356
                        if (name == tag.getAttribute("name")
 
 
1357
                            and prop._dbus_interface
 
 
1358
                            == if_tag.getAttribute("name")):
 
 
1359
                            annots.update(getattr(
 
 
1360
                                prop, "_dbus_annotations", {}))
 
 
1361
                    for name, value in annots.items():
 
 
1362
                        ann_tag = document.createElement(
 
 
1364
                        ann_tag.setAttribute("name", name)
 
 
1365
                        ann_tag.setAttribute("value", value)
 
 
1366
                        tag.appendChild(ann_tag)
 
669
1367
                # Add the names to the return values for the
 
670
1368
                # "org.freedesktop.DBus.Properties" methods
 
671
 
                if (if_tag.getAttribute(u"name")
 
672
 
                    == u"org.freedesktop.DBus.Properties"):
 
673
 
                    for cn in if_tag.getElementsByTagName(u"method"):
 
674
 
                        if cn.getAttribute(u"name") == u"Get":
 
675
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
676
 
                                if (arg.getAttribute(u"direction")
 
678
 
                                    arg.setAttribute(u"name", u"value")
 
679
 
                        elif cn.getAttribute(u"name") == u"GetAll":
 
680
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
681
 
                                if (arg.getAttribute(u"direction")
 
683
 
                                    arg.setAttribute(u"name", u"props")
 
684
 
            xmlstring = document.toxml(u"utf-8")
 
686
 
        except (AttributeError, xml.dom.DOMException,
 
687
 
                xml.parsers.expat.ExpatError), error:
 
688
 
            logger.error(u"Failed to override Introspection method",
 
 
1369
                if (if_tag.getAttribute("name")
 
 
1370
                    == "org.freedesktop.DBus.Properties"):
 
 
1371
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1372
                        if cn.getAttribute("name") == "Get":
 
 
1373
                            for arg in cn.getElementsByTagName("arg"):
 
 
1374
                                if (arg.getAttribute("direction")
 
 
1376
                                    arg.setAttribute("name", "value")
 
 
1377
                        elif cn.getAttribute("name") == "GetAll":
 
 
1378
                            for arg in cn.getElementsByTagName("arg"):
 
 
1379
                                if (arg.getAttribute("direction")
 
 
1381
                                    arg.setAttribute("name", "props")
 
 
1382
            xmlstring = document.toxml("utf-8")
 
 
1384
        except (AttributeError, xml.dom.DOMException,
 
 
1385
                xml.parsers.expat.ExpatError) as error:
 
 
1386
            logger.error("Failed to override Introspection method",
 
 
1391
    dbus.OBJECT_MANAGER_IFACE
 
 
1392
except AttributeError:
 
 
1393
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1396
    """A D-Bus object with an ObjectManager.
 
 
1398
    Classes inheriting from this exposes the standard
 
 
1399
    GetManagedObjects call and the InterfacesAdded and
 
 
1400
    InterfacesRemoved signals on the standard
 
 
1401
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1403
    Note: No signals are sent automatically; they must be sent
 
 
1406
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1407
                         out_signature = "a{oa{sa{sv}}}")
 
 
1408
    def GetManagedObjects(self):
 
 
1409
        """This function must be overridden"""
 
 
1410
        raise NotImplementedError()
 
 
1412
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1413
                         signature = "oa{sa{sv}}")
 
 
1414
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1417
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1418
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1421
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1422
                         out_signature = "s",
 
 
1423
                         path_keyword = 'object_path',
 
 
1424
                         connection_keyword = 'connection')
 
 
1425
    def Introspect(self, object_path, connection):
 
 
1426
        """Overloading of standard D-Bus method.
 
 
1428
        Override return argument name of GetManagedObjects to be
 
 
1429
        "objpath_interfaces_and_properties"
 
 
1431
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1435
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1437
            for if_tag in document.getElementsByTagName("interface"):
 
 
1438
                # Fix argument name for the GetManagedObjects method
 
 
1439
                if (if_tag.getAttribute("name")
 
 
1440
                                == dbus.OBJECT_MANAGER_IFACE):
 
 
1441
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1442
                        if (cn.getAttribute("name")
 
 
1443
                            == "GetManagedObjects"):
 
 
1444
                            for arg in cn.getElementsByTagName("arg"):
 
 
1445
                                if (arg.getAttribute("direction")
 
 
1449
                                        "objpath_interfaces"
 
 
1451
            xmlstring = document.toxml("utf-8")
 
 
1453
        except (AttributeError, xml.dom.DOMException,
 
 
1454
                xml.parsers.expat.ExpatError) as error:
 
 
1455
            logger.error("Failed to override Introspection method",
 
 
1459
def datetime_to_dbus(dt, variant_level=0):
 
 
1460
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
1462
        return dbus.String("", variant_level = variant_level)
 
 
1463
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1466
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1467
    """A class decorator; applied to a subclass of
 
 
1468
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1469
    interface names according to the "alt_interface_names" mapping.
 
 
1472
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1473
                                    "net.example.AlternateInterface"})
 
 
1474
    class SampleDBusObject(dbus.service.Object):
 
 
1475
        @dbus.service.method("org.example.Interface")
 
 
1476
        def SampleDBusMethod():
 
 
1479
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1480
    reachable via two interfaces: "org.example.Interface" and
 
 
1481
    "net.example.AlternateInterface", the latter of which will have
 
 
1482
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1483
    "true", unless "deprecate" is passed with a False value.
 
 
1485
    This works for methods and signals, and also for D-Bus properties
 
 
1486
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1487
    dbus_interface_annotations decorator).
 
 
1491
        for orig_interface_name, alt_interface_name in (
 
 
1492
                alt_interface_names.items()):
 
 
1494
            interface_names = set()
 
 
1495
            # Go though all attributes of the class
 
 
1496
            for attrname, attribute in inspect.getmembers(cls):
 
 
1497
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
 
1498
                # with the wrong interface name
 
 
1499
                if (not hasattr(attribute, "_dbus_interface")
 
 
1500
                    or not attribute._dbus_interface.startswith(
 
 
1501
                        orig_interface_name)):
 
 
1503
                # Create an alternate D-Bus interface name based on
 
 
1505
                alt_interface = attribute._dbus_interface.replace(
 
 
1506
                    orig_interface_name, alt_interface_name)
 
 
1507
                interface_names.add(alt_interface)
 
 
1508
                # Is this a D-Bus signal?
 
 
1509
                if getattr(attribute, "_dbus_is_signal", False):
 
 
1510
                    if sys.version_info.major == 2:
 
 
1511
                        # Extract the original non-method undecorated
 
 
1512
                        # function by black magic
 
 
1513
                        nonmethod_func = (dict(
 
 
1514
                            zip(attribute.func_code.co_freevars,
 
 
1515
                                attribute.__closure__))
 
 
1516
                                          ["func"].cell_contents)
 
 
1518
                        nonmethod_func = attribute
 
 
1519
                    # Create a new, but exactly alike, function
 
 
1520
                    # object, and decorate it to be a new D-Bus signal
 
 
1521
                    # with the alternate D-Bus interface name
 
 
1522
                    if sys.version_info.major == 2:
 
 
1523
                        new_function = types.FunctionType(
 
 
1524
                            nonmethod_func.func_code,
 
 
1525
                            nonmethod_func.func_globals,
 
 
1526
                            nonmethod_func.func_name,
 
 
1527
                            nonmethod_func.func_defaults,
 
 
1528
                            nonmethod_func.func_closure)
 
 
1530
                        new_function = types.FunctionType(
 
 
1531
                            nonmethod_func.__code__,
 
 
1532
                            nonmethod_func.__globals__,
 
 
1533
                            nonmethod_func.__name__,
 
 
1534
                            nonmethod_func.__defaults__,
 
 
1535
                            nonmethod_func.__closure__)
 
 
1536
                    new_function = (dbus.service.signal(
 
 
1538
                        attribute._dbus_signature)(new_function))
 
 
1539
                    # Copy annotations, if any
 
 
1541
                        new_function._dbus_annotations = dict(
 
 
1542
                            attribute._dbus_annotations)
 
 
1543
                    except AttributeError:
 
 
1545
                    # Define a creator of a function to call both the
 
 
1546
                    # original and alternate functions, so both the
 
 
1547
                    # original and alternate signals gets sent when
 
 
1548
                    # the function is called
 
 
1549
                    def fixscope(func1, func2):
 
 
1550
                        """This function is a scope container to pass
 
 
1551
                        func1 and func2 to the "call_both" function
 
 
1552
                        outside of its arguments"""
 
 
1554
                        @functools.wraps(func2)
 
 
1555
                        def call_both(*args, **kwargs):
 
 
1556
                            """This function will emit two D-Bus
 
 
1557
                            signals by calling func1 and func2"""
 
 
1558
                            func1(*args, **kwargs)
 
 
1559
                            func2(*args, **kwargs)
 
 
1560
                        # Make wrapper function look like a D-Bus signal
 
 
1561
                        for name, attr in inspect.getmembers(func2):
 
 
1562
                            if name.startswith("_dbus_"):
 
 
1563
                                setattr(call_both, name, attr)
 
 
1566
                    # Create the "call_both" function and add it to
 
 
1568
                    attr[attrname] = fixscope(attribute, new_function)
 
 
1569
                # Is this a D-Bus method?
 
 
1570
                elif getattr(attribute, "_dbus_is_method", False):
 
 
1571
                    # Create a new, but exactly alike, function
 
 
1572
                    # object.  Decorate it to be a new D-Bus method
 
 
1573
                    # with the alternate D-Bus interface name.  Add it
 
 
1576
                        dbus.service.method(
 
 
1578
                            attribute._dbus_in_signature,
 
 
1579
                            attribute._dbus_out_signature)
 
 
1580
                        (types.FunctionType(attribute.func_code,
 
 
1581
                                            attribute.func_globals,
 
 
1582
                                            attribute.func_name,
 
 
1583
                                            attribute.func_defaults,
 
 
1584
                                            attribute.func_closure)))
 
 
1585
                    # Copy annotations, if any
 
 
1587
                        attr[attrname]._dbus_annotations = dict(
 
 
1588
                            attribute._dbus_annotations)
 
 
1589
                    except AttributeError:
 
 
1591
                # Is this a D-Bus property?
 
 
1592
                elif getattr(attribute, "_dbus_is_property", False):
 
 
1593
                    # Create a new, but exactly alike, function
 
 
1594
                    # object, and decorate it to be a new D-Bus
 
 
1595
                    # property with the alternate D-Bus interface
 
 
1596
                    # name.  Add it to the class.
 
 
1597
                    attr[attrname] = (dbus_service_property(
 
 
1598
                        alt_interface, attribute._dbus_signature,
 
 
1599
                        attribute._dbus_access,
 
 
1600
                        attribute._dbus_get_args_options
 
 
1602
                                      (types.FunctionType(
 
 
1603
                                          attribute.func_code,
 
 
1604
                                          attribute.func_globals,
 
 
1605
                                          attribute.func_name,
 
 
1606
                                          attribute.func_defaults,
 
 
1607
                                          attribute.func_closure)))
 
 
1608
                    # Copy annotations, if any
 
 
1610
                        attr[attrname]._dbus_annotations = dict(
 
 
1611
                            attribute._dbus_annotations)
 
 
1612
                    except AttributeError:
 
 
1614
                # Is this a D-Bus interface?
 
 
1615
                elif getattr(attribute, "_dbus_is_interface", False):
 
 
1616
                    # Create a new, but exactly alike, function
 
 
1617
                    # object.  Decorate it to be a new D-Bus interface
 
 
1618
                    # with the alternate D-Bus interface name.  Add it
 
 
1621
                        dbus_interface_annotations(alt_interface)
 
 
1622
                        (types.FunctionType(attribute.func_code,
 
 
1623
                                            attribute.func_globals,
 
 
1624
                                            attribute.func_name,
 
 
1625
                                            attribute.func_defaults,
 
 
1626
                                            attribute.func_closure)))
 
 
1628
                # Deprecate all alternate interfaces
 
 
1629
                iname="_AlternateDBusNames_interface_annotation{}"
 
 
1630
                for interface_name in interface_names:
 
 
1632
                    @dbus_interface_annotations(interface_name)
 
 
1634
                        return { "org.freedesktop.DBus.Deprecated":
 
 
1636
                    # Find an unused name
 
 
1637
                    for aname in (iname.format(i)
 
 
1638
                                  for i in itertools.count()):
 
 
1639
                        if aname not in attr:
 
 
1643
                # Replace the class with a new subclass of it with
 
 
1644
                # methods, signals, etc. as created above.
 
 
1645
                cls = type(b"{}Alternate".format(cls.__name__),
 
 
1652
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1653
                            "se.bsnet.fukt.Mandos"})
 
693
1654
class ClientDBus(Client, DBusObjectWithProperties):
 
694
1655
    """A Client class using D-Bus
 
 
697
1658
    dbus_object_path: dbus.ObjectPath
 
698
1659
    bus: dbus.SystemBus()
 
 
1662
    runtime_expansions = (Client.runtime_expansions
 
 
1663
                          + ("dbus_object_path", ))
 
 
1665
    _interface = "se.recompile.Mandos.Client"
 
700
1667
    # dbus.service.Object doesn't use super(), so we can't either.
 
702
1669
    def __init__(self, bus = None, *args, **kwargs):
 
703
 
        self._approvals_pending = 0
 
705
1671
        Client.__init__(self, *args, **kwargs)
 
706
1672
        # Only now, when this client is initialized, can it show up on
 
708
 
        self.dbus_object_path = (dbus.ObjectPath
 
710
 
                                  + self.name.replace(u".", u"_")))
 
 
1674
        client_object_name = str(self.name).translate(
 
 
1675
            {ord("."): ord("_"),
 
 
1676
             ord("-"): ord("_")})
 
 
1677
        self.dbus_object_path = dbus.ObjectPath(
 
 
1678
            "/clients/" + client_object_name)
 
711
1679
        DBusObjectWithProperties.__init__(self, self.bus,
 
712
1680
                                          self.dbus_object_path)
 
714
 
    def _get_approvals_pending(self):
 
715
 
        return self._approvals_pending
 
716
 
    def _set_approvals_pending(self, value):
 
717
 
        old_value = self._approvals_pending
 
718
 
        self._approvals_pending = value
 
720
 
        if (hasattr(self, "dbus_object_path")
 
721
 
            and bval is not bool(old_value)):
 
722
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
723
 
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
726
 
    approvals_pending = property(_get_approvals_pending,
 
727
 
                                 _set_approvals_pending)
 
728
 
    del _get_approvals_pending, _set_approvals_pending
 
731
 
    def _datetime_to_dbus(dt, variant_level=0):
 
732
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
733
 
        return dbus.String(dt.isoformat(),
 
734
 
                           variant_level=variant_level)
 
737
 
        oldstate = getattr(self, u"enabled", False)
 
738
 
        r = Client.enable(self)
 
739
 
        if oldstate != self.enabled:
 
741
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
742
 
                                 dbus.Boolean(True, variant_level=1))
 
743
 
            self.PropertyChanged(
 
744
 
                dbus.String(u"last_enabled"),
 
745
 
                self._datetime_to_dbus(self.last_enabled,
 
749
 
    def disable(self, quiet = False):
 
750
 
        oldstate = getattr(self, u"enabled", False)
 
751
 
        r = Client.disable(self, quiet=quiet)
 
752
 
        if not quiet and oldstate != self.enabled:
 
754
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
755
 
                                 dbus.Boolean(False, variant_level=1))
 
 
1682
    def notifychangeproperty(transform_func, dbus_name,
 
 
1683
                             type_func=lambda x: x,
 
 
1685
                             invalidate_only=False,
 
 
1686
                             _interface=_interface):
 
 
1687
        """ Modify a variable so that it's a property which announces
 
 
1688
        its changes to DBus.
 
 
1690
        transform_fun: Function that takes a value and a variant_level
 
 
1691
                       and transforms it to a D-Bus type.
 
 
1692
        dbus_name: D-Bus name of the variable
 
 
1693
        type_func: Function that transform the value before sending it
 
 
1694
                   to the D-Bus.  Default: no transform
 
 
1695
        variant_level: D-Bus variant level.  Default: 1
 
 
1697
        attrname = "_{}".format(dbus_name)
 
 
1699
        def setter(self, value):
 
 
1700
            if hasattr(self, "dbus_object_path"):
 
 
1701
                if (not hasattr(self, attrname) or
 
 
1702
                    type_func(getattr(self, attrname, None))
 
 
1703
                    != type_func(value)):
 
 
1705
                        self.PropertiesChanged(
 
 
1706
                            _interface, dbus.Dictionary(),
 
 
1707
                            dbus.Array((dbus_name, )))
 
 
1709
                        dbus_value = transform_func(
 
 
1711
                            variant_level = variant_level)
 
 
1712
                        self.PropertyChanged(dbus.String(dbus_name),
 
 
1714
                        self.PropertiesChanged(
 
 
1716
                            dbus.Dictionary({ dbus.String(dbus_name):
 
 
1719
            setattr(self, attrname, value)
 
 
1721
        return property(lambda self: getattr(self, attrname), setter)
 
 
1723
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
 
1724
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
 
1727
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
 
1728
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
 
1730
    checker = notifychangeproperty(
 
 
1731
        dbus.Boolean, "CheckerRunning",
 
 
1732
        type_func = lambda checker: checker is not None)
 
 
1733
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
 
1735
    last_checker_status = notifychangeproperty(dbus.Int16,
 
 
1736
                                               "LastCheckerStatus")
 
 
1737
    last_approval_request = notifychangeproperty(
 
 
1738
        datetime_to_dbus, "LastApprovalRequest")
 
 
1739
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
 
1740
                                               "ApprovedByDefault")
 
 
1741
    approval_delay = notifychangeproperty(
 
 
1742
        dbus.UInt64, "ApprovalDelay",
 
 
1743
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1744
    approval_duration = notifychangeproperty(
 
 
1745
        dbus.UInt64, "ApprovalDuration",
 
 
1746
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1747
    host = notifychangeproperty(dbus.String, "Host")
 
 
1748
    timeout = notifychangeproperty(
 
 
1749
        dbus.UInt64, "Timeout",
 
 
1750
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1751
    extended_timeout = notifychangeproperty(
 
 
1752
        dbus.UInt64, "ExtendedTimeout",
 
 
1753
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1754
    interval = notifychangeproperty(
 
 
1755
        dbus.UInt64, "Interval",
 
 
1756
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1757
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
 
1758
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
 
1759
                                  invalidate_only=True)
 
 
1761
    del notifychangeproperty
 
758
1763
    def __del__(self, *args, **kwargs):
 
760
1765
            self.remove_from_connection()
 
761
1766
        except LookupError:
 
763
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
 
1768
        if hasattr(DBusObjectWithProperties, "__del__"):
 
764
1769
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
765
1770
        Client.__del__(self, *args, **kwargs)
 
767
 
    def checker_callback(self, pid, condition, command,
 
769
 
        self.checker_callback_tag = None
 
772
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
773
 
                             dbus.Boolean(False, variant_level=1))
 
774
 
        if os.WIFEXITED(condition):
 
775
 
            exitstatus = os.WEXITSTATUS(condition)
 
 
1772
    def checker_callback(self, source, condition,
 
 
1773
                         connection, command, *args, **kwargs):
 
 
1774
        ret = Client.checker_callback(self, source, condition,
 
 
1775
                                      connection, command, *args,
 
 
1777
        exitstatus = self.last_checker_status
 
776
1779
            # Emit D-Bus signal
 
777
1780
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
778
 
                                  dbus.Int64(condition),
 
 
1781
                                  # This is specific to GNU libC
 
 
1782
                                  dbus.Int64(exitstatus << 8),
 
779
1783
                                  dbus.String(command))
 
781
1785
            # Emit D-Bus signal
 
782
1786
            self.CheckerCompleted(dbus.Int16(-1),
 
783
 
                                  dbus.Int64(condition),
 
 
1788
                                      # This is specific to GNU libC
 
 
1790
                                      | self.last_checker_signal),
 
784
1791
                                  dbus.String(command))
 
786
 
        return Client.checker_callback(self, pid, condition, command,
 
789
 
    def checked_ok(self, *args, **kwargs):
 
790
 
        r = Client.checked_ok(self, *args, **kwargs)
 
792
 
        self.PropertyChanged(
 
793
 
            dbus.String(u"last_checked_ok"),
 
794
 
            (self._datetime_to_dbus(self.last_checked_ok,
 
798
1794
    def start_checker(self, *args, **kwargs):
 
799
 
        old_checker = self.checker
 
800
 
        if self.checker is not None:
 
801
 
            old_checker_pid = self.checker.pid
 
803
 
            old_checker_pid = None
 
 
1795
        old_checker_pid = getattr(self.checker, "pid", None)
 
804
1796
        r = Client.start_checker(self, *args, **kwargs)
 
805
1797
        # Only if new checker process was started
 
806
1798
        if (self.checker is not None
 
807
1799
            and old_checker_pid != self.checker.pid):
 
808
1800
            # Emit D-Bus signal
 
809
1801
            self.CheckerStarted(self.current_checker_command)
 
810
 
            self.PropertyChanged(
 
811
 
                dbus.String(u"checker_running"),
 
812
 
                dbus.Boolean(True, variant_level=1))
 
815
 
    def stop_checker(self, *args, **kwargs):
 
816
 
        old_checker = getattr(self, u"checker", None)
 
817
 
        r = Client.stop_checker(self, *args, **kwargs)
 
818
 
        if (old_checker is not None
 
819
 
            and getattr(self, u"checker", None) is None):
 
820
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
821
 
                                 dbus.Boolean(False, variant_level=1))
 
824
1804
    def _reset_approved(self):
 
825
 
        self._approved = None
 
 
1805
        self.approved = None
 
828
1808
    def approve(self, value=True):
 
 
1809
        self.approved = value
 
 
1810
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
 
1811
                                * 1000), self._reset_approved)
 
829
1812
        self.send_changedstate()
 
830
 
        self._approved = value
 
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
832
 
                            self._reset_approved)
 
835
1814
    ## D-Bus methods, signals & properties
 
836
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
840
1820
    # CheckerCompleted - signal
 
841
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
 
1821
    @dbus.service.signal(_interface, signature="nxs")
 
842
1822
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
846
1826
    # CheckerStarted - signal
 
847
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
1827
    @dbus.service.signal(_interface, signature="s")
 
848
1828
    def CheckerStarted(self, command):
 
852
1832
    # PropertyChanged - signal
 
853
 
    @dbus.service.signal(_interface, signature=u"sv")
 
 
1833
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
 
1834
    @dbus.service.signal(_interface, signature="sv")
 
854
1835
    def PropertyChanged(self, property, value):
 
 
867
1848
    # Rejected - signal
 
868
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
1849
    @dbus.service.signal(_interface, signature="s")
 
869
1850
    def Rejected(self, reason):
 
873
1854
    # NeedApproval - signal
 
874
 
    @dbus.service.signal(_interface, signature=u"db")
 
 
1855
    @dbus.service.signal(_interface, signature="tb")
 
875
1856
    def NeedApproval(self, timeout, default):
 
 
1858
        return self.need_approval()
 
881
1862
    # Approve - method
 
882
 
    @dbus.service.method(_interface, in_signature=u"b")
 
 
1863
    @dbus.service.method(_interface, in_signature="b")
 
883
1864
    def Approve(self, value):
 
884
1865
        self.approve(value)
 
886
1867
    # CheckedOK - method
 
887
1868
    @dbus.service.method(_interface)
 
888
1869
    def CheckedOK(self):
 
889
 
        return self.checked_ok()
 
891
1872
    # Enable - method
 
 
1873
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
892
1874
    @dbus.service.method(_interface)
 
893
1875
    def Enable(self):
 
897
1879
    # StartChecker - method
 
 
1880
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
898
1881
    @dbus.service.method(_interface)
 
899
1882
    def StartChecker(self):
 
901
1884
        self.start_checker()
 
903
1886
    # Disable - method
 
 
1887
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
904
1888
    @dbus.service.method(_interface)
 
905
1889
    def Disable(self):
 
909
1893
    # StopChecker - method
 
 
1894
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
910
1895
    @dbus.service.method(_interface)
 
911
1896
    def StopChecker(self):
 
912
1897
        self.stop_checker()
 
916
 
    # approved_pending - property
 
917
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
918
 
    def approved_pending_dbus_property(self):
 
 
1901
    # ApprovalPending - property
 
 
1902
    @dbus_service_property(_interface, signature="b", access="read")
 
 
1903
    def ApprovalPending_dbus_property(self):
 
919
1904
        return dbus.Boolean(bool(self.approvals_pending))
 
921
 
    # approved_by_default - property
 
922
 
    @dbus_service_property(_interface, signature=u"b",
 
924
 
    def approved_by_default_dbus_property(self):
 
925
 
        return dbus.Boolean(self.approved_by_default)
 
927
 
    # approved_delay - property
 
928
 
    @dbus_service_property(_interface, signature=u"t",
 
930
 
    def approved_delay_dbus_property(self):
 
931
 
        return dbus.UInt64(self.approved_delay_milliseconds())
 
933
 
    # approved_duration - property
 
934
 
    @dbus_service_property(_interface, signature=u"t",
 
936
 
    def approved_duration_dbus_property(self):
 
937
 
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
938
 
                self.approved_duration))
 
941
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
942
 
    def name_dbus_property(self):
 
 
1906
    # ApprovedByDefault - property
 
 
1907
    @dbus_service_property(_interface,
 
 
1910
    def ApprovedByDefault_dbus_property(self, value=None):
 
 
1911
        if value is None:       # get
 
 
1912
            return dbus.Boolean(self.approved_by_default)
 
 
1913
        self.approved_by_default = bool(value)
 
 
1915
    # ApprovalDelay - property
 
 
1916
    @dbus_service_property(_interface,
 
 
1919
    def ApprovalDelay_dbus_property(self, value=None):
 
 
1920
        if value is None:       # get
 
 
1921
            return dbus.UInt64(self.approval_delay.total_seconds()
 
 
1923
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
 
1925
    # ApprovalDuration - property
 
 
1926
    @dbus_service_property(_interface,
 
 
1929
    def ApprovalDuration_dbus_property(self, value=None):
 
 
1930
        if value is None:       # get
 
 
1931
            return dbus.UInt64(self.approval_duration.total_seconds()
 
 
1933
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
 
1937
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
1938
    @dbus_service_property(_interface, signature="s", access="read")
 
 
1939
    def Name_dbus_property(self):
 
943
1940
        return dbus.String(self.name)
 
945
 
    # fingerprint - property
 
946
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
947
 
    def fingerprint_dbus_property(self):
 
 
1942
    # Fingerprint - property
 
 
1944
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
1945
    @dbus_service_property(_interface, signature="s", access="read")
 
 
1946
    def Fingerprint_dbus_property(self):
 
948
1947
        return dbus.String(self.fingerprint)
 
951
 
    @dbus_service_property(_interface, signature=u"s",
 
953
 
    def host_dbus_property(self, value=None):
 
 
1950
    @dbus_service_property(_interface,
 
 
1953
    def Host_dbus_property(self, value=None):
 
954
1954
        if value is None:       # get
 
955
1955
            return dbus.String(self.host)
 
958
 
        self.PropertyChanged(dbus.String(u"host"),
 
959
 
                             dbus.String(value, variant_level=1))
 
962
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
963
 
    def created_dbus_property(self):
 
964
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
966
 
    # last_enabled - property
 
967
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
968
 
    def last_enabled_dbus_property(self):
 
969
 
        if self.last_enabled is None:
 
970
 
            return dbus.String(u"")
 
971
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
974
 
    @dbus_service_property(_interface, signature=u"b",
 
976
 
    def enabled_dbus_property(self, value=None):
 
 
1956
        self.host = str(value)
 
 
1958
    # Created - property
 
 
1960
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
1961
    @dbus_service_property(_interface, signature="s", access="read")
 
 
1962
    def Created_dbus_property(self):
 
 
1963
        return datetime_to_dbus(self.created)
 
 
1965
    # LastEnabled - property
 
 
1966
    @dbus_service_property(_interface, signature="s", access="read")
 
 
1967
    def LastEnabled_dbus_property(self):
 
 
1968
        return datetime_to_dbus(self.last_enabled)
 
 
1970
    # Enabled - property
 
 
1971
    @dbus_service_property(_interface,
 
 
1974
    def Enabled_dbus_property(self, value=None):
 
977
1975
        if value is None:       # get
 
978
1976
            return dbus.Boolean(self.enabled)
 
 
1425
2465
    Assumes a gobject.MainLoop event loop.
 
1427
2468
    def __init__(self, server_address, RequestHandlerClass,
 
1428
 
                 interface=None, use_ipv6=True, clients=None,
 
1429
 
                 gnutls_priority=None, use_dbus=True):
 
 
2472
                 gnutls_priority=None,
 
1430
2475
        self.enabled = False
 
1431
2476
        self.clients = clients
 
1432
2477
        if self.clients is None:
 
1433
 
            self.clients = set()
 
1434
2479
        self.use_dbus = use_dbus
 
1435
2480
        self.gnutls_priority = gnutls_priority
 
1436
2481
        IPv6_TCPServer.__init__(self, server_address,
 
1437
2482
                                RequestHandlerClass,
 
1438
2483
                                interface = interface,
 
1439
 
                                use_ipv6 = use_ipv6)
 
 
2484
                                use_ipv6 = use_ipv6,
 
 
2485
                                socketfd = socketfd)
 
1440
2487
    def server_activate(self):
 
1441
2488
        if self.enabled:
 
1442
2489
            return socketserver.TCPServer.server_activate(self)
 
1443
2491
    def enable(self):
 
1444
2492
        self.enabled = True
 
1445
 
    def add_pipe(self, parent_pipe):
 
 
2494
    def add_pipe(self, parent_pipe, proc):
 
1446
2495
        # Call "handle_ipc" for both data and EOF events
 
1447
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1448
 
                             gobject.IO_IN | gobject.IO_HUP,
 
1449
 
                             functools.partial(self.handle_ipc,
 
1450
 
                                               parent_pipe = parent_pipe))
 
1452
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
 
2496
        gobject.io_add_watch(
 
 
2497
            parent_pipe.fileno(),
 
 
2498
            gobject.IO_IN | gobject.IO_HUP,
 
 
2499
            functools.partial(self.handle_ipc,
 
 
2500
                              parent_pipe = parent_pipe,
 
 
2503
    def handle_ipc(self, source, condition,
 
1453
2506
                   client_object=None):
 
1455
 
            gobject.IO_IN: u"IN",   # There is data to read.
 
1456
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1458
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1459
 
            gobject.IO_ERR: u"ERR", # Error condition.
 
1460
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1461
 
                                    # broken, usually for pipes and
 
1464
 
        conditions_string = ' | '.join(name
 
1466
 
                                       condition_names.iteritems()
 
1467
 
                                       if cond & condition)
 
1468
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1471
 
        # error or the other end of multiprocessing.Pipe has closed
 
1472
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
 
2507
        # error, or the other end of multiprocessing.Pipe has closed
 
 
2508
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2509
            # Wait for other process to exit
 
1475
2513
        # Read a request from the child
 
1476
2514
        request = parent_pipe.recv()
 
1477
 
        logger.debug(u"IPC request: %s", repr(request))
 
1478
2515
        command = request[0]
 
1480
2517
        if command == 'init':
 
1481
2518
            fpr = request[1]
 
1482
2519
            address = request[2]
 
1484
 
            for c in self.clients:
 
 
2521
            for c in self.clients.itervalues():
 
1485
2522
                if c.fingerprint == fpr:
 
1489
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1490
 
                               u"dress: %s", fpr, address)
 
 
2526
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2527
                            "dress: %s", fpr, address)
 
1491
2528
                if self.use_dbus:
 
1492
2529
                    # Emit D-Bus signal
 
1493
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
 
2530
                    mandos_dbus_service.ClientNotFound(fpr,
 
1494
2532
                parent_pipe.send(False)
 
1497
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
1498
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
1499
 
                                 functools.partial(self.handle_ipc,
 
1500
 
                                                   parent_pipe = parent_pipe,
 
1501
 
                                                   client_object = client))
 
 
2535
            gobject.io_add_watch(
 
 
2536
                parent_pipe.fileno(),
 
 
2537
                gobject.IO_IN | gobject.IO_HUP,
 
 
2538
                functools.partial(self.handle_ipc,
 
 
2539
                                  parent_pipe = parent_pipe,
 
 
2541
                                  client_object = client))
 
1502
2542
            parent_pipe.send(True)
 
1503
 
            # remove the old hook in favor of the new above hook on same fileno
 
 
2543
            # remove the old hook in favor of the new above hook on
 
1505
2546
        if command == 'funcall':
 
1506
2547
            funcname = request[1]
 
1507
2548
            args = request[2]
 
1508
2549
            kwargs = request[3]
 
1510
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
 
2551
            parent_pipe.send(('data', getattr(client_object,
 
1512
2555
        if command == 'getattr':
 
1513
2556
            attrname = request[1]
 
1514
 
            if callable(client_object.__getattribute__(attrname)):
 
1515
 
                parent_pipe.send(('function',))
 
 
2557
            if isinstance(client_object.__getattribute__(attrname),
 
 
2558
                          collections.Callable):
 
 
2559
                parent_pipe.send(('function', ))
 
1517
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
 
2562
                    'data', client_object.__getattribute__(attrname)))
 
1519
2564
        if command == 'setattr':
 
1520
2565
            attrname = request[1]
 
1521
2566
            value = request[2]
 
1522
2567
            setattr(client_object, attrname, value)
 
 
2572
def rfc3339_duration_to_delta(duration):
 
 
2573
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2575
    >>> rfc3339_duration_to_delta("P7D")
 
 
2576
    datetime.timedelta(7)
 
 
2577
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2578
    datetime.timedelta(0, 60)
 
 
2579
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2580
    datetime.timedelta(0, 3600)
 
 
2581
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2582
    datetime.timedelta(1)
 
 
2583
    >>> rfc3339_duration_to_delta("P1W")
 
 
2584
    datetime.timedelta(7)
 
 
2585
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2586
    datetime.timedelta(0, 330)
 
 
2587
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2588
    datetime.timedelta(1, 200)
 
 
2591
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2592
    # possible - there would have to be multiple places for the same
 
 
2593
    # values, like seconds.  The current code, while more esoteric, is
 
 
2594
    # cleaner without depending on a parsing library.  If Python had a
 
 
2595
    # built-in library for parsing we would use it, but we'd like to
 
 
2596
    # avoid excessive use of external libraries.
 
 
2598
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2599
    Token = collections.namedtuple("Token", (
 
 
2600
        "regexp",  # To match token; if "value" is not None, must have
 
 
2601
                   # a "group" containing digits
 
 
2602
        "value",   # datetime.timedelta or None
 
 
2603
        "followers"))           # Tokens valid after this token
 
 
2604
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2605
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2606
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2607
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2608
                         datetime.timedelta(seconds=1),
 
 
2609
                         frozenset((token_end, )))
 
 
2610
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2611
                         datetime.timedelta(minutes=1),
 
 
2612
                         frozenset((token_second, token_end)))
 
 
2613
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2614
                       datetime.timedelta(hours=1),
 
 
2615
                       frozenset((token_minute, token_end)))
 
 
2616
    token_time = Token(re.compile(r"T"),
 
 
2618
                       frozenset((token_hour, token_minute,
 
 
2620
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2621
                      datetime.timedelta(days=1),
 
 
2622
                      frozenset((token_time, token_end)))
 
 
2623
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2624
                        datetime.timedelta(weeks=4),
 
 
2625
                        frozenset((token_day, token_end)))
 
 
2626
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2627
                       datetime.timedelta(weeks=52),
 
 
2628
                       frozenset((token_month, token_end)))
 
 
2629
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2630
                       datetime.timedelta(weeks=1),
 
 
2631
                       frozenset((token_end, )))
 
 
2632
    token_duration = Token(re.compile(r"P"), None,
 
 
2633
                           frozenset((token_year, token_month,
 
 
2634
                                      token_day, token_time,
 
 
2636
    # Define starting values
 
 
2637
    value = datetime.timedelta() # Value so far
 
 
2639
    followers = frozenset((token_duration, )) # Following valid tokens
 
 
2640
    s = duration                # String left to parse
 
 
2641
    # Loop until end token is found
 
 
2642
    while found_token is not token_end:
 
 
2643
        # Search for any currently valid tokens
 
 
2644
        for token in followers:
 
 
2645
            match = token.regexp.match(s)
 
 
2646
            if match is not None:
 
 
2648
                if token.value is not None:
 
 
2649
                    # Value found, parse digits
 
 
2650
                    factor = int(match.group(1), 10)
 
 
2651
                    # Add to value so far
 
 
2652
                    value += factor * token.value
 
 
2653
                # Strip token from string
 
 
2654
                s = token.regexp.sub("", s, 1)
 
 
2657
                # Set valid next tokens
 
 
2658
                followers = found_token.followers
 
 
2661
            # No currently valid tokens were found
 
 
2662
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
1527
2668
def string_to_delta(interval):
 
1528
2669
    """Parse a string and return a datetime.timedelta
 
1530
 
    >>> string_to_delta(u'7d')
 
 
2671
    >>> string_to_delta('7d')
 
1531
2672
    datetime.timedelta(7)
 
1532
 
    >>> string_to_delta(u'60s')
 
 
2673
    >>> string_to_delta('60s')
 
1533
2674
    datetime.timedelta(0, 60)
 
1534
 
    >>> string_to_delta(u'60m')
 
 
2675
    >>> string_to_delta('60m')
 
1535
2676
    datetime.timedelta(0, 3600)
 
1536
 
    >>> string_to_delta(u'24h')
 
 
2677
    >>> string_to_delta('24h')
 
1537
2678
    datetime.timedelta(1)
 
1538
 
    >>> string_to_delta(u'1w')
 
 
2679
    >>> string_to_delta('1w')
 
1539
2680
    datetime.timedelta(7)
 
1540
 
    >>> string_to_delta(u'5m 30s')
 
 
2681
    >>> string_to_delta('5m 30s')
 
1541
2682
    datetime.timedelta(0, 330)
 
 
2686
        return rfc3339_duration_to_delta(interval)
 
1543
2690
    timevalue = datetime.timedelta(0)
 
1544
2691
    for s in interval.split():
 
1546
 
            suffix = unicode(s[-1])
 
1547
2694
            value = int(s[:-1])
 
1549
2696
                delta = datetime.timedelta(value)
 
1550
 
            elif suffix == u"s":
 
1551
2698
                delta = datetime.timedelta(0, value)
 
1552
 
            elif suffix == u"m":
 
1553
2700
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
1554
 
            elif suffix == u"h":
 
1555
2702
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
1556
 
            elif suffix == u"w":
 
1557
2704
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
1559
 
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1560
 
        except (ValueError, IndexError), e:
 
1561
 
            raise ValueError(e.message)
 
 
2706
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
 
2707
        except IndexError as e:
 
 
2708
            raise ValueError(*(e.args))
 
1562
2709
        timevalue += delta
 
1563
2710
    return timevalue
 
1566
 
def if_nametoindex(interface):
 
1567
 
    """Call the C function if_nametoindex(), or equivalent
 
1569
 
    Note: This function cannot accept a unicode string."""
 
1570
 
    global if_nametoindex
 
1572
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1573
 
                          (ctypes.util.find_library(u"c"))
 
1575
 
    except (OSError, AttributeError):
 
1576
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1577
 
        def if_nametoindex(interface):
 
1578
 
            "Get an interface index the hard way, i.e. using fcntl()"
 
1579
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1580
 
            with contextlib.closing(socket.socket()) as s:
 
1581
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1582
 
                                    struct.pack(str(u"16s16x"),
 
1584
 
            interface_index = struct.unpack(str(u"I"),
 
1586
 
            return interface_index
 
1587
 
    return if_nametoindex(interface)
 
1590
2713
def daemon(nochdir = False, noclose = False):
 
1591
2714
    """See daemon(3).  Standard BSD Unix function.
 
 
1617
2740
    ##################################################################
 
1618
2741
    # Parsing of options, both command line and config file
 
1620
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1621
 
    parser.add_option("-i", u"--interface", type=u"string",
 
1622
 
                      metavar="IF", help=u"Bind to interface IF")
 
1623
 
    parser.add_option("-a", u"--address", type=u"string",
 
1624
 
                      help=u"Address to listen for requests on")
 
1625
 
    parser.add_option("-p", u"--port", type=u"int",
 
1626
 
                      help=u"Port number to receive requests on")
 
1627
 
    parser.add_option("--check", action=u"store_true",
 
1628
 
                      help=u"Run self-test")
 
1629
 
    parser.add_option("--debug", action=u"store_true",
 
1630
 
                      help=u"Debug mode; run in foreground and log to"
 
1632
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1633
 
                      help=u"Debug level for stdout output")
 
1634
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1635
 
                      u" priority string (see GnuTLS documentation)")
 
1636
 
    parser.add_option("--servicename", type=u"string",
 
1637
 
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1638
 
    parser.add_option("--configdir", type=u"string",
 
1639
 
                      default=u"/etc/mandos", metavar=u"DIR",
 
1640
 
                      help=u"Directory to search for configuration"
 
1642
 
    parser.add_option("--no-dbus", action=u"store_false",
 
1643
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1644
 
                      u" system bus interface")
 
1645
 
    parser.add_option("--no-ipv6", action=u"store_false",
 
1646
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1647
 
    options = parser.parse_args()[0]
 
 
2743
    parser = argparse.ArgumentParser()
 
 
2744
    parser.add_argument("-v", "--version", action="version",
 
 
2745
                        version = "%(prog)s {}".format(version),
 
 
2746
                        help="show version number and exit")
 
 
2747
    parser.add_argument("-i", "--interface", metavar="IF",
 
 
2748
                        help="Bind to interface IF")
 
 
2749
    parser.add_argument("-a", "--address",
 
 
2750
                        help="Address to listen for requests on")
 
 
2751
    parser.add_argument("-p", "--port", type=int,
 
 
2752
                        help="Port number to receive requests on")
 
 
2753
    parser.add_argument("--check", action="store_true",
 
 
2754
                        help="Run self-test")
 
 
2755
    parser.add_argument("--debug", action="store_true",
 
 
2756
                        help="Debug mode; run in foreground and log"
 
 
2757
                        " to terminal", default=None)
 
 
2758
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
 
2759
                        help="Debug level for stdout output")
 
 
2760
    parser.add_argument("--priority", help="GnuTLS"
 
 
2761
                        " priority string (see GnuTLS documentation)")
 
 
2762
    parser.add_argument("--servicename",
 
 
2763
                        metavar="NAME", help="Zeroconf service name")
 
 
2764
    parser.add_argument("--configdir",
 
 
2765
                        default="/etc/mandos", metavar="DIR",
 
 
2766
                        help="Directory to search for configuration"
 
 
2768
    parser.add_argument("--no-dbus", action="store_false",
 
 
2769
                        dest="use_dbus", help="Do not provide D-Bus"
 
 
2770
                        " system bus interface", default=None)
 
 
2771
    parser.add_argument("--no-ipv6", action="store_false",
 
 
2772
                        dest="use_ipv6", help="Do not use IPv6",
 
 
2774
    parser.add_argument("--no-restore", action="store_false",
 
 
2775
                        dest="restore", help="Do not restore stored"
 
 
2776
                        " state", default=None)
 
 
2777
    parser.add_argument("--socket", type=int,
 
 
2778
                        help="Specify a file descriptor to a network"
 
 
2779
                        " socket to use instead of creating one")
 
 
2780
    parser.add_argument("--statedir", metavar="DIR",
 
 
2781
                        help="Directory to save/restore state in")
 
 
2782
    parser.add_argument("--foreground", action="store_true",
 
 
2783
                        help="Run in foreground", default=None)
 
 
2784
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2785
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
2788
    options = parser.parse_args()
 
1649
2790
    if options.check:
 
 
2792
        fail_count, test_count = doctest.testmod()
 
 
2793
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1654
2795
    # Default values for config file for server-global settings
 
1655
 
    server_defaults = { u"interface": u"",
 
1660
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1661
 
                        u"servicename": u"Mandos",
 
1662
 
                        u"use_dbus": u"True",
 
1663
 
                        u"use_ipv6": u"True",
 
 
2796
    server_defaults = { "interface": "",
 
 
2801
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2802
                        ":+SIGN-DSA-SHA256",
 
 
2803
                        "servicename": "Mandos",
 
 
2809
                        "statedir": "/var/lib/mandos",
 
 
2810
                        "foreground": "False",
 
1667
2814
    # Parse config file for server-global settings
 
1668
2815
    server_config = configparser.SafeConfigParser(server_defaults)
 
1669
2816
    del server_defaults
 
1670
 
    server_config.read(os.path.join(options.configdir,
 
 
2817
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1672
2818
    # Convert the SafeConfigParser object to a dict
 
1673
2819
    server_settings = server_config.defaults()
 
1674
2820
    # Use the appropriate methods on the non-string config options
 
1675
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1676
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
 
2821
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
2822
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1678
2824
    if server_settings["port"]:
 
1679
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
 
2825
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
2827
    if server_settings["socket"]:
 
 
2828
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
2830
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
2831
        # over with an opened os.devnull.  But we don't want this to
 
 
2832
        # happen with a supplied network socket.
 
 
2833
        if 0 <= server_settings["socket"] <= 2:
 
 
2834
            server_settings["socket"] = os.dup(server_settings
 
1681
2836
    del server_config
 
1683
2838
    # Override the settings from the config file with command line
 
1684
2839
    # options, if set.
 
1685
 
    for option in (u"interface", u"address", u"port", u"debug",
 
1686
 
                   u"priority", u"servicename", u"configdir",
 
1687
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
 
2840
    for option in ("interface", "address", "port", "debug",
 
 
2841
                   "priority", "servicename", "configdir", "use_dbus",
 
 
2842
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
2843
                   "socket", "foreground", "zeroconf"):
 
1688
2844
        value = getattr(options, option)
 
1689
2845
        if value is not None:
 
1690
2846
            server_settings[option] = value
 
1692
2848
    # Force all strings to be unicode
 
1693
2849
    for option in server_settings.keys():
 
1694
 
        if type(server_settings[option]) is str:
 
1695
 
            server_settings[option] = unicode(server_settings[option])
 
 
2850
        if isinstance(server_settings[option], bytes):
 
 
2851
            server_settings[option] = (server_settings[option]
 
 
2853
    # Force all boolean options to be boolean
 
 
2854
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
2855
                   "foreground", "zeroconf"):
 
 
2856
        server_settings[option] = bool(server_settings[option])
 
 
2857
    # Debug implies foreground
 
 
2858
    if server_settings["debug"]:
 
 
2859
        server_settings["foreground"] = True
 
1696
2860
    # Now we have our good server settings in "server_settings"
 
1698
2862
    ##################################################################
 
 
2864
    if (not server_settings["zeroconf"]
 
 
2865
        and not (server_settings["port"]
 
 
2866
                 or server_settings["socket"] != "")):
 
 
2867
        parser.error("Needs port or socket to work without Zeroconf")
 
1700
2869
    # For convenience
 
1701
 
    debug = server_settings[u"debug"]
 
1702
 
    debuglevel = server_settings[u"debuglevel"]
 
1703
 
    use_dbus = server_settings[u"use_dbus"]
 
1704
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1706
 
    if server_settings[u"servicename"] != u"Mandos":
 
1707
 
        syslogger.setFormatter(logging.Formatter
 
1708
 
                               (u'Mandos (%s) [%%(process)d]:'
 
1709
 
                                u' %%(levelname)s: %%(message)s'
 
1710
 
                                % server_settings[u"servicename"]))
 
 
2870
    debug = server_settings["debug"]
 
 
2871
    debuglevel = server_settings["debuglevel"]
 
 
2872
    use_dbus = server_settings["use_dbus"]
 
 
2873
    use_ipv6 = server_settings["use_ipv6"]
 
 
2874
    stored_state_path = os.path.join(server_settings["statedir"],
 
 
2876
    foreground = server_settings["foreground"]
 
 
2877
    zeroconf = server_settings["zeroconf"]
 
 
2880
        initlogger(debug, logging.DEBUG)
 
 
2885
            level = getattr(logging, debuglevel.upper())
 
 
2886
            initlogger(debug, level)
 
 
2888
    if server_settings["servicename"] != "Mandos":
 
 
2889
        syslogger.setFormatter(
 
 
2890
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
2891
                              ' %(levelname)s: %(message)s'.format(
 
 
2892
                                  server_settings["servicename"])))
 
1712
2894
    # Parse config file with clients
 
1713
 
    client_defaults = { u"timeout": u"1h",
 
1715
 
                        u"checker": u"fping -q -- %%(host)s",
 
1717
 
                        u"approved_delay": u"0s",
 
1718
 
                        u"approved_duration": u"1s",
 
1720
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1721
 
    client_config.read(os.path.join(server_settings[u"configdir"],
 
 
2895
    client_config = configparser.SafeConfigParser(Client
 
 
2897
    client_config.read(os.path.join(server_settings["configdir"],
 
1724
2900
    global mandos_dbus_service
 
1725
2901
    mandos_dbus_service = None
 
1727
 
    tcp_server = MandosServer((server_settings[u"address"],
 
1728
 
                               server_settings[u"port"]),
 
1730
 
                              interface=server_settings[u"interface"],
 
1733
 
                              server_settings[u"priority"],
 
1735
 
    pidfilename = u"/var/run/mandos.pid"
 
1737
 
        pidfile = open(pidfilename, u"w")
 
1739
 
        logger.error(u"Could not open file %r", pidfilename)
 
 
2904
    if server_settings["socket"] != "":
 
 
2905
        socketfd = server_settings["socket"]
 
 
2906
    tcp_server = MandosServer(
 
 
2907
        (server_settings["address"], server_settings["port"]),
 
 
2909
        interface=(server_settings["interface"] or None),
 
 
2911
        gnutls_priority=server_settings["priority"],
 
 
2915
        pidfilename = "/run/mandos.pid"
 
 
2916
        if not os.path.isdir("/run/."):
 
 
2917
            pidfilename = "/var/run/mandos.pid"
 
 
2920
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
2921
        except IOError as e:
 
 
2922
            logger.error("Could not open file %r", pidfilename,
 
1742
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1743
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
 
2925
    for name, group in (("_mandos", "_mandos"),
 
 
2926
                        ("mandos", "mandos"),
 
 
2927
                        ("nobody", "nogroup")):
 
1746
 
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1747
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
 
2929
            uid = pwd.getpwnam(name).pw_uid
 
 
2930
            gid = pwd.getpwnam(group).pw_gid
 
1748
2932
        except KeyError:
 
1750
 
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1751
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1758
 
    except OSError, error:
 
1759
 
        if error[0] != errno.EPERM:
 
 
2940
    except OSError as error:
 
 
2941
        if error.errno != errno.EPERM:
 
1762
 
    # Enable all possible GnuTLS debugging
 
1765
 
    if not debug and not debuglevel:
 
1766
 
        syslogger.setLevel(logging.WARNING)
 
1767
 
        console.setLevel(logging.WARNING)
 
1769
 
        level = getattr(logging, debuglevel.upper())
 
1770
 
        syslogger.setLevel(level)
 
1771
 
        console.setLevel(level)
 
 
2945
        # Enable all possible GnuTLS debugging
 
1774
2947
        # "Use a log level over 10 to enable all debugging options."
 
1775
2948
        # - GnuTLS manual
 
1776
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2949
        gnutls.global_set_log_level(11)
 
1778
 
        @gnutls.library.types.gnutls_log_func
 
1779
2952
        def debug_gnutls(level, string):
 
1780
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1782
 
        (gnutls.library.functions
 
1783
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
2953
            logger.debug("GnuTLS: %s", string[:-1])
 
 
2955
        gnutls.global_set_log_function(debug_gnutls)
 
1785
2957
        # Redirect stdin so all checkers get /dev/null
 
1786
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
2958
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1787
2959
        os.dup2(null, sys.stdin.fileno())
 
1791
 
        # No console logging
 
1792
 
        logger.removeHandler(console)
 
 
2963
    # Need to fork before connecting to D-Bus
 
 
2965
        # Close all input and output, do double fork, etc.
 
 
2968
    # multiprocessing will use threads, so before we use gobject we
 
 
2969
    # need to inform gobject that threads will be used.
 
 
2970
    gobject.threads_init()
 
1795
2972
    global main_loop
 
1796
2973
    # From the Avahi example code
 
1797
 
    DBusGMainLoop(set_as_default=True )
 
 
2974
    DBusGMainLoop(set_as_default=True)
 
1798
2975
    main_loop = gobject.MainLoop()
 
1799
2976
    bus = dbus.SystemBus()
 
1800
2977
    # End of Avahi example code
 
1803
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1804
 
                                            bus, do_not_queue=True)
 
1805
 
        except dbus.exceptions.NameExistsException, e:
 
1806
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
 
2980
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
 
2983
            old_bus_name = dbus.service.BusName(
 
 
2984
                "se.bsnet.fukt.Mandos", bus,
 
 
2986
        except dbus.exceptions.DBusException as e:
 
 
2987
            logger.error("Disabling D-Bus:", exc_info=e)
 
1807
2988
            use_dbus = False
 
1808
 
            server_settings[u"use_dbus"] = False
 
 
2989
            server_settings["use_dbus"] = False
 
1809
2990
            tcp_server.use_dbus = False
 
1810
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1811
 
    service = AvahiService(name = server_settings[u"servicename"],
 
1812
 
                           servicetype = u"_mandos._tcp",
 
1813
 
                           protocol = protocol, bus = bus)
 
1814
 
    if server_settings["interface"]:
 
1815
 
        service.interface = (if_nametoindex
 
1816
 
                             (str(server_settings[u"interface"])))
 
1819
 
        # Close all input and output, do double fork, etc.
 
 
2992
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2993
        service = AvahiServiceToSyslog(
 
 
2994
            name = server_settings["servicename"],
 
 
2995
            servicetype = "_mandos._tcp",
 
 
2996
            protocol = protocol,
 
 
2998
        if server_settings["interface"]:
 
 
2999
            service.interface = if_nametoindex(
 
 
3000
                server_settings["interface"].encode("utf-8"))
 
1822
3002
    global multiprocessing_manager
 
1823
3003
    multiprocessing_manager = multiprocessing.Manager()
 
1825
3005
    client_class = Client
 
1827
3007
        client_class = functools.partial(ClientDBus, bus = bus)
 
1828
 
    def client_config_items(config, section):
 
1829
 
        special_settings = {
 
1830
 
            "approved_by_default":
 
1831
 
                lambda: config.getboolean(section,
 
1832
 
                                          "approved_by_default"),
 
1834
 
        for name, value in config.items(section):
 
 
3009
    client_settings = Client.config_parser(client_config)
 
 
3010
    old_client_settings = {}
 
 
3013
    # This is used to redirect stdout and stderr for checker processes
 
 
3015
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3016
    # Only used if server is running in foreground but not in debug
 
 
3018
    if debug or not foreground:
 
 
3021
    # Get client data and settings from last running state.
 
 
3022
    if server_settings["restore"]:
 
 
3024
            with open(stored_state_path, "rb") as stored_state:
 
 
3025
                clients_data, old_client_settings = pickle.load(
 
 
3027
            os.remove(stored_state_path)
 
 
3028
        except IOError as e:
 
 
3029
            if e.errno == errno.ENOENT:
 
 
3030
                logger.warning("Could not load persistent state:"
 
 
3031
                               " {}".format(os.strerror(e.errno)))
 
 
3033
                logger.critical("Could not load persistent state:",
 
 
3036
        except EOFError as e:
 
 
3037
            logger.warning("Could not load persistent state: "
 
 
3041
    with PGPEngine() as pgp:
 
 
3042
        for client_name, client in clients_data.items():
 
 
3043
            # Skip removed clients
 
 
3044
            if client_name not in client_settings:
 
 
3047
            # Decide which value to use after restoring saved state.
 
 
3048
            # We have three different values: Old config file,
 
 
3049
            # new config file, and saved state.
 
 
3050
            # New config value takes precedence if it differs from old
 
 
3051
            # config value, otherwise use saved state.
 
 
3052
            for name, value in client_settings[client_name].items():
 
 
3054
                    # For each value in new config, check if it
 
 
3055
                    # differs from the old config value (Except for
 
 
3056
                    # the "secret" attribute)
 
 
3057
                    if (name != "secret"
 
 
3059
                             old_client_settings[client_name][name])):
 
 
3060
                        client[name] = value
 
 
3064
            # Clients who has passed its expire date can still be
 
 
3065
            # enabled if its last checker was successful.  A Client
 
 
3066
            # whose checker succeeded before we stored its state is
 
 
3067
            # assumed to have successfully run all checkers during
 
 
3069
            if client["enabled"]:
 
 
3070
                if datetime.datetime.utcnow() >= client["expires"]:
 
 
3071
                    if not client["last_checked_ok"]:
 
 
3073
                            "disabling client {} - Client never "
 
 
3074
                            "performed a successful checker".format(
 
 
3076
                        client["enabled"] = False
 
 
3077
                    elif client["last_checker_status"] != 0:
 
 
3079
                            "disabling client {} - Client last"
 
 
3080
                            " checker failed with error code"
 
 
3083
                                client["last_checker_status"]))
 
 
3084
                        client["enabled"] = False
 
 
3086
                        client["expires"] = (
 
 
3087
                            datetime.datetime.utcnow()
 
 
3088
                            + client["timeout"])
 
 
3089
                        logger.debug("Last checker succeeded,"
 
 
3090
                                     " keeping {} enabled".format(
 
1836
 
                yield (name, special_settings[name]())
 
1840
 
    tcp_server.clients.update(set(
 
1841
 
            client_class(name = section,
 
1842
 
                         config= dict(client_config_items(
 
1843
 
                        client_config, section)))
 
1844
 
            for section in client_config.sections()))
 
 
3093
                client["secret"] = pgp.decrypt(
 
 
3094
                    client["encrypted_secret"],
 
 
3095
                    client_settings[client_name]["secret"])
 
 
3097
                # If decryption fails, we use secret from new settings
 
 
3098
                logger.debug("Failed to decrypt {} old secret".format(
 
 
3100
                client["secret"] = (client_settings[client_name]
 
 
3103
    # Add/remove clients based on new changes made to config
 
 
3104
    for client_name in (set(old_client_settings)
 
 
3105
                        - set(client_settings)):
 
 
3106
        del clients_data[client_name]
 
 
3107
    for client_name in (set(client_settings)
 
 
3108
                        - set(old_client_settings)):
 
 
3109
        clients_data[client_name] = client_settings[client_name]
 
 
3111
    # Create all client objects
 
 
3112
    for client_name, client in clients_data.items():
 
 
3113
        tcp_server.clients[client_name] = client_class(
 
 
3116
            server_settings = server_settings)
 
1845
3118
    if not tcp_server.clients:
 
1846
 
        logger.warning(u"No clients defined")
 
 
3119
        logger.warning("No clients defined")
 
 
3122
        if pidfile is not None:
 
1850
3123
            pid = os.getpid()
 
1851
 
            pidfile.write(str(pid) + "\n")
 
 
3126
                    print(pid, file=pidfile)
 
 
3128
                logger.error("Could not write to file %r with PID %d",
 
1854
 
        logger.error(u"Could not write to file %r with PID %d",
 
1857
 
        # "pidfile" was never created
 
1862
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1863
3133
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
1864
3134
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
1867
 
        class MandosDBusService(dbus.service.Object):
 
 
3138
        @alternate_dbus_interfaces(
 
 
3139
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
 
3140
        class MandosDBusService(DBusObjectWithObjectManager):
 
1868
3141
            """A D-Bus proxy object"""
 
1869
3143
            def __init__(self):
 
1870
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1871
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1873
 
            @dbus.service.signal(_interface, signature=u"o")
 
 
3144
                dbus.service.Object.__init__(self, bus, "/")
 
 
3146
            _interface = "se.recompile.Mandos"
 
 
3148
            @dbus.service.signal(_interface, signature="o")
 
1874
3149
            def ClientAdded(self, objpath):
 
1878
 
            @dbus.service.signal(_interface, signature=u"ss")
 
 
3153
            @dbus.service.signal(_interface, signature="ss")
 
1879
3154
            def ClientNotFound(self, fingerprint, address):
 
1883
 
            @dbus.service.signal(_interface, signature=u"os")
 
 
3158
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3160
            @dbus.service.signal(_interface, signature="os")
 
1884
3161
            def ClientRemoved(self, objpath, name):
 
1888
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
 
3165
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3167
            @dbus.service.method(_interface, out_signature="ao")
 
1889
3168
            def GetAllClients(self):
 
1891
 
                return dbus.Array(c.dbus_object_path
 
1892
 
                                  for c in tcp_server.clients)
 
 
3170
                return dbus.Array(c.dbus_object_path for c in
 
 
3171
                                  tcp_server.clients.itervalues())
 
 
3173
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
1894
3175
            @dbus.service.method(_interface,
 
1895
 
                                 out_signature=u"a{oa{sv}}")
 
 
3176
                                 out_signature="a{oa{sv}}")
 
1896
3177
            def GetAllClientsWithProperties(self):
 
1898
3179
                return dbus.Dictionary(
 
1899
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1900
 
                     for c in tcp_server.clients),
 
1901
 
                    signature=u"oa{sv}")
 
 
3180
                    { c.dbus_object_path: c.GetAll(
 
 
3181
                        "se.recompile.Mandos.Client")
 
 
3182
                      for c in tcp_server.clients.itervalues() },
 
1903
 
            @dbus.service.method(_interface, in_signature=u"o")
 
 
3185
            @dbus.service.method(_interface, in_signature="o")
 
1904
3186
            def RemoveClient(self, object_path):
 
1906
 
                for c in tcp_server.clients:
 
 
3188
                for c in tcp_server.clients.itervalues():
 
1907
3189
                    if c.dbus_object_path == object_path:
 
1908
 
                        tcp_server.clients.remove(c)
 
 
3190
                        del tcp_server.clients[c.name]
 
1909
3191
                        c.remove_from_connection()
 
1910
 
                        # Don't signal anything except ClientRemoved
 
 
3192
                        # Don't signal the disabling
 
1911
3193
                        c.disable(quiet=True)
 
1913
 
                        self.ClientRemoved(object_path, c.name)
 
 
3194
                        # Emit D-Bus signal for removal
 
 
3195
                        self.client_removed_signal(c)
 
1915
3197
                raise KeyError(object_path)
 
 
3201
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3202
                                 out_signature = "a{oa{sa{sv}}}")
 
 
3203
            def GetManagedObjects(self):
 
 
3205
                return dbus.Dictionary(
 
 
3206
                    { client.dbus_object_path:
 
 
3208
                          { interface: client.GetAll(interface)
 
 
3210
                                 client._get_all_interface_names()})
 
 
3211
                      for client in tcp_server.clients.values()})
 
 
3213
            def client_added_signal(self, client):
 
 
3214
                """Send the new standard signal and the old signal"""
 
 
3216
                    # New standard signal
 
 
3217
                    self.InterfacesAdded(
 
 
3218
                        client.dbus_object_path,
 
 
3220
                            { interface: client.GetAll(interface)
 
 
3222
                              client._get_all_interface_names()}))
 
 
3224
                    self.ClientAdded(client.dbus_object_path)
 
 
3226
            def client_removed_signal(self, client):
 
 
3227
                """Send the new standard signal and the old signal"""
 
 
3229
                    # New standard signal
 
 
3230
                    self.InterfacesRemoved(
 
 
3231
                        client.dbus_object_path,
 
 
3232
                        client._get_all_interface_names())
 
 
3234
                    self.ClientRemoved(client.dbus_object_path,
 
1919
3237
        mandos_dbus_service = MandosDBusService()
 
1922
3240
        "Cleanup function; run on exit"
 
 
3244
        multiprocessing.active_children()
 
 
3246
        if not (tcp_server.clients or client_settings):
 
 
3249
        # Store client before exiting. Secrets are encrypted with key
 
 
3250
        # based on what config file has. If config file is
 
 
3251
        # removed/edited, old secret will thus be unrecovable.
 
 
3253
        with PGPEngine() as pgp:
 
 
3254
            for client in tcp_server.clients.itervalues():
 
 
3255
                key = client_settings[client.name]["secret"]
 
 
3256
                client.encrypted_secret = pgp.encrypt(client.secret,
 
 
3260
                # A list of attributes that can not be pickled
 
 
3262
                exclude = { "bus", "changedstate", "secret",
 
 
3263
                            "checker", "server_settings" }
 
 
3264
                for name, typ in inspect.getmembers(dbus.service
 
 
3268
                client_dict["encrypted_secret"] = (client
 
 
3270
                for attr in client.client_structure:
 
 
3271
                    if attr not in exclude:
 
 
3272
                        client_dict[attr] = getattr(client, attr)
 
 
3274
                clients[client.name] = client_dict
 
 
3275
                del client_settings[client.name]["secret"]
 
 
3278
            with tempfile.NamedTemporaryFile(
 
 
3282
                    dir=os.path.dirname(stored_state_path),
 
 
3283
                    delete=False) as stored_state:
 
 
3284
                pickle.dump((clients, client_settings), stored_state)
 
 
3285
                tempname = stored_state.name
 
 
3286
            os.rename(tempname, stored_state_path)
 
 
3287
        except (IOError, OSError) as e:
 
 
3293
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3294
                logger.warning("Could not save persistent state: {}"
 
 
3295
                               .format(os.strerror(e.errno)))
 
 
3297
                logger.warning("Could not save persistent state:",
 
 
3301
        # Delete all clients, and settings from config
 
1925
3302
        while tcp_server.clients:
 
1926
 
            client = tcp_server.clients.pop()
 
 
3303
            name, client = tcp_server.clients.popitem()
 
1928
3305
                client.remove_from_connection()
 
1929
 
            client.disable_hook = None
 
1930
 
            # Don't signal anything except ClientRemoved
 
 
3306
            # Don't signal the disabling
 
1931
3307
            client.disable(quiet=True)
 
 
3308
            # Emit D-Bus signal for removal
 
1934
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
 
3310
                mandos_dbus_service.client_removed_signal(client)
 
 
3311
        client_settings.clear()
 
1937
3313
    atexit.register(cleanup)
 
1939
 
    for client in tcp_server.clients:
 
 
3315
    for client in tcp_server.clients.itervalues():
 
1942
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3317
            # Emit D-Bus signal for adding
 
 
3318
            mandos_dbus_service.client_added_signal(client)
 
 
3319
        # Need to initiate checking of clients
 
 
3321
            client.init_checker()
 
1945
3323
    tcp_server.enable()
 
1946
3324
    tcp_server.server_activate()
 
1948
3326
    # Find out what port we got
 
1949
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3328
        service.port = tcp_server.socket.getsockname()[1]
 
1951
 
        logger.info(u"Now listening on address %r, port %d,"
 
1952
 
                    " flowinfo %d, scope_id %d"
 
1953
 
                    % tcp_server.socket.getsockname())
 
 
3330
        logger.info("Now listening on address %r, port %d,"
 
 
3331
                    " flowinfo %d, scope_id %d",
 
 
3332
                    *tcp_server.socket.getsockname())
 
1955
 
        logger.info(u"Now listening on address %r, port %d"
 
1956
 
                    % tcp_server.socket.getsockname())
 
 
3334
        logger.info("Now listening on address %r, port %d",
 
 
3335
                    *tcp_server.socket.getsockname())
 
1958
3337
    #service.interface = tcp_server.socket.getsockname()[3]
 
1961
 
        # From the Avahi example code
 
1964
 
        except dbus.exceptions.DBusException, error:
 
1965
 
            logger.critical(u"DBusException: %s", error)
 
1968
 
        # End of Avahi example code
 
 
3341
            # From the Avahi example code
 
 
3344
            except dbus.exceptions.DBusException as error:
 
 
3345
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3348
            # End of Avahi example code
 
1970
3350
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
1971
3351
                             lambda *args, **kwargs:
 
1972
3352
                             (tcp_server.handle_request
 
1973
3353
                              (*args[2:], **kwargs) or True))
 
1975
 
        logger.debug(u"Starting main loop")
 
 
3355
        logger.debug("Starting main loop")
 
1976
3356
        main_loop.run()
 
1977
 
    except AvahiError, error:
 
1978
 
        logger.critical(u"AvahiError: %s", error)
 
 
3357
    except AvahiError as error:
 
 
3358
        logger.critical("Avahi Error", exc_info=error)
 
1981
3361
    except KeyboardInterrupt:
 
1984
 
        logger.debug(u"Server received KeyboardInterrupt")
 
1985
 
    logger.debug(u"Server exiting")
 
 
3363
            print("", file=sys.stderr)
 
 
3364
        logger.debug("Server received KeyboardInterrupt")
 
 
3365
    logger.debug("Server exiting")
 
1986
3366
    # Must run before the D-Bus bus name gets deregistered
 
1989
3370
if __name__ == '__main__':