80
94
    except ImportError:
 
81
95
        SO_BINDTODEVICE = None
 
86
 
#logger = logging.getLogger(u'mandos')
 
87
 
logger = logging.Logger(u'mandos')
 
88
 
syslogger = (logging.handlers.SysLogHandler
 
89
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
90
 
              address = "/dev/log"))
 
91
 
syslogger.setFormatter(logging.Formatter
 
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
94
 
logger.addHandler(syslogger)
 
96
 
console = logging.StreamHandler()
 
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
100
 
logger.addHandler(console)
 
 
97
if sys.version_info.major == 2:
 
 
101
stored_state_file = "clients.pickle"
 
 
103
logger = logging.getLogger()
 
 
107
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
108
        ctypes.util.find_library("c")).if_nametoindex
 
 
109
except (OSError, AttributeError):
 
 
111
    def if_nametoindex(interface):
 
 
112
        "Get an interface index the hard way, i.e. using fcntl()"
 
 
113
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
 
114
        with contextlib.closing(socket.socket()) as s:
 
 
115
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
 
116
                                struct.pack(b"16s16x", interface))
 
 
117
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
 
118
        return interface_index
 
 
121
def copy_function(func):
 
 
122
    """Make a copy of a function"""
 
 
123
    if sys.version_info.major == 2:
 
 
124
        return types.FunctionType(func.func_code,
 
 
130
        return types.FunctionType(func.__code__,
 
 
137
def initlogger(debug, level=logging.WARNING):
 
 
138
    """init logger and add loglevel"""
 
 
141
    syslogger = (logging.handlers.SysLogHandler(
 
 
142
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
143
        address = "/dev/log"))
 
 
144
    syslogger.setFormatter(logging.Formatter
 
 
145
                           ('Mandos [%(process)d]: %(levelname)s:'
 
 
147
    logger.addHandler(syslogger)
 
 
150
        console = logging.StreamHandler()
 
 
151
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
155
        logger.addHandler(console)
 
 
156
    logger.setLevel(level)
 
 
159
class PGPError(Exception):
 
 
160
    """Exception if encryption/decryption fails"""
 
 
164
class PGPEngine(object):
 
 
165
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
 
168
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
 
171
            output = subprocess.check_output(["gpgconf"])
 
 
172
            for line in output.splitlines():
 
 
173
                name, text, path = line.split(b":")
 
 
178
            if e.errno != errno.ENOENT:
 
 
180
        self.gnupgargs = ['--batch',
 
 
181
                          '--homedir', self.tempdir,
 
 
189
    def __exit__(self, exc_type, exc_value, traceback):
 
 
197
        if self.tempdir is not None:
 
 
198
            # Delete contents of tempdir
 
 
199
            for root, dirs, files in os.walk(self.tempdir,
 
 
201
                for filename in files:
 
 
202
                    os.remove(os.path.join(root, filename))
 
 
204
                    os.rmdir(os.path.join(root, dirname))
 
 
206
            os.rmdir(self.tempdir)
 
 
209
    def password_encode(self, password):
 
 
210
        # Passphrase can not be empty and can not contain newlines or
 
 
211
        # NUL bytes.  So we prefix it and hex encode it.
 
 
212
        encoded = b"mandos" + binascii.hexlify(password)
 
 
213
        if len(encoded) > 2048:
 
 
214
            # GnuPG can't handle long passwords, so encode differently
 
 
215
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
216
                       .replace(b"\n", b"\\n")
 
 
217
                       .replace(b"\0", b"\\x00"))
 
 
220
    def encrypt(self, data, password):
 
 
221
        passphrase = self.password_encode(password)
 
 
222
        with tempfile.NamedTemporaryFile(
 
 
223
                dir=self.tempdir) as passfile:
 
 
224
            passfile.write(passphrase)
 
 
226
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
230
                                    stdin = subprocess.PIPE,
 
 
231
                                    stdout = subprocess.PIPE,
 
 
232
                                    stderr = subprocess.PIPE)
 
 
233
            ciphertext, err = proc.communicate(input = data)
 
 
234
        if proc.returncode != 0:
 
 
238
    def decrypt(self, data, password):
 
 
239
        passphrase = self.password_encode(password)
 
 
240
        with tempfile.NamedTemporaryFile(
 
 
241
                dir = self.tempdir) as passfile:
 
 
242
            passfile.write(passphrase)
 
 
244
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
248
                                    stdin = subprocess.PIPE,
 
 
249
                                    stdout = subprocess.PIPE,
 
 
250
                                    stderr = subprocess.PIPE)
 
 
251
            decrypted_plaintext, err = proc.communicate(input = data)
 
 
252
        if proc.returncode != 0:
 
 
254
        return decrypted_plaintext
 
 
256
# Pretend that we have an Avahi module
 
 
258
    """This isn't so much a class as it is a module-like namespace.
 
 
259
    It is instantiated once, and simulates having an Avahi module."""
 
 
260
    IF_UNSPEC = -1              # avahi-common/address.h
 
 
261
    PROTO_UNSPEC = -1           # avahi-common/address.h
 
 
262
    PROTO_INET = 0              # avahi-common/address.h
 
 
263
    PROTO_INET6 = 1             # avahi-common/address.h
 
 
264
    DBUS_NAME = "org.freedesktop.Avahi"
 
 
265
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
 
266
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
 
267
    DBUS_PATH_SERVER = "/"
 
 
268
    def string_array_to_txt_array(self, t):
 
 
269
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
 
270
                           for s in t), signature="ay")
 
 
271
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
 
 
272
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
 
 
273
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
 
 
274
    SERVER_INVALID = 0          # avahi-common/defs.h
 
 
275
    SERVER_REGISTERING = 1      # avahi-common/defs.h
 
 
276
    SERVER_RUNNING = 2          # avahi-common/defs.h
 
 
277
    SERVER_COLLISION = 3        # avahi-common/defs.h
 
 
278
    SERVER_FAILURE = 4          # avahi-common/defs.h
 
102
281
class AvahiError(Exception):
 
103
282
    def __init__(self, value, *args, **kwargs):
 
104
283
        self.value = value
 
105
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
106
 
    def __unicode__(self):
 
107
 
        return unicode(repr(self.value))
 
 
284
        return super(AvahiError, self).__init__(value, *args,
 
109
288
class AvahiServiceError(AvahiError):
 
112
292
class AvahiGroupError(AvahiError):
 
 
192
396
            dbus.UInt16(self.port),
 
193
397
            avahi.string_array_to_txt_array(self.TXT))
 
194
398
        self.group.Commit()
 
195
400
    def entry_group_state_changed(self, state, error):
 
196
401
        """Derived from the Avahi example code"""
 
197
 
        logger.debug(u"Avahi state change: %i", state)
 
 
402
        logger.debug("Avahi entry group state change: %i", state)
 
199
404
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
200
 
            logger.debug(u"Zeroconf service established.")
 
 
405
            logger.debug("Zeroconf service established.")
 
201
406
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
202
 
            logger.warning(u"Zeroconf service name collision.")
 
 
407
            logger.info("Zeroconf service name collision.")
 
204
409
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
205
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
207
 
            raise AvahiGroupError(u"State changed: %s"
 
 
410
            logger.critical("Avahi: Error in group state changed %s",
 
 
412
            raise AvahiGroupError("State changed: {!s}".format(error))
 
209
414
    def cleanup(self):
 
210
415
        """Derived from the Avahi example code"""
 
211
416
        if self.group is not None:
 
 
419
            except (dbus.exceptions.UnknownMethodException,
 
 
420
                    dbus.exceptions.DBusException):
 
213
422
            self.group = None
 
214
 
    def server_state_changed(self, state):
 
 
425
    def server_state_changed(self, state, error=None):
 
215
426
        """Derived from the Avahi example code"""
 
216
 
        if state == avahi.SERVER_COLLISION:
 
217
 
            logger.error(u"Zeroconf server name collision")
 
 
427
        logger.debug("Avahi server state change: %i", state)
 
 
429
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
 
430
            avahi.SERVER_REGISTERING: None,
 
 
431
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
 
432
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
 
434
        if state in bad_states:
 
 
435
            if bad_states[state] is not None:
 
 
437
                    logger.error(bad_states[state])
 
 
439
                    logger.error(bad_states[state] + ": %r", error)
 
219
441
        elif state == avahi.SERVER_RUNNING:
 
 
444
            except dbus.exceptions.DBusException as error:
 
 
445
                if (error.get_dbus_name()
 
 
446
                    == "org.freedesktop.Avahi.CollisionError"):
 
 
447
                    logger.info("Local Zeroconf service name"
 
 
449
                    return self.rename(remove=False)
 
 
451
                    logger.critical("D-Bus Exception", exc_info=error)
 
 
456
                logger.debug("Unknown state: %r", state)
 
 
458
                logger.debug("Unknown state: %r: %r", state, error)
 
221
460
    def activate(self):
 
222
461
        """Derived from the Avahi example code"""
 
223
462
        if self.server is None:
 
224
463
            self.server = dbus.Interface(
 
225
464
                self.bus.get_object(avahi.DBUS_NAME,
 
226
 
                                    avahi.DBUS_PATH_SERVER),
 
 
465
                                    avahi.DBUS_PATH_SERVER,
 
 
466
                                    follow_name_owner_changes=True),
 
227
467
                avahi.DBUS_INTERFACE_SERVER)
 
228
 
        self.server.connect_to_signal(u"StateChanged",
 
229
 
                                 self.server_state_changed)
 
 
468
        self.server.connect_to_signal("StateChanged",
 
 
469
                                      self.server_state_changed)
 
230
470
        self.server_state_changed(self.server.GetState())
 
 
473
class AvahiServiceToSyslog(AvahiService):
 
 
474
    def rename(self, *args, **kwargs):
 
 
475
        """Add the new name to the syslog messages"""
 
 
476
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
477
        syslogger.setFormatter(logging.Formatter(
 
 
478
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
482
# Pretend that we have a GnuTLS module
 
 
483
class GnuTLS(object):
 
 
484
    """This isn't so much a class as it is a module-like namespace.
 
 
485
    It is instantiated once, and simulates having a GnuTLS module."""
 
 
487
    _library = ctypes.cdll.LoadLibrary(
 
 
488
        ctypes.util.find_library("gnutls"))
 
 
489
    _need_version = b"3.3.0"
 
 
491
        # Need to use class name "GnuTLS" here, since this method is
 
 
492
        # called before the assignment to the "gnutls" global variable
 
 
494
        if GnuTLS.check_version(self._need_version) is None:
 
 
495
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
 
496
                               .format(self._need_version))
 
 
498
    # Unless otherwise indicated, the constants and types below are
 
 
499
    # all from the gnutls/gnutls.h C header file.
 
 
509
    E_NO_CERTIFICATE_FOUND = -49
 
 
510
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
513
    class session_int(ctypes.Structure):
 
 
515
    session_t = ctypes.POINTER(session_int)
 
 
516
    class certificate_credentials_st(ctypes.Structure):
 
 
518
    certificate_credentials_t = ctypes.POINTER(
 
 
519
        certificate_credentials_st)
 
 
520
    certificate_type_t = ctypes.c_int
 
 
521
    class datum_t(ctypes.Structure):
 
 
522
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
523
                    ('size', ctypes.c_uint)]
 
 
524
    class openpgp_crt_int(ctypes.Structure):
 
 
526
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
527
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
 
528
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
529
    credentials_type_t = ctypes.c_int
 
 
530
    transport_ptr_t = ctypes.c_void_p
 
 
531
    close_request_t = ctypes.c_int
 
 
534
    class Error(Exception):
 
 
535
        # We need to use the class name "GnuTLS" here, since this
 
 
536
        # exception might be raised from within GnuTLS.__init__,
 
 
537
        # which is called before the assignment to the "gnutls"
 
 
538
        # global variable has happened.
 
 
539
        def __init__(self, message = None, code = None, args=()):
 
 
540
            # Default usage is by a message string, but if a return
 
 
541
            # code is passed, convert it to a string with
 
 
544
            if message is None and code is not None:
 
 
545
                message = GnuTLS.strerror(code)
 
 
546
            return super(GnuTLS.Error, self).__init__(
 
 
549
    class CertificateSecurityError(Error):
 
 
553
    class Credentials(object):
 
 
555
            self._c_object = gnutls.certificate_credentials_t()
 
 
556
            gnutls.certificate_allocate_credentials(
 
 
557
                ctypes.byref(self._c_object))
 
 
558
            self.type = gnutls.CRD_CERTIFICATE
 
 
561
            gnutls.certificate_free_credentials(self._c_object)
 
 
563
    class ClientSession(object):
 
 
564
        def __init__(self, socket, credentials = None):
 
 
565
            self._c_object = gnutls.session_t()
 
 
566
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
 
567
            gnutls.set_default_priority(self._c_object)
 
 
568
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
569
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
572
            if credentials is None:
 
 
573
                credentials = gnutls.Credentials()
 
 
574
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
575
                                   ctypes.cast(credentials._c_object,
 
 
577
            self.credentials = credentials
 
 
580
            gnutls.deinit(self._c_object)
 
 
583
            return gnutls.handshake(self._c_object)
 
 
585
        def send(self, data):
 
 
589
                data_len -= gnutls.record_send(self._c_object,
 
 
594
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
596
    # Error handling functions
 
 
597
    def _error_code(result):
 
 
598
        """A function to raise exceptions on errors, suitable
 
 
599
        for the 'restype' attribute on ctypes functions"""
 
 
602
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
603
            raise gnutls.CertificateSecurityError(code = result)
 
 
604
        raise gnutls.Error(code = result)
 
 
606
    def _retry_on_error(result, func, arguments):
 
 
607
        """A function to retry on some errors, suitable
 
 
608
        for the 'errcheck' attribute on ctypes functions"""
 
 
610
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
611
                return _error_code(result)
 
 
612
            result = func(*arguments)
 
 
615
    # Unless otherwise indicated, the function declarations below are
 
 
616
    # all from the gnutls/gnutls.h C header file.
 
 
619
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
620
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
621
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
622
    priority_set_direct.restype = _error_code
 
 
624
    init = _library.gnutls_init
 
 
625
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
626
    init.restype = _error_code
 
 
628
    set_default_priority = _library.gnutls_set_default_priority
 
 
629
    set_default_priority.argtypes = [session_t]
 
 
630
    set_default_priority.restype = _error_code
 
 
632
    record_send = _library.gnutls_record_send
 
 
633
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
635
    record_send.restype = ctypes.c_ssize_t
 
 
636
    record_send.errcheck = _retry_on_error
 
 
638
    certificate_allocate_credentials = (
 
 
639
        _library.gnutls_certificate_allocate_credentials)
 
 
640
    certificate_allocate_credentials.argtypes = [
 
 
641
        ctypes.POINTER(certificate_credentials_t)]
 
 
642
    certificate_allocate_credentials.restype = _error_code
 
 
644
    certificate_free_credentials = (
 
 
645
        _library.gnutls_certificate_free_credentials)
 
 
646
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
 
647
    certificate_free_credentials.restype = None
 
 
649
    handshake_set_private_extensions = (
 
 
650
        _library.gnutls_handshake_set_private_extensions)
 
 
651
    handshake_set_private_extensions.argtypes = [session_t,
 
 
653
    handshake_set_private_extensions.restype = None
 
 
655
    credentials_set = _library.gnutls_credentials_set
 
 
656
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
658
    credentials_set.restype = _error_code
 
 
660
    strerror = _library.gnutls_strerror
 
 
661
    strerror.argtypes = [ctypes.c_int]
 
 
662
    strerror.restype = ctypes.c_char_p
 
 
664
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
665
    certificate_type_get.argtypes = [session_t]
 
 
666
    certificate_type_get.restype = _error_code
 
 
668
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
669
    certificate_get_peers.argtypes = [session_t,
 
 
670
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
671
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
673
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
674
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
675
    global_set_log_level.restype = None
 
 
677
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
678
    global_set_log_function.argtypes = [log_func]
 
 
679
    global_set_log_function.restype = None
 
 
681
    deinit = _library.gnutls_deinit
 
 
682
    deinit.argtypes = [session_t]
 
 
683
    deinit.restype = None
 
 
685
    handshake = _library.gnutls_handshake
 
 
686
    handshake.argtypes = [session_t]
 
 
687
    handshake.restype = _error_code
 
 
688
    handshake.errcheck = _retry_on_error
 
 
690
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
691
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
692
    transport_set_ptr.restype = None
 
 
694
    bye = _library.gnutls_bye
 
 
695
    bye.argtypes = [session_t, close_request_t]
 
 
696
    bye.restype = _error_code
 
 
697
    bye.errcheck = _retry_on_error
 
 
699
    check_version = _library.gnutls_check_version
 
 
700
    check_version.argtypes = [ctypes.c_char_p]
 
 
701
    check_version.restype = ctypes.c_char_p
 
 
703
    # All the function declarations below are from gnutls/openpgp.h
 
 
705
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
706
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
707
    openpgp_crt_init.restype = _error_code
 
 
709
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
710
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
711
                                   ctypes.POINTER(datum_t),
 
 
713
    openpgp_crt_import.restype = _error_code
 
 
715
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
716
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
717
                                        ctypes.POINTER(ctypes.c_uint)]
 
 
718
    openpgp_crt_verify_self.restype = _error_code
 
 
720
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
721
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
722
    openpgp_crt_deinit.restype = None
 
 
724
    openpgp_crt_get_fingerprint = (
 
 
725
        _library.gnutls_openpgp_crt_get_fingerprint)
 
 
726
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
730
    openpgp_crt_get_fingerprint.restype = _error_code
 
 
732
    # Remove non-public functions
 
 
733
    del _error_code, _retry_on_error
 
 
734
# Create the global "gnutls" object, simulating a module
 
 
737
def call_pipe(connection,       # : multiprocessing.Connection
 
 
738
              func, *args, **kwargs):
 
 
739
    """This function is meant to be called by multiprocessing.Process
 
 
741
    This function runs func(*args, **kwargs), and writes the resulting
 
 
742
    return value on the provided multiprocessing.Connection.
 
 
744
    connection.send(func(*args, **kwargs))
 
233
747
class Client(object):
 
234
748
    """A representation of a client host served by this server.
 
237
 
    name:       string; from the config file, used in log messages and
 
 
751
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
752
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
753
    approval_duration: datetime.timedelta(); Duration of one approval
 
 
754
    checker:    subprocess.Popen(); a running checker process used
 
 
755
                                    to see if the client lives.
 
 
756
                                    'None' if no process is running.
 
 
757
    checker_callback_tag: a GLib event source tag, or None
 
 
758
    checker_command: string; External command which is run to check
 
 
759
                     if client lives.  %() expansions are done at
 
 
760
                     runtime with vars(self) as dict, so that for
 
 
761
                     instance %(name)s can be used in the command.
 
 
762
    checker_initiator_tag: a GLib event source tag, or None
 
 
763
    created:    datetime.datetime(); (UTC) object creation
 
 
764
    client_structure: Object describing what attributes a client has
 
 
765
                      and is used for storing the client at exit
 
 
766
    current_checker_command: string; current running checker_command
 
 
767
    disable_initiator_tag: a GLib event source tag, or None
 
239
769
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
240
770
                 uniquely identify the client
 
241
 
    secret:     bytestring; sent verbatim (over TLS) to client
 
242
771
    host:       string; available for use by the checker command
 
243
 
    created:    datetime.datetime(); (UTC) object creation
 
244
 
    last_enabled: datetime.datetime(); (UTC)
 
 
772
    interval:   datetime.timedelta(); How often to start a new checker
 
 
773
    last_approval_request: datetime.datetime(); (UTC) or None
 
246
774
    last_checked_ok: datetime.datetime(); (UTC) or None
 
 
775
    last_checker_status: integer between 0 and 255 reflecting exit
 
 
776
                         status of last checker. -1 reflects crashed
 
 
777
                         checker, -2 means no checker completed yet.
 
 
778
    last_checker_signal: The signal which killed the last checker, if
 
 
779
                         last_checker_status is -1
 
 
780
    last_enabled: datetime.datetime(); (UTC) or None
 
 
781
    name:       string; from the config file, used in log messages and
 
 
783
    secret:     bytestring; sent verbatim (over TLS) to client
 
247
784
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
248
785
                                      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
 
 
786
    extended_timeout:   extra long timeout when secret has been sent
 
 
787
    runtime_expansions: Allowed attributes for runtime expansion.
 
 
788
    expires:    datetime.datetime(); time (UTC) when a client will be
 
 
790
    server_settings: The server_settings dict from main()
 
 
793
    runtime_expansions = ("approval_delay", "approval_duration",
 
 
794
                          "created", "enabled", "expires",
 
 
795
                          "fingerprint", "host", "interval",
 
 
796
                          "last_approval_request", "last_checked_ok",
 
 
797
                          "last_enabled", "name", "timeout")
 
 
800
        "extended_timeout": "PT15M",
 
 
802
        "checker": "fping -q -- %%(host)s",
 
 
804
        "approval_delay": "PT0S",
 
 
805
        "approval_duration": "PT1S",
 
 
806
        "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'
 
 
811
    def config_parser(config):
 
 
812
        """Construct a new dict of client settings of this form:
 
 
813
        { client_name: {setting_name: value, ...}, ...}
 
 
814
        with exceptions for any special settings as defined above.
 
 
815
        NOTE: Must be a pure function. Must return the same result
 
 
816
        value given the same arguments.
 
 
819
        for client_name in config.sections():
 
 
820
            section = dict(config.items(client_name))
 
 
821
            client = settings[client_name] = {}
 
 
823
            client["host"] = section["host"]
 
 
824
            # Reformat values from string types to Python types
 
 
825
            client["approved_by_default"] = config.getboolean(
 
 
826
                client_name, "approved_by_default")
 
 
827
            client["enabled"] = config.getboolean(client_name,
 
 
830
            # Uppercase and remove spaces from fingerprint for later
 
 
831
            # comparison purposes with return value from the
 
 
832
            # fingerprint() function
 
 
833
            client["fingerprint"] = (section["fingerprint"].upper()
 
 
835
            if "secret" in section:
 
 
836
                client["secret"] = codecs.decode(section["secret"]
 
 
839
            elif "secfile" in section:
 
 
840
                with open(os.path.expanduser(os.path.expandvars
 
 
841
                                             (section["secfile"])),
 
 
843
                    client["secret"] = secfile.read()
 
 
845
                raise TypeError("No secret or secfile for section {}"
 
 
847
            client["timeout"] = string_to_delta(section["timeout"])
 
 
848
            client["extended_timeout"] = string_to_delta(
 
 
849
                section["extended_timeout"])
 
 
850
            client["interval"] = string_to_delta(section["interval"])
 
 
851
            client["approval_delay"] = string_to_delta(
 
 
852
                section["approval_delay"])
 
 
853
            client["approval_duration"] = string_to_delta(
 
 
854
                section["approval_duration"])
 
 
855
            client["checker_command"] = section["checker"]
 
 
856
            client["last_approval_request"] = None
 
 
857
            client["last_checked_ok"] = None
 
 
858
            client["last_checker_status"] = -2
 
 
862
    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()
 
 
864
        if server_settings is None:
 
 
866
        self.server_settings = server_settings
 
 
867
        # adding all client settings
 
 
868
        for setting, value in settings.items():
 
 
869
            setattr(self, setting, value)
 
 
872
            if not hasattr(self, "last_enabled"):
 
 
873
                self.last_enabled = datetime.datetime.utcnow()
 
 
874
            if not hasattr(self, "expires"):
 
 
875
                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
 
 
878
            self.last_enabled = None
 
 
881
        logger.debug("Creating client %r", self.name)
 
 
882
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
 
883
        self.created = settings.get("created",
 
 
884
                                    datetime.datetime.utcnow())
 
 
886
        # attributes specific for this server instance
 
317
887
        self.checker = None
 
318
888
        self.checker_initiator_tag = None
 
319
889
        self.disable_initiator_tag = None
 
320
890
        self.checker_callback_tag = None
 
321
 
        self.checker_command = config[u"checker"]
 
322
891
        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
893
        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())
 
 
894
        self.changedstate = multiprocessing_manager.Condition(
 
 
895
            multiprocessing_manager.Lock())
 
 
896
        self.client_structure = [attr
 
 
897
                                 for attr in self.__dict__.keys()
 
 
898
                                 if not attr.startswith("_")]
 
 
899
        self.client_structure.append("client_structure")
 
 
901
        for name, t in inspect.getmembers(
 
 
902
                type(self), lambda obj: isinstance(obj, property)):
 
 
903
            if not name.startswith("_"):
 
 
904
                self.client_structure.append(name)
 
 
906
    # Send notice to process children that client state has changed
 
334
907
    def send_changedstate(self):
 
335
 
        self.changedstate.acquire()
 
336
 
        self.changedstate.notify_all()
 
337
 
        self.changedstate.release()
 
 
908
        with self.changedstate:
 
 
909
            self.changedstate.notify_all()
 
339
911
    def enable(self):
 
340
912
        """Start this client's checker and timeout hooks"""
 
341
 
        if getattr(self, u"enabled", False):
 
 
913
        if getattr(self, "enabled", False):
 
342
914
            # Already enabled
 
344
 
        self.send_changedstate()
 
 
916
        self.expires = datetime.datetime.utcnow() + self.timeout
 
345
918
        self.last_enabled = datetime.datetime.utcnow()
 
 
920
        self.send_changedstate()
 
 
922
    def disable(self, quiet=True):
 
 
923
        """Disable this client."""
 
 
924
        if not getattr(self, "enabled", False):
 
 
927
            logger.info("Disabling client %s", self.name)
 
 
928
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
929
            GLib.source_remove(self.disable_initiator_tag)
 
 
930
            self.disable_initiator_tag = None
 
 
932
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
933
            GLib.source_remove(self.checker_initiator_tag)
 
 
934
            self.checker_initiator_tag = None
 
 
938
            self.send_changedstate()
 
 
939
        # Do not run this again if called by a GLib.timeout_add
 
 
945
    def init_checker(self):
 
346
946
        # Schedule a new checker to be started an 'interval' from now,
 
347
947
        # and every interval from then on.
 
348
 
        self.checker_initiator_tag = (gobject.timeout_add
 
349
 
                                      (self.interval_milliseconds(),
 
 
948
        if self.checker_initiator_tag is not None:
 
 
949
            GLib.source_remove(self.checker_initiator_tag)
 
 
950
        self.checker_initiator_tag = GLib.timeout_add(
 
 
951
            int(self.interval.total_seconds() * 1000),
 
351
953
        # Schedule a disable() when 'timeout' has passed
 
352
 
        self.disable_initiator_tag = (gobject.timeout_add
 
353
 
                                   (self.timeout_milliseconds(),
 
 
954
        if self.disable_initiator_tag is not None:
 
 
955
            GLib.source_remove(self.disable_initiator_tag)
 
 
956
        self.disable_initiator_tag = GLib.timeout_add(
 
 
957
            int(self.timeout.total_seconds() * 1000), self.disable)
 
356
958
        # Also start a new checker *right now*.
 
357
959
        self.start_checker()
 
359
 
    def disable(self, quiet=True):
 
360
 
        """Disable this client."""
 
361
 
        if not getattr(self, "enabled", False):
 
364
 
            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
 
        # Do not run this again if called by a gobject.timeout_add
 
381
 
        self.disable_hook = None
 
384
 
    def checker_callback(self, pid, condition, command):
 
 
961
    def checker_callback(self, source, condition, connection,
 
385
963
        """The checker has completed, so take appropriate actions."""
 
386
964
        self.checker_callback_tag = None
 
387
965
        self.checker = None
 
388
 
        if os.WIFEXITED(condition):
 
389
 
            exitstatus = os.WEXITSTATUS(condition)
 
391
 
                logger.info(u"Checker for %(name)s succeeded",
 
 
966
        # Read return code from connection (see call_pipe)
 
 
967
        returncode = connection.recv()
 
 
971
            self.last_checker_status = returncode
 
 
972
            self.last_checker_signal = None
 
 
973
            if self.last_checker_status == 0:
 
 
974
                logger.info("Checker for %(name)s succeeded",
 
393
976
                self.checked_ok()
 
395
 
                logger.info(u"Checker for %(name)s failed",
 
 
978
                logger.info("Checker for %(name)s failed", vars(self))
 
398
 
            logger.warning(u"Checker for %(name)s crashed?",
 
 
980
            self.last_checker_status = -1
 
 
981
            self.last_checker_signal = -returncode
 
 
982
            logger.warning("Checker for %(name)s crashed?",
 
401
986
    def checked_ok(self):
 
402
 
        """Bump up the timeout for this client.
 
404
 
        This should only be called when the client has been seen,
 
 
987
        """Assert that the client has been seen, alive and well."""
 
407
988
        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(),
 
 
989
        self.last_checker_status = 0
 
 
990
        self.last_checker_signal = None
 
 
993
    def bump_timeout(self, timeout=None):
 
 
994
        """Bump up the timeout for this client."""
 
 
996
            timeout = self.timeout
 
 
997
        if self.disable_initiator_tag is not None:
 
 
998
            GLib.source_remove(self.disable_initiator_tag)
 
 
999
            self.disable_initiator_tag = None
 
 
1000
        if getattr(self, "enabled", False):
 
 
1001
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1002
                int(timeout.total_seconds() * 1000), self.disable)
 
 
1003
            self.expires = datetime.datetime.utcnow() + timeout
 
 
1005
    def need_approval(self):
 
 
1006
        self.last_approval_request = datetime.datetime.utcnow()
 
413
1008
    def start_checker(self):
 
414
1009
        """Start a new checker subprocess if one is not running.
 
 
553
 
class DBusObjectWithProperties(dbus.service.Object):
 
 
1175
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1176
    """A D-Bus object with annotations.
 
 
1178
    Classes inheriting from this can use the dbus_annotations
 
 
1179
    decorator to add annotations to methods or signals.
 
 
1183
    def _is_dbus_thing(thing):
 
 
1184
        """Returns a function testing if an attribute is a D-Bus thing
 
 
1186
        If called like _is_dbus_thing("method") it returns a function
 
 
1187
        suitable for use as predicate to inspect.getmembers().
 
 
1189
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
1192
    def _get_all_dbus_things(self, thing):
 
 
1193
        """Returns a generator of (name, attribute) pairs
 
 
1195
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
1196
                 athing.__get__(self))
 
 
1197
                for cls in self.__class__.__mro__
 
 
1199
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1201
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1202
                         out_signature = "s",
 
 
1203
                         path_keyword = 'object_path',
 
 
1204
                         connection_keyword = 'connection')
 
 
1205
    def Introspect(self, object_path, connection):
 
 
1206
        """Overloading of standard D-Bus method.
 
 
1208
        Inserts annotation tags on methods and signals.
 
 
1210
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1213
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1215
            for if_tag in document.getElementsByTagName("interface"):
 
 
1216
                # Add annotation tags
 
 
1217
                for typ in ("method", "signal"):
 
 
1218
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1220
                        for name, prop in (self.
 
 
1221
                                           _get_all_dbus_things(typ)):
 
 
1222
                            if (name == tag.getAttribute("name")
 
 
1223
                                and prop._dbus_interface
 
 
1224
                                == if_tag.getAttribute("name")):
 
 
1225
                                annots.update(getattr(
 
 
1226
                                    prop, "_dbus_annotations", {}))
 
 
1227
                        for name, value in annots.items():
 
 
1228
                            ann_tag = document.createElement(
 
 
1230
                            ann_tag.setAttribute("name", name)
 
 
1231
                            ann_tag.setAttribute("value", value)
 
 
1232
                            tag.appendChild(ann_tag)
 
 
1233
                # Add interface annotation tags
 
 
1234
                for annotation, value in dict(
 
 
1235
                    itertools.chain.from_iterable(
 
 
1236
                        annotations().items()
 
 
1237
                        for name, annotations
 
 
1238
                        in self._get_all_dbus_things("interface")
 
 
1239
                        if name == if_tag.getAttribute("name")
 
 
1241
                    ann_tag = document.createElement("annotation")
 
 
1242
                    ann_tag.setAttribute("name", annotation)
 
 
1243
                    ann_tag.setAttribute("value", value)
 
 
1244
                    if_tag.appendChild(ann_tag)
 
 
1245
                # Fix argument name for the Introspect method itself
 
 
1246
                if (if_tag.getAttribute("name")
 
 
1247
                                == dbus.INTROSPECTABLE_IFACE):
 
 
1248
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1249
                        if cn.getAttribute("name") == "Introspect":
 
 
1250
                            for arg in cn.getElementsByTagName("arg"):
 
 
1251
                                if (arg.getAttribute("direction")
 
 
1253
                                    arg.setAttribute("name",
 
 
1255
            xmlstring = document.toxml("utf-8")
 
 
1257
        except (AttributeError, xml.dom.DOMException,
 
 
1258
                xml.parsers.expat.ExpatError) as error:
 
 
1259
            logger.error("Failed to override Introspection method",
 
 
1264
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
554
1265
    """A D-Bus object with properties.
 
556
1267
    Classes inheriting from this can use the dbus_service_property
 
557
1268
    decorator to expose methods as D-Bus properties.  It exposes the
 
558
1269
    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
1272
    def _get_dbus_property(self, interface_name, property_name):
 
573
1273
        """Returns a bound method if one exists which is a D-Bus
 
574
1274
        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)):
 
 
1276
        for cls in self.__class__.__mro__:
 
 
1277
            for name, value in inspect.getmembers(
 
 
1278
                    cls, self._is_dbus_thing("property")):
 
 
1279
                if (value._dbus_name == property_name
 
 
1280
                    and value._dbus_interface == interface_name):
 
 
1281
                    return value.__get__(self)
 
586
1283
        # 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",
 
 
1284
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1285
            self.dbus_object_path, interface_name, property_name))
 
 
1288
    def _get_all_interface_names(cls):
 
 
1289
        """Get a sequence of all interfaces supported by an object"""
 
 
1290
        return (name for name in set(getattr(getattr(x, attr),
 
 
1291
                                             "_dbus_interface", None)
 
 
1292
                                     for x in (inspect.getmro(cls))
 
 
1294
                if name is not None)
 
 
1296
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
593
1299
    def Get(self, interface_name, property_name):
 
594
1300
        """Standard D-Bus property Get() method, see D-Bus standard.
 
596
1302
        prop = self._get_dbus_property(interface_name, property_name)
 
597
 
        if prop._dbus_access == u"write":
 
 
1303
        if prop._dbus_access == "write":
 
598
1304
            raise DBusPropertyAccessException(property_name)
 
600
 
        if not hasattr(value, u"variant_level"):
 
 
1306
        if not hasattr(value, "variant_level"):
 
602
1308
        return type(value)(value, variant_level=value.variant_level+1)
 
604
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
1310
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
605
1311
    def Set(self, interface_name, property_name, value):
 
606
1312
        """Standard D-Bus property Set() method, see D-Bus standard.
 
608
1314
        prop = self._get_dbus_property(interface_name, property_name)
 
609
 
        if prop._dbus_access == u"read":
 
 
1315
        if prop._dbus_access == "read":
 
610
1316
            raise DBusPropertyAccessException(property_name)
 
611
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
1317
        if prop._dbus_get_args_options["byte_arrays"]:
 
612
1318
            # The byte_arrays option is not supported yet on
 
613
1319
            # signatures other than "ay".
 
614
 
            if prop._dbus_signature != u"ay":
 
616
 
            value = dbus.ByteArray(''.join(unichr(byte)
 
 
1320
            if prop._dbus_signature != "ay":
 
 
1321
                raise ValueError("Byte arrays not supported for non-"
 
 
1322
                                 "'ay' signature {!r}"
 
 
1323
                                 .format(prop._dbus_signature))
 
 
1324
            value = dbus.ByteArray(b''.join(chr(byte)
 
620
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
621
 
                         out_signature=u"a{sv}")
 
 
1328
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
1330
                         out_signature="a{sv}")
 
622
1331
    def GetAll(self, interface_name):
 
623
1332
        """Standard D-Bus property GetAll() method, see D-Bus
 
626
1335
        Note: Will not include properties with access="write".
 
629
 
        for name, prop in self._get_all_dbus_properties():
 
 
1338
        for name, prop in self._get_all_dbus_things("property"):
 
630
1339
            if (interface_name
 
631
1340
                and interface_name != prop._dbus_interface):
 
632
1341
                # Interface non-empty but did not match
 
634
1343
            # Ignore write-only properties
 
635
 
            if prop._dbus_access == u"write":
 
 
1344
            if prop._dbus_access == "write":
 
638
 
            if not hasattr(value, u"variant_level"):
 
 
1347
            if not hasattr(value, "variant_level"):
 
 
1348
                properties[name] = value
 
641
 
            all[name] = type(value)(value, variant_level=
 
642
 
                                    value.variant_level+1)
 
643
 
        return dbus.Dictionary(all, signature=u"sv")
 
 
1350
            properties[name] = type(value)(
 
 
1351
                value, variant_level = value.variant_level + 1)
 
 
1352
        return dbus.Dictionary(properties, signature="sv")
 
 
1354
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
 
1355
    def PropertiesChanged(self, interface_name, changed_properties,
 
 
1356
                          invalidated_properties):
 
 
1357
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
645
1362
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
647
1364
                         path_keyword='object_path',
 
648
1365
                         connection_keyword='connection')
 
649
1366
    def Introspect(self, object_path, connection):
 
650
 
        """Standard D-Bus method, overloaded to insert property tags.
 
 
1367
        """Overloading of standard D-Bus method.
 
 
1369
        Inserts property tags and interface annotation tags.
 
652
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1371
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
655
1375
            document = xml.dom.minidom.parseString(xmlstring)
 
656
1377
            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)
 
 
1378
                e = document.createElement("property")
 
 
1379
                e.setAttribute("name", name)
 
 
1380
                e.setAttribute("type", prop._dbus_signature)
 
 
1381
                e.setAttribute("access", prop._dbus_access)
 
662
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
1384
            for if_tag in document.getElementsByTagName("interface"):
 
663
1386
                for tag in (make_tag(document, name, prop)
 
665
 
                            in self._get_all_dbus_properties()
 
 
1388
                            in self._get_all_dbus_things("property")
 
666
1389
                            if prop._dbus_interface
 
667
 
                            == if_tag.getAttribute(u"name")):
 
 
1390
                            == if_tag.getAttribute("name")):
 
668
1391
                    if_tag.appendChild(tag)
 
 
1392
                # Add annotation tags for properties
 
 
1393
                for tag in if_tag.getElementsByTagName("property"):
 
 
1395
                    for name, prop in self._get_all_dbus_things(
 
 
1397
                        if (name == tag.getAttribute("name")
 
 
1398
                            and prop._dbus_interface
 
 
1399
                            == if_tag.getAttribute("name")):
 
 
1400
                            annots.update(getattr(
 
 
1401
                                prop, "_dbus_annotations", {}))
 
 
1402
                    for name, value in annots.items():
 
 
1403
                        ann_tag = document.createElement(
 
 
1405
                        ann_tag.setAttribute("name", name)
 
 
1406
                        ann_tag.setAttribute("value", value)
 
 
1407
                        tag.appendChild(ann_tag)
 
669
1408
                # Add the names to the return values for the
 
670
1409
                # "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",
 
 
1410
                if (if_tag.getAttribute("name")
 
 
1411
                    == "org.freedesktop.DBus.Properties"):
 
 
1412
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1413
                        if cn.getAttribute("name") == "Get":
 
 
1414
                            for arg in cn.getElementsByTagName("arg"):
 
 
1415
                                if (arg.getAttribute("direction")
 
 
1417
                                    arg.setAttribute("name", "value")
 
 
1418
                        elif cn.getAttribute("name") == "GetAll":
 
 
1419
                            for arg in cn.getElementsByTagName("arg"):
 
 
1420
                                if (arg.getAttribute("direction")
 
 
1422
                                    arg.setAttribute("name", "props")
 
 
1423
            xmlstring = document.toxml("utf-8")
 
 
1425
        except (AttributeError, xml.dom.DOMException,
 
 
1426
                xml.parsers.expat.ExpatError) as error:
 
 
1427
            logger.error("Failed to override Introspection method",
 
 
1432
    dbus.OBJECT_MANAGER_IFACE
 
 
1433
except AttributeError:
 
 
1434
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1436
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1437
    """A D-Bus object with an ObjectManager.
 
 
1439
    Classes inheriting from this exposes the standard
 
 
1440
    GetManagedObjects call and the InterfacesAdded and
 
 
1441
    InterfacesRemoved signals on the standard
 
 
1442
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1444
    Note: No signals are sent automatically; they must be sent
 
 
1447
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1448
                         out_signature = "a{oa{sa{sv}}}")
 
 
1449
    def GetManagedObjects(self):
 
 
1450
        """This function must be overridden"""
 
 
1451
        raise NotImplementedError()
 
 
1453
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1454
                         signature = "oa{sa{sv}}")
 
 
1455
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1458
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
 
1459
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1462
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1463
                         out_signature = "s",
 
 
1464
                         path_keyword = 'object_path',
 
 
1465
                         connection_keyword = 'connection')
 
 
1466
    def Introspect(self, object_path, connection):
 
 
1467
        """Overloading of standard D-Bus method.
 
 
1469
        Override return argument name of GetManagedObjects to be
 
 
1470
        "objpath_interfaces_and_properties"
 
 
1472
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1476
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1478
            for if_tag in document.getElementsByTagName("interface"):
 
 
1479
                # Fix argument name for the GetManagedObjects method
 
 
1480
                if (if_tag.getAttribute("name")
 
 
1481
                                == dbus.OBJECT_MANAGER_IFACE):
 
 
1482
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1483
                        if (cn.getAttribute("name")
 
 
1484
                            == "GetManagedObjects"):
 
 
1485
                            for arg in cn.getElementsByTagName("arg"):
 
 
1486
                                if (arg.getAttribute("direction")
 
 
1490
                                        "objpath_interfaces"
 
 
1492
            xmlstring = document.toxml("utf-8")
 
 
1494
        except (AttributeError, xml.dom.DOMException,
 
 
1495
                xml.parsers.expat.ExpatError) as error:
 
 
1496
            logger.error("Failed to override Introspection method",
 
 
1500
def datetime_to_dbus(dt, variant_level=0):
 
 
1501
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
1503
        return dbus.String("", variant_level = variant_level)
 
 
1504
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1507
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1508
    """A class decorator; applied to a subclass of
 
 
1509
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1510
    interface names according to the "alt_interface_names" mapping.
 
 
1513
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1514
                                    "net.example.AlternateInterface"})
 
 
1515
    class SampleDBusObject(dbus.service.Object):
 
 
1516
        @dbus.service.method("org.example.Interface")
 
 
1517
        def SampleDBusMethod():
 
 
1520
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1521
    reachable via two interfaces: "org.example.Interface" and
 
 
1522
    "net.example.AlternateInterface", the latter of which will have
 
 
1523
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1524
    "true", unless "deprecate" is passed with a False value.
 
 
1526
    This works for methods and signals, and also for D-Bus properties
 
 
1527
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1528
    dbus_interface_annotations decorator).
 
 
1532
        for orig_interface_name, alt_interface_name in (
 
 
1533
                alt_interface_names.items()):
 
 
1535
            interface_names = set()
 
 
1536
            # Go though all attributes of the class
 
 
1537
            for attrname, attribute in inspect.getmembers(cls):
 
 
1538
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
 
1539
                # with the wrong interface name
 
 
1540
                if (not hasattr(attribute, "_dbus_interface")
 
 
1541
                    or not attribute._dbus_interface.startswith(
 
 
1542
                        orig_interface_name)):
 
 
1544
                # Create an alternate D-Bus interface name based on
 
 
1546
                alt_interface = attribute._dbus_interface.replace(
 
 
1547
                    orig_interface_name, alt_interface_name)
 
 
1548
                interface_names.add(alt_interface)
 
 
1549
                # Is this a D-Bus signal?
 
 
1550
                if getattr(attribute, "_dbus_is_signal", False):
 
 
1551
                    # Extract the original non-method undecorated
 
 
1552
                    # function by black magic
 
 
1553
                    if sys.version_info.major == 2:
 
 
1554
                        nonmethod_func = (dict(
 
 
1555
                            zip(attribute.func_code.co_freevars,
 
 
1556
                                attribute.__closure__))
 
 
1557
                                          ["func"].cell_contents)
 
 
1559
                        nonmethod_func = (dict(
 
 
1560
                            zip(attribute.__code__.co_freevars,
 
 
1561
                                attribute.__closure__))
 
 
1562
                                          ["func"].cell_contents)
 
 
1563
                    # Create a new, but exactly alike, function
 
 
1564
                    # object, and decorate it to be a new D-Bus signal
 
 
1565
                    # with the alternate D-Bus interface name
 
 
1566
                    new_function = copy_function(nonmethod_func)
 
 
1567
                    new_function = (dbus.service.signal(
 
 
1569
                        attribute._dbus_signature)(new_function))
 
 
1570
                    # Copy annotations, if any
 
 
1572
                        new_function._dbus_annotations = dict(
 
 
1573
                            attribute._dbus_annotations)
 
 
1574
                    except AttributeError:
 
 
1576
                    # Define a creator of a function to call both the
 
 
1577
                    # original and alternate functions, so both the
 
 
1578
                    # original and alternate signals gets sent when
 
 
1579
                    # the function is called
 
 
1580
                    def fixscope(func1, func2):
 
 
1581
                        """This function is a scope container to pass
 
 
1582
                        func1 and func2 to the "call_both" function
 
 
1583
                        outside of its arguments"""
 
 
1585
                        @functools.wraps(func2)
 
 
1586
                        def call_both(*args, **kwargs):
 
 
1587
                            """This function will emit two D-Bus
 
 
1588
                            signals by calling func1 and func2"""
 
 
1589
                            func1(*args, **kwargs)
 
 
1590
                            func2(*args, **kwargs)
 
 
1591
                        # Make wrapper function look like a D-Bus signal
 
 
1592
                        for name, attr in inspect.getmembers(func2):
 
 
1593
                            if name.startswith("_dbus_"):
 
 
1594
                                setattr(call_both, name, attr)
 
 
1597
                    # Create the "call_both" function and add it to
 
 
1599
                    attr[attrname] = fixscope(attribute, new_function)
 
 
1600
                # Is this a D-Bus method?
 
 
1601
                elif getattr(attribute, "_dbus_is_method", False):
 
 
1602
                    # Create a new, but exactly alike, function
 
 
1603
                    # object.  Decorate it to be a new D-Bus method
 
 
1604
                    # with the alternate D-Bus interface name.  Add it
 
 
1607
                        dbus.service.method(
 
 
1609
                            attribute._dbus_in_signature,
 
 
1610
                            attribute._dbus_out_signature)
 
 
1611
                        (copy_function(attribute)))
 
 
1612
                    # Copy annotations, if any
 
 
1614
                        attr[attrname]._dbus_annotations = dict(
 
 
1615
                            attribute._dbus_annotations)
 
 
1616
                    except AttributeError:
 
 
1618
                # Is this a D-Bus property?
 
 
1619
                elif getattr(attribute, "_dbus_is_property", False):
 
 
1620
                    # Create a new, but exactly alike, function
 
 
1621
                    # object, and decorate it to be a new D-Bus
 
 
1622
                    # property with the alternate D-Bus interface
 
 
1623
                    # name.  Add it to the class.
 
 
1624
                    attr[attrname] = (dbus_service_property(
 
 
1625
                        alt_interface, attribute._dbus_signature,
 
 
1626
                        attribute._dbus_access,
 
 
1627
                        attribute._dbus_get_args_options
 
 
1629
                                      (copy_function(attribute)))
 
 
1630
                    # Copy annotations, if any
 
 
1632
                        attr[attrname]._dbus_annotations = dict(
 
 
1633
                            attribute._dbus_annotations)
 
 
1634
                    except AttributeError:
 
 
1636
                # Is this a D-Bus interface?
 
 
1637
                elif getattr(attribute, "_dbus_is_interface", False):
 
 
1638
                    # Create a new, but exactly alike, function
 
 
1639
                    # object.  Decorate it to be a new D-Bus interface
 
 
1640
                    # with the alternate D-Bus interface name.  Add it
 
 
1643
                        dbus_interface_annotations(alt_interface)
 
 
1644
                        (copy_function(attribute)))
 
 
1646
                # Deprecate all alternate interfaces
 
 
1647
                iname="_AlternateDBusNames_interface_annotation{}"
 
 
1648
                for interface_name in interface_names:
 
 
1650
                    @dbus_interface_annotations(interface_name)
 
 
1652
                        return { "org.freedesktop.DBus.Deprecated":
 
 
1654
                    # Find an unused name
 
 
1655
                    for aname in (iname.format(i)
 
 
1656
                                  for i in itertools.count()):
 
 
1657
                        if aname not in attr:
 
 
1661
                # Replace the class with a new subclass of it with
 
 
1662
                # methods, signals, etc. as created above.
 
 
1663
                if sys.version_info.major == 2:
 
 
1664
                    cls = type(b"{}Alternate".format(cls.__name__),
 
 
1667
                    cls = type("{}Alternate".format(cls.__name__),
 
 
1674
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1675
                            "se.bsnet.fukt.Mandos"})
 
693
1676
class ClientDBus(Client, DBusObjectWithProperties):
 
694
1677
    """A Client class using D-Bus
 
 
697
1680
    dbus_object_path: dbus.ObjectPath
 
698
1681
    bus: dbus.SystemBus()
 
 
1684
    runtime_expansions = (Client.runtime_expansions
 
 
1685
                          + ("dbus_object_path", ))
 
 
1687
    _interface = "se.recompile.Mandos.Client"
 
700
1689
    # dbus.service.Object doesn't use super(), so we can't either.
 
702
1691
    def __init__(self, bus = None, *args, **kwargs):
 
703
 
        self._approvals_pending = 0
 
705
1693
        Client.__init__(self, *args, **kwargs)
 
706
1694
        # 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"_")))
 
 
1696
        client_object_name = str(self.name).translate(
 
 
1697
            {ord("."): ord("_"),
 
 
1698
             ord("-"): ord("_")})
 
 
1699
        self.dbus_object_path = dbus.ObjectPath(
 
 
1700
            "/clients/" + client_object_name)
 
711
1701
        DBusObjectWithProperties.__init__(self, self.bus,
 
712
1702
                                          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))
 
 
1704
    def notifychangeproperty(transform_func, dbus_name,
 
 
1705
                             type_func=lambda x: x,
 
 
1707
                             invalidate_only=False,
 
 
1708
                             _interface=_interface):
 
 
1709
        """ Modify a variable so that it's a property which announces
 
 
1710
        its changes to DBus.
 
 
1712
        transform_fun: Function that takes a value and a variant_level
 
 
1713
                       and transforms it to a D-Bus type.
 
 
1714
        dbus_name: D-Bus name of the variable
 
 
1715
        type_func: Function that transform the value before sending it
 
 
1716
                   to the D-Bus.  Default: no transform
 
 
1717
        variant_level: D-Bus variant level.  Default: 1
 
 
1719
        attrname = "_{}".format(dbus_name)
 
 
1721
        def setter(self, value):
 
 
1722
            if hasattr(self, "dbus_object_path"):
 
 
1723
                if (not hasattr(self, attrname) or
 
 
1724
                    type_func(getattr(self, attrname, None))
 
 
1725
                    != type_func(value)):
 
 
1727
                        self.PropertiesChanged(
 
 
1728
                            _interface, dbus.Dictionary(),
 
 
1729
                            dbus.Array((dbus_name, )))
 
 
1731
                        dbus_value = transform_func(
 
 
1733
                            variant_level = variant_level)
 
 
1734
                        self.PropertyChanged(dbus.String(dbus_name),
 
 
1736
                        self.PropertiesChanged(
 
 
1738
                            dbus.Dictionary({ dbus.String(dbus_name):
 
 
1741
            setattr(self, attrname, value)
 
 
1743
        return property(lambda self: getattr(self, attrname), setter)
 
 
1745
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
 
1746
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
 
1749
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
 
1750
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
 
1752
    checker = notifychangeproperty(
 
 
1753
        dbus.Boolean, "CheckerRunning",
 
 
1754
        type_func = lambda checker: checker is not None)
 
 
1755
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
 
1757
    last_checker_status = notifychangeproperty(dbus.Int16,
 
 
1758
                                               "LastCheckerStatus")
 
 
1759
    last_approval_request = notifychangeproperty(
 
 
1760
        datetime_to_dbus, "LastApprovalRequest")
 
 
1761
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
 
1762
                                               "ApprovedByDefault")
 
 
1763
    approval_delay = notifychangeproperty(
 
 
1764
        dbus.UInt64, "ApprovalDelay",
 
 
1765
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1766
    approval_duration = notifychangeproperty(
 
 
1767
        dbus.UInt64, "ApprovalDuration",
 
 
1768
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1769
    host = notifychangeproperty(dbus.String, "Host")
 
 
1770
    timeout = notifychangeproperty(
 
 
1771
        dbus.UInt64, "Timeout",
 
 
1772
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1773
    extended_timeout = notifychangeproperty(
 
 
1774
        dbus.UInt64, "ExtendedTimeout",
 
 
1775
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1776
    interval = notifychangeproperty(
 
 
1777
        dbus.UInt64, "Interval",
 
 
1778
        type_func = lambda td: td.total_seconds() * 1000)
 
 
1779
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
 
1780
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
 
1781
                                  invalidate_only=True)
 
 
1783
    del notifychangeproperty
 
758
1785
    def __del__(self, *args, **kwargs):
 
760
1787
            self.remove_from_connection()
 
761
1788
        except LookupError:
 
763
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
 
1790
        if hasattr(DBusObjectWithProperties, "__del__"):
 
764
1791
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
765
1792
        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)
 
 
1794
    def checker_callback(self, source, condition,
 
 
1795
                         connection, command, *args, **kwargs):
 
 
1796
        ret = Client.checker_callback(self, source, condition,
 
 
1797
                                      connection, command, *args,
 
 
1799
        exitstatus = self.last_checker_status
 
776
1801
            # Emit D-Bus signal
 
777
1802
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
778
 
                                  dbus.Int64(condition),
 
 
1803
                                  # This is specific to GNU libC
 
 
1804
                                  dbus.Int64(exitstatus << 8),
 
779
1805
                                  dbus.String(command))
 
781
1807
            # Emit D-Bus signal
 
782
1808
            self.CheckerCompleted(dbus.Int16(-1),
 
783
 
                                  dbus.Int64(condition),
 
 
1810
                                      # This is specific to GNU libC
 
 
1812
                                      | self.last_checker_signal),
 
784
1813
                                  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
1816
    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
 
 
1817
        old_checker_pid = getattr(self.checker, "pid", None)
 
804
1818
        r = Client.start_checker(self, *args, **kwargs)
 
805
1819
        # Only if new checker process was started
 
806
1820
        if (self.checker is not None
 
807
1821
            and old_checker_pid != self.checker.pid):
 
808
1822
            # Emit D-Bus signal
 
809
1823
            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
1826
    def _reset_approved(self):
 
825
 
        self._approved = None
 
 
1827
        self.approved = None
 
828
1830
    def approve(self, value=True):
 
 
1831
        self.approved = value
 
 
1832
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
 
1833
                             * 1000), self._reset_approved)
 
829
1834
        self.send_changedstate()
 
830
 
        self._approved = value
 
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
832
 
                            self._reset_approved)
 
835
1836
    ## D-Bus methods, signals & properties
 
836
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
840
1842
    # CheckerCompleted - signal
 
841
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
 
1843
    @dbus.service.signal(_interface, signature="nxs")
 
842
1844
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
846
1848
    # CheckerStarted - signal
 
847
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
1849
    @dbus.service.signal(_interface, signature="s")
 
848
1850
    def CheckerStarted(self, command):
 
852
1854
    # PropertyChanged - signal
 
853
 
    @dbus.service.signal(_interface, signature=u"sv")
 
 
1855
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
 
1856
    @dbus.service.signal(_interface, signature="sv")
 
854
1857
    def PropertyChanged(self, property, value):
 
 
1422
2484
        gnutls_priority GnuTLS priority string
 
1423
2485
        use_dbus:       Boolean; to emit D-Bus signals or not
 
1425
 
    Assumes a gobject.MainLoop event loop.
 
 
2487
    Assumes a GLib.MainLoop event loop.
 
1427
2490
    def __init__(self, server_address, RequestHandlerClass,
 
1428
 
                 interface=None, use_ipv6=True, clients=None,
 
1429
 
                 gnutls_priority=None, use_dbus=True):
 
 
2494
                 gnutls_priority=None,
 
1430
2497
        self.enabled = False
 
1431
2498
        self.clients = clients
 
1432
2499
        if self.clients is None:
 
1433
 
            self.clients = set()
 
1434
2501
        self.use_dbus = use_dbus
 
1435
2502
        self.gnutls_priority = gnutls_priority
 
1436
2503
        IPv6_TCPServer.__init__(self, server_address,
 
1437
2504
                                RequestHandlerClass,
 
1438
2505
                                interface = interface,
 
1439
 
                                use_ipv6 = use_ipv6)
 
 
2506
                                use_ipv6 = use_ipv6,
 
 
2507
                                socketfd = socketfd)
 
1440
2509
    def server_activate(self):
 
1441
2510
        if self.enabled:
 
1442
2511
            return socketserver.TCPServer.server_activate(self)
 
1443
2513
    def enable(self):
 
1444
2514
        self.enabled = True
 
1445
 
    def add_pipe(self, parent_pipe):
 
 
2516
    def add_pipe(self, parent_pipe, proc):
 
1446
2517
        # 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,
 
 
2519
            parent_pipe.fileno(),
 
 
2520
            GLib.IO_IN | GLib.IO_HUP,
 
 
2521
            functools.partial(self.handle_ipc,
 
 
2522
                              parent_pipe = parent_pipe,
 
 
2525
    def handle_ipc(self, source, condition,
 
1453
2528
                   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):
 
 
2529
        # error, or the other end of multiprocessing.Pipe has closed
 
 
2530
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
 
2531
            # Wait for other process to exit
 
1475
2535
        # Read a request from the child
 
1476
2536
        request = parent_pipe.recv()
 
1477
 
        logger.debug(u"IPC request: %s", repr(request))
 
1478
2537
        command = request[0]
 
1480
2539
        if command == 'init':
 
1481
2540
            fpr = request[1]
 
1482
2541
            address = request[2]
 
1484
 
            for c in self.clients:
 
 
2543
            for c in self.clients.values():
 
1485
2544
                if c.fingerprint == fpr:
 
1489
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1490
 
                               u"dress: %s", fpr, address)
 
 
2548
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2549
                            "dress: %s", fpr, address)
 
1491
2550
                if self.use_dbus:
 
1492
2551
                    # Emit D-Bus signal
 
1493
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
 
2552
                    mandos_dbus_service.ClientNotFound(fpr,
 
1494
2554
                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))
 
 
2558
                parent_pipe.fileno(),
 
 
2559
                GLib.IO_IN | GLib.IO_HUP,
 
 
2560
                functools.partial(self.handle_ipc,
 
 
2561
                                  parent_pipe = parent_pipe,
 
 
2563
                                  client_object = client))
 
1502
2564
            parent_pipe.send(True)
 
1503
 
            # remove the old hook in favor of the new above hook on same fileno
 
 
2565
            # remove the old hook in favor of the new above hook on
 
1505
2568
        if command == 'funcall':
 
1506
2569
            funcname = request[1]
 
1507
2570
            args = request[2]
 
1508
2571
            kwargs = request[3]
 
1510
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
 
2573
            parent_pipe.send(('data', getattr(client_object,
 
1512
2577
        if command == 'getattr':
 
1513
2578
            attrname = request[1]
 
1514
 
            if callable(client_object.__getattribute__(attrname)):
 
1515
 
                parent_pipe.send(('function',))
 
 
2579
            if isinstance(client_object.__getattribute__(attrname),
 
 
2580
                          collections.Callable):
 
 
2581
                parent_pipe.send(('function', ))
 
1517
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
 
2584
                    'data', client_object.__getattribute__(attrname)))
 
1519
2586
        if command == 'setattr':
 
1520
2587
            attrname = request[1]
 
1521
2588
            value = request[2]
 
1522
2589
            setattr(client_object, attrname, value)
 
 
2594
def rfc3339_duration_to_delta(duration):
 
 
2595
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2597
    >>> rfc3339_duration_to_delta("P7D")
 
 
2598
    datetime.timedelta(7)
 
 
2599
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2600
    datetime.timedelta(0, 60)
 
 
2601
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2602
    datetime.timedelta(0, 3600)
 
 
2603
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2604
    datetime.timedelta(1)
 
 
2605
    >>> rfc3339_duration_to_delta("P1W")
 
 
2606
    datetime.timedelta(7)
 
 
2607
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2608
    datetime.timedelta(0, 330)
 
 
2609
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2610
    datetime.timedelta(1, 200)
 
 
2613
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2614
    # possible - there would have to be multiple places for the same
 
 
2615
    # values, like seconds.  The current code, while more esoteric, is
 
 
2616
    # cleaner without depending on a parsing library.  If Python had a
 
 
2617
    # built-in library for parsing we would use it, but we'd like to
 
 
2618
    # avoid excessive use of external libraries.
 
 
2620
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2621
    Token = collections.namedtuple("Token", (
 
 
2622
        "regexp",  # To match token; if "value" is not None, must have
 
 
2623
                   # a "group" containing digits
 
 
2624
        "value",   # datetime.timedelta or None
 
 
2625
        "followers"))           # Tokens valid after this token
 
 
2626
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2627
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2628
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2629
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2630
                         datetime.timedelta(seconds=1),
 
 
2631
                         frozenset((token_end, )))
 
 
2632
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2633
                         datetime.timedelta(minutes=1),
 
 
2634
                         frozenset((token_second, token_end)))
 
 
2635
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2636
                       datetime.timedelta(hours=1),
 
 
2637
                       frozenset((token_minute, token_end)))
 
 
2638
    token_time = Token(re.compile(r"T"),
 
 
2640
                       frozenset((token_hour, token_minute,
 
 
2642
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2643
                      datetime.timedelta(days=1),
 
 
2644
                      frozenset((token_time, token_end)))
 
 
2645
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2646
                        datetime.timedelta(weeks=4),
 
 
2647
                        frozenset((token_day, token_end)))
 
 
2648
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2649
                       datetime.timedelta(weeks=52),
 
 
2650
                       frozenset((token_month, token_end)))
 
 
2651
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2652
                       datetime.timedelta(weeks=1),
 
 
2653
                       frozenset((token_end, )))
 
 
2654
    token_duration = Token(re.compile(r"P"), None,
 
 
2655
                           frozenset((token_year, token_month,
 
 
2656
                                      token_day, token_time,
 
 
2658
    # Define starting values
 
 
2659
    value = datetime.timedelta() # Value so far
 
 
2661
    followers = frozenset((token_duration, )) # Following valid tokens
 
 
2662
    s = duration                # String left to parse
 
 
2663
    # Loop until end token is found
 
 
2664
    while found_token is not token_end:
 
 
2665
        # Search for any currently valid tokens
 
 
2666
        for token in followers:
 
 
2667
            match = token.regexp.match(s)
 
 
2668
            if match is not None:
 
 
2670
                if token.value is not None:
 
 
2671
                    # Value found, parse digits
 
 
2672
                    factor = int(match.group(1), 10)
 
 
2673
                    # Add to value so far
 
 
2674
                    value += factor * token.value
 
 
2675
                # Strip token from string
 
 
2676
                s = token.regexp.sub("", s, 1)
 
 
2679
                # Set valid next tokens
 
 
2680
                followers = found_token.followers
 
 
2683
            # No currently valid tokens were found
 
 
2684
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
1527
2690
def string_to_delta(interval):
 
1528
2691
    """Parse a string and return a datetime.timedelta
 
1530
 
    >>> string_to_delta(u'7d')
 
 
2693
    >>> string_to_delta('7d')
 
1531
2694
    datetime.timedelta(7)
 
1532
 
    >>> string_to_delta(u'60s')
 
 
2695
    >>> string_to_delta('60s')
 
1533
2696
    datetime.timedelta(0, 60)
 
1534
 
    >>> string_to_delta(u'60m')
 
 
2697
    >>> string_to_delta('60m')
 
1535
2698
    datetime.timedelta(0, 3600)
 
1536
 
    >>> string_to_delta(u'24h')
 
 
2699
    >>> string_to_delta('24h')
 
1537
2700
    datetime.timedelta(1)
 
1538
 
    >>> string_to_delta(u'1w')
 
 
2701
    >>> string_to_delta('1w')
 
1539
2702
    datetime.timedelta(7)
 
1540
 
    >>> string_to_delta(u'5m 30s')
 
 
2703
    >>> string_to_delta('5m 30s')
 
1541
2704
    datetime.timedelta(0, 330)
 
 
2708
        return rfc3339_duration_to_delta(interval)
 
1543
2712
    timevalue = datetime.timedelta(0)
 
1544
2713
    for s in interval.split():
 
1546
 
            suffix = unicode(s[-1])
 
1547
2716
            value = int(s[:-1])
 
1549
2718
                delta = datetime.timedelta(value)
 
1550
 
            elif suffix == u"s":
 
1551
2720
                delta = datetime.timedelta(0, value)
 
1552
 
            elif suffix == u"m":
 
1553
2722
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
1554
 
            elif suffix == u"h":
 
1555
2724
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
1556
 
            elif suffix == u"w":
 
1557
2726
                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)
 
 
2728
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
 
2729
        except IndexError as e:
 
 
2730
            raise ValueError(*(e.args))
 
1562
2731
        timevalue += delta
 
1563
2732
    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
2735
def daemon(nochdir = False, noclose = False):
 
1591
2736
    """See daemon(3).  Standard BSD Unix function.
 
 
1617
2762
    ##################################################################
 
1618
2763
    # 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]
 
 
2765
    parser = argparse.ArgumentParser()
 
 
2766
    parser.add_argument("-v", "--version", action="version",
 
 
2767
                        version = "%(prog)s {}".format(version),
 
 
2768
                        help="show version number and exit")
 
 
2769
    parser.add_argument("-i", "--interface", metavar="IF",
 
 
2770
                        help="Bind to interface IF")
 
 
2771
    parser.add_argument("-a", "--address",
 
 
2772
                        help="Address to listen for requests on")
 
 
2773
    parser.add_argument("-p", "--port", type=int,
 
 
2774
                        help="Port number to receive requests on")
 
 
2775
    parser.add_argument("--check", action="store_true",
 
 
2776
                        help="Run self-test")
 
 
2777
    parser.add_argument("--debug", action="store_true",
 
 
2778
                        help="Debug mode; run in foreground and log"
 
 
2779
                        " to terminal", default=None)
 
 
2780
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
 
2781
                        help="Debug level for stdout output")
 
 
2782
    parser.add_argument("--priority", help="GnuTLS"
 
 
2783
                        " priority string (see GnuTLS documentation)")
 
 
2784
    parser.add_argument("--servicename",
 
 
2785
                        metavar="NAME", help="Zeroconf service name")
 
 
2786
    parser.add_argument("--configdir",
 
 
2787
                        default="/etc/mandos", metavar="DIR",
 
 
2788
                        help="Directory to search for configuration"
 
 
2790
    parser.add_argument("--no-dbus", action="store_false",
 
 
2791
                        dest="use_dbus", help="Do not provide D-Bus"
 
 
2792
                        " system bus interface", default=None)
 
 
2793
    parser.add_argument("--no-ipv6", action="store_false",
 
 
2794
                        dest="use_ipv6", help="Do not use IPv6",
 
 
2796
    parser.add_argument("--no-restore", action="store_false",
 
 
2797
                        dest="restore", help="Do not restore stored"
 
 
2798
                        " state", default=None)
 
 
2799
    parser.add_argument("--socket", type=int,
 
 
2800
                        help="Specify a file descriptor to a network"
 
 
2801
                        " socket to use instead of creating one")
 
 
2802
    parser.add_argument("--statedir", metavar="DIR",
 
 
2803
                        help="Directory to save/restore state in")
 
 
2804
    parser.add_argument("--foreground", action="store_true",
 
 
2805
                        help="Run in foreground", default=None)
 
 
2806
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2807
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
2810
    options = parser.parse_args()
 
1649
2812
    if options.check:
 
 
2814
        fail_count, test_count = doctest.testmod()
 
 
2815
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1654
2817
    # 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",
 
 
2818
    server_defaults = { "interface": "",
 
 
2823
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2824
                        ":+SIGN-DSA-SHA256",
 
 
2825
                        "servicename": "Mandos",
 
 
2831
                        "statedir": "/var/lib/mandos",
 
 
2832
                        "foreground": "False",
 
1667
2836
    # Parse config file for server-global settings
 
1668
2837
    server_config = configparser.SafeConfigParser(server_defaults)
 
1669
2838
    del server_defaults
 
1670
 
    server_config.read(os.path.join(options.configdir,
 
 
2839
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1672
2840
    # Convert the SafeConfigParser object to a dict
 
1673
2841
    server_settings = server_config.defaults()
 
1674
2842
    # 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",
 
 
2843
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
2844
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1678
2846
    if server_settings["port"]:
 
1679
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
 
2847
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
2849
    if server_settings["socket"]:
 
 
2850
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
2852
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
2853
        # over with an opened os.devnull.  But we don't want this to
 
 
2854
        # happen with a supplied network socket.
 
 
2855
        if 0 <= server_settings["socket"] <= 2:
 
 
2856
            server_settings["socket"] = os.dup(server_settings
 
1681
2858
    del server_config
 
1683
2860
    # Override the settings from the config file with command line
 
1684
2861
    # 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"):
 
 
2862
    for option in ("interface", "address", "port", "debug",
 
 
2863
                   "priority", "servicename", "configdir", "use_dbus",
 
 
2864
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
2865
                   "socket", "foreground", "zeroconf"):
 
1688
2866
        value = getattr(options, option)
 
1689
2867
        if value is not None:
 
1690
2868
            server_settings[option] = value
 
1692
2870
    # Force all strings to be unicode
 
1693
2871
    for option in server_settings.keys():
 
1694
 
        if type(server_settings[option]) is str:
 
1695
 
            server_settings[option] = unicode(server_settings[option])
 
 
2872
        if isinstance(server_settings[option], bytes):
 
 
2873
            server_settings[option] = (server_settings[option]
 
 
2875
    # Force all boolean options to be boolean
 
 
2876
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
2877
                   "foreground", "zeroconf"):
 
 
2878
        server_settings[option] = bool(server_settings[option])
 
 
2879
    # Debug implies foreground
 
 
2880
    if server_settings["debug"]:
 
 
2881
        server_settings["foreground"] = True
 
1696
2882
    # Now we have our good server settings in "server_settings"
 
1698
2884
    ##################################################################
 
 
2886
    if (not server_settings["zeroconf"]
 
 
2887
        and not (server_settings["port"]
 
 
2888
                 or server_settings["socket"] != "")):
 
 
2889
        parser.error("Needs port or socket to work without Zeroconf")
 
1700
2891
    # 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"]))
 
 
2892
    debug = server_settings["debug"]
 
 
2893
    debuglevel = server_settings["debuglevel"]
 
 
2894
    use_dbus = server_settings["use_dbus"]
 
 
2895
    use_ipv6 = server_settings["use_ipv6"]
 
 
2896
    stored_state_path = os.path.join(server_settings["statedir"],
 
 
2898
    foreground = server_settings["foreground"]
 
 
2899
    zeroconf = server_settings["zeroconf"]
 
 
2902
        initlogger(debug, logging.DEBUG)
 
 
2907
            level = getattr(logging, debuglevel.upper())
 
 
2908
            initlogger(debug, level)
 
 
2910
    if server_settings["servicename"] != "Mandos":
 
 
2911
        syslogger.setFormatter(
 
 
2912
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
2913
                              ' %(levelname)s: %(message)s'.format(
 
 
2914
                                  server_settings["servicename"])))
 
1712
2916
    # 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"],
 
 
2917
    client_config = configparser.SafeConfigParser(Client
 
 
2919
    client_config.read(os.path.join(server_settings["configdir"],
 
1724
2922
    global mandos_dbus_service
 
1725
2923
    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)
 
 
2926
    if server_settings["socket"] != "":
 
 
2927
        socketfd = server_settings["socket"]
 
 
2928
    tcp_server = MandosServer(
 
 
2929
        (server_settings["address"], server_settings["port"]),
 
 
2931
        interface=(server_settings["interface"] or None),
 
 
2933
        gnutls_priority=server_settings["priority"],
 
 
2937
        pidfilename = "/run/mandos.pid"
 
 
2938
        if not os.path.isdir("/run/."):
 
 
2939
            pidfilename = "/var/run/mandos.pid"
 
 
2942
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
2943
        except IOError as e:
 
 
2944
            logger.error("Could not open file %r", pidfilename,
 
1742
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1743
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
 
2947
    for name, group in (("_mandos", "_mandos"),
 
 
2948
                        ("mandos", "mandos"),
 
 
2949
                        ("nobody", "nogroup")):
 
1746
 
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1747
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
 
2951
            uid = pwd.getpwnam(name).pw_uid
 
 
2952
            gid = pwd.getpwnam(group).pw_gid
 
1748
2954
        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:
 
 
2963
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
 
2965
    except OSError as error:
 
 
2966
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
2967
                       .format(uid, gid, os.strerror(error.errno)))
 
 
2968
        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)
 
 
2972
        # Enable all possible GnuTLS debugging
 
1774
2974
        # "Use a log level over 10 to enable all debugging options."
 
1775
2975
        # - GnuTLS manual
 
1776
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2976
        gnutls.global_set_log_level(11)
 
1778
 
        @gnutls.library.types.gnutls_log_func
 
1779
2979
        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))
 
 
2980
            logger.debug("GnuTLS: %s", string[:-1])
 
 
2982
        gnutls.global_set_log_function(debug_gnutls)
 
1785
2984
        # Redirect stdin so all checkers get /dev/null
 
1786
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
2985
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1787
2986
        os.dup2(null, sys.stdin.fileno())
 
1791
 
        # No console logging
 
1792
 
        logger.removeHandler(console)
 
 
2990
    # Need to fork before connecting to D-Bus
 
 
2992
        # Close all input and output, do double fork, etc.
 
 
2995
    # multiprocessing will use threads, so before we use GLib we need
 
 
2996
    # to inform GLib that threads will be used.
 
1795
2999
    global main_loop
 
1796
3000
    # From the Avahi example code
 
1797
 
    DBusGMainLoop(set_as_default=True )
 
1798
 
    main_loop = gobject.MainLoop()
 
 
3001
    DBusGMainLoop(set_as_default=True)
 
 
3002
    main_loop = GLib.MainLoop()
 
1799
3003
    bus = dbus.SystemBus()
 
1800
3004
    # 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")
 
 
3007
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
 
3010
            old_bus_name = dbus.service.BusName(
 
 
3011
                "se.bsnet.fukt.Mandos", bus,
 
 
3013
        except dbus.exceptions.DBusException as e:
 
 
3014
            logger.error("Disabling D-Bus:", exc_info=e)
 
1807
3015
            use_dbus = False
 
1808
 
            server_settings[u"use_dbus"] = False
 
 
3016
            server_settings["use_dbus"] = False
 
1809
3017
            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.
 
 
3019
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3020
        service = AvahiServiceToSyslog(
 
 
3021
            name = server_settings["servicename"],
 
 
3022
            servicetype = "_mandos._tcp",
 
 
3023
            protocol = protocol,
 
 
3025
        if server_settings["interface"]:
 
 
3026
            service.interface = if_nametoindex(
 
 
3027
                server_settings["interface"].encode("utf-8"))
 
1822
3029
    global multiprocessing_manager
 
1823
3030
    multiprocessing_manager = multiprocessing.Manager()
 
1825
3032
    client_class = Client
 
1827
3034
        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):
 
 
3036
    client_settings = Client.config_parser(client_config)
 
 
3037
    old_client_settings = {}
 
 
3040
    # This is used to redirect stdout and stderr for checker processes
 
 
3042
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3043
    # Only used if server is running in foreground but not in debug
 
 
3045
    if debug or not foreground:
 
 
3048
    # Get client data and settings from last running state.
 
 
3049
    if server_settings["restore"]:
 
 
3051
            with open(stored_state_path, "rb") as stored_state:
 
 
3052
                if sys.version_info.major == 2:                
 
 
3053
                    clients_data, old_client_settings = pickle.load(
 
 
3056
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3057
                        pickle.load(stored_state, encoding = "bytes"))
 
 
3058
                    ### Fix bytes to strings
 
 
3061
                    clients_data = { (key.decode("utf-8")
 
 
3062
                                      if isinstance(key, bytes)
 
 
3065
                                     bytes_clients_data.items() }
 
 
3066
                    del bytes_clients_data
 
 
3067
                    for key in clients_data:
 
 
3068
                        value = { (k.decode("utf-8")
 
 
3069
                                   if isinstance(k, bytes) else k): v
 
 
3071
                                  clients_data[key].items() }
 
 
3072
                        clients_data[key] = value
 
 
3074
                        value["client_structure"] = [
 
 
3076
                             if isinstance(s, bytes)
 
 
3078
                            value["client_structure"] ]
 
 
3080
                        for k in ("name", "host"):
 
 
3081
                            if isinstance(value[k], bytes):
 
 
3082
                                value[k] = value[k].decode("utf-8")
 
 
3083
                    ## old_client_settings
 
 
3085
                    old_client_settings = {
 
 
3086
                        (key.decode("utf-8")
 
 
3087
                         if isinstance(key, bytes)
 
 
3090
                        bytes_old_client_settings.items() }
 
 
3091
                    del bytes_old_client_settings
 
 
3093
                    for value in old_client_settings.values():
 
 
3094
                        if isinstance(value["host"], bytes):
 
 
3095
                            value["host"] = (value["host"]
 
 
3097
            os.remove(stored_state_path)
 
 
3098
        except IOError as e:
 
 
3099
            if e.errno == errno.ENOENT:
 
 
3100
                logger.warning("Could not load persistent state:"
 
 
3101
                               " {}".format(os.strerror(e.errno)))
 
 
3103
                logger.critical("Could not load persistent state:",
 
 
3106
        except EOFError as e:
 
 
3107
            logger.warning("Could not load persistent state: "
 
 
3111
    with PGPEngine() as pgp:
 
 
3112
        for client_name, client in clients_data.items():
 
 
3113
            # Skip removed clients
 
 
3114
            if client_name not in client_settings:
 
 
3117
            # Decide which value to use after restoring saved state.
 
 
3118
            # We have three different values: Old config file,
 
 
3119
            # new config file, and saved state.
 
 
3120
            # New config value takes precedence if it differs from old
 
 
3121
            # config value, otherwise use saved state.
 
 
3122
            for name, value in client_settings[client_name].items():
 
 
3124
                    # For each value in new config, check if it
 
 
3125
                    # differs from the old config value (Except for
 
 
3126
                    # the "secret" attribute)
 
 
3127
                    if (name != "secret"
 
 
3129
                             old_client_settings[client_name][name])):
 
 
3130
                        client[name] = value
 
 
3134
            # Clients who has passed its expire date can still be
 
 
3135
            # enabled if its last checker was successful.  A Client
 
 
3136
            # whose checker succeeded before we stored its state is
 
 
3137
            # assumed to have successfully run all checkers during
 
 
3139
            if client["enabled"]:
 
 
3140
                if datetime.datetime.utcnow() >= client["expires"]:
 
 
3141
                    if not client["last_checked_ok"]:
 
 
3143
                            "disabling client {} - Client never "
 
 
3144
                            "performed a successful checker".format(
 
 
3146
                        client["enabled"] = False
 
 
3147
                    elif client["last_checker_status"] != 0:
 
 
3149
                            "disabling client {} - Client last"
 
 
3150
                            " checker failed with error code"
 
 
3153
                                client["last_checker_status"]))
 
 
3154
                        client["enabled"] = False
 
 
3156
                        client["expires"] = (
 
 
3157
                            datetime.datetime.utcnow()
 
 
3158
                            + client["timeout"])
 
 
3159
                        logger.debug("Last checker succeeded,"
 
 
3160
                                     " 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()))
 
 
3163
                client["secret"] = pgp.decrypt(
 
 
3164
                    client["encrypted_secret"],
 
 
3165
                    client_settings[client_name]["secret"])
 
 
3167
                # If decryption fails, we use secret from new settings
 
 
3168
                logger.debug("Failed to decrypt {} old secret".format(
 
 
3170
                client["secret"] = (client_settings[client_name]
 
 
3173
    # Add/remove clients based on new changes made to config
 
 
3174
    for client_name in (set(old_client_settings)
 
 
3175
                        - set(client_settings)):
 
 
3176
        del clients_data[client_name]
 
 
3177
    for client_name in (set(client_settings)
 
 
3178
                        - set(old_client_settings)):
 
 
3179
        clients_data[client_name] = client_settings[client_name]
 
 
3181
    # Create all client objects
 
 
3182
    for client_name, client in clients_data.items():
 
 
3183
        tcp_server.clients[client_name] = client_class(
 
 
3186
            server_settings = server_settings)
 
1845
3188
    if not tcp_server.clients:
 
1846
 
        logger.warning(u"No clients defined")
 
 
3189
        logger.warning("No clients defined")
 
 
3192
        if pidfile is not None:
 
1850
3193
            pid = os.getpid()
 
1851
 
            pidfile.write(str(pid) + "\n")
 
 
3196
                    print(pid, file=pidfile)
 
 
3198
                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
3203
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
1864
3204
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
1867
 
        class MandosDBusService(dbus.service.Object):
 
 
3208
        @alternate_dbus_interfaces(
 
 
3209
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
 
3210
        class MandosDBusService(DBusObjectWithObjectManager):
 
1868
3211
            """A D-Bus proxy object"""
 
1869
3213
            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")
 
 
3214
                dbus.service.Object.__init__(self, bus, "/")
 
 
3216
            _interface = "se.recompile.Mandos"
 
 
3218
            @dbus.service.signal(_interface, signature="o")
 
1874
3219
            def ClientAdded(self, objpath):
 
1878
 
            @dbus.service.signal(_interface, signature=u"ss")
 
 
3223
            @dbus.service.signal(_interface, signature="ss")
 
1879
3224
            def ClientNotFound(self, fingerprint, address):
 
1883
 
            @dbus.service.signal(_interface, signature=u"os")
 
 
3228
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3230
            @dbus.service.signal(_interface, signature="os")
 
1884
3231
            def ClientRemoved(self, objpath, name):
 
1888
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
 
3235
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3237
            @dbus.service.method(_interface, out_signature="ao")
 
1889
3238
            def GetAllClients(self):
 
1891
 
                return dbus.Array(c.dbus_object_path
 
1892
 
                                  for c in tcp_server.clients)
 
 
3240
                return dbus.Array(c.dbus_object_path for c in
 
 
3241
                                  tcp_server.clients.values())
 
 
3243
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
1894
3245
            @dbus.service.method(_interface,
 
1895
 
                                 out_signature=u"a{oa{sv}}")
 
 
3246
                                 out_signature="a{oa{sv}}")
 
1896
3247
            def GetAllClientsWithProperties(self):
 
1898
3249
                return dbus.Dictionary(
 
1899
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1900
 
                     for c in tcp_server.clients),
 
1901
 
                    signature=u"oa{sv}")
 
 
3250
                    { c.dbus_object_path: c.GetAll(
 
 
3251
                        "se.recompile.Mandos.Client")
 
 
3252
                      for c in tcp_server.clients.values() },
 
1903
 
            @dbus.service.method(_interface, in_signature=u"o")
 
 
3255
            @dbus.service.method(_interface, in_signature="o")
 
1904
3256
            def RemoveClient(self, object_path):
 
1906
 
                for c in tcp_server.clients:
 
 
3258
                for c in tcp_server.clients.values():
 
1907
3259
                    if c.dbus_object_path == object_path:
 
1908
 
                        tcp_server.clients.remove(c)
 
 
3260
                        del tcp_server.clients[c.name]
 
1909
3261
                        c.remove_from_connection()
 
1910
 
                        # Don't signal anything except ClientRemoved
 
 
3262
                        # Don't signal the disabling
 
1911
3263
                        c.disable(quiet=True)
 
1913
 
                        self.ClientRemoved(object_path, c.name)
 
 
3264
                        # Emit D-Bus signal for removal
 
 
3265
                        self.client_removed_signal(c)
 
1915
3267
                raise KeyError(object_path)
 
 
3271
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3272
                                 out_signature = "a{oa{sa{sv}}}")
 
 
3273
            def GetManagedObjects(self):
 
 
3275
                return dbus.Dictionary(
 
 
3276
                    { client.dbus_object_path:
 
 
3278
                          { interface: client.GetAll(interface)
 
 
3280
                                 client._get_all_interface_names()})
 
 
3281
                      for client in tcp_server.clients.values()})
 
 
3283
            def client_added_signal(self, client):
 
 
3284
                """Send the new standard signal and the old signal"""
 
 
3286
                    # New standard signal
 
 
3287
                    self.InterfacesAdded(
 
 
3288
                        client.dbus_object_path,
 
 
3290
                            { interface: client.GetAll(interface)
 
 
3292
                              client._get_all_interface_names()}))
 
 
3294
                    self.ClientAdded(client.dbus_object_path)
 
 
3296
            def client_removed_signal(self, client):
 
 
3297
                """Send the new standard signal and the old signal"""
 
 
3299
                    # New standard signal
 
 
3300
                    self.InterfacesRemoved(
 
 
3301
                        client.dbus_object_path,
 
 
3302
                        client._get_all_interface_names())
 
 
3304
                    self.ClientRemoved(client.dbus_object_path,
 
1919
3307
        mandos_dbus_service = MandosDBusService()
 
1922
3310
        "Cleanup function; run on exit"
 
 
3314
        multiprocessing.active_children()
 
 
3316
        if not (tcp_server.clients or client_settings):
 
 
3319
        # Store client before exiting. Secrets are encrypted with key
 
 
3320
        # based on what config file has. If config file is
 
 
3321
        # removed/edited, old secret will thus be unrecovable.
 
 
3323
        with PGPEngine() as pgp:
 
 
3324
            for client in tcp_server.clients.values():
 
 
3325
                key = client_settings[client.name]["secret"]
 
 
3326
                client.encrypted_secret = pgp.encrypt(client.secret,
 
 
3330
                # A list of attributes that can not be pickled
 
 
3332
                exclude = { "bus", "changedstate", "secret",
 
 
3333
                            "checker", "server_settings" }
 
 
3334
                for name, typ in inspect.getmembers(dbus.service
 
 
3338
                client_dict["encrypted_secret"] = (client
 
 
3340
                for attr in client.client_structure:
 
 
3341
                    if attr not in exclude:
 
 
3342
                        client_dict[attr] = getattr(client, attr)
 
 
3344
                clients[client.name] = client_dict
 
 
3345
                del client_settings[client.name]["secret"]
 
 
3348
            with tempfile.NamedTemporaryFile(
 
 
3352
                    dir=os.path.dirname(stored_state_path),
 
 
3353
                    delete=False) as stored_state:
 
 
3354
                pickle.dump((clients, client_settings), stored_state,
 
 
3356
                tempname = stored_state.name
 
 
3357
            os.rename(tempname, stored_state_path)
 
 
3358
        except (IOError, OSError) as e:
 
 
3364
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3365
                logger.warning("Could not save persistent state: {}"
 
 
3366
                               .format(os.strerror(e.errno)))
 
 
3368
                logger.warning("Could not save persistent state:",
 
 
3372
        # Delete all clients, and settings from config
 
1925
3373
        while tcp_server.clients:
 
1926
 
            client = tcp_server.clients.pop()
 
 
3374
            name, client = tcp_server.clients.popitem()
 
1928
3376
                client.remove_from_connection()
 
1929
 
            client.disable_hook = None
 
1930
 
            # Don't signal anything except ClientRemoved
 
 
3377
            # Don't signal the disabling
 
1931
3378
            client.disable(quiet=True)
 
 
3379
            # Emit D-Bus signal for removal
 
1934
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
 
3381
                mandos_dbus_service.client_removed_signal(client)
 
 
3382
        client_settings.clear()
 
1937
3384
    atexit.register(cleanup)
 
1939
 
    for client in tcp_server.clients:
 
 
3386
    for client in tcp_server.clients.values():
 
1942
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3388
            # Emit D-Bus signal for adding
 
 
3389
            mandos_dbus_service.client_added_signal(client)
 
 
3390
        # Need to initiate checking of clients
 
 
3392
            client.init_checker()
 
1945
3394
    tcp_server.enable()
 
1946
3395
    tcp_server.server_activate()
 
1948
3397
    # Find out what port we got
 
1949
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3399
        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())
 
 
3401
        logger.info("Now listening on address %r, port %d,"
 
 
3402
                    " flowinfo %d, scope_id %d",
 
 
3403
                    *tcp_server.socket.getsockname())
 
1955
 
        logger.info(u"Now listening on address %r, port %d"
 
1956
 
                    % tcp_server.socket.getsockname())
 
 
3405
        logger.info("Now listening on address %r, port %d",
 
 
3406
                    *tcp_server.socket.getsockname())
 
1958
3408
    #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
 
1970
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
1971
 
                             lambda *args, **kwargs:
 
1972
 
                             (tcp_server.handle_request
 
1973
 
                              (*args[2:], **kwargs) or True))
 
1975
 
        logger.debug(u"Starting main loop")
 
 
3412
            # From the Avahi example code
 
 
3415
            except dbus.exceptions.DBusException as error:
 
 
3416
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3419
            # End of Avahi example code
 
 
3421
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
 
3422
                          lambda *args, **kwargs:
 
 
3423
                          (tcp_server.handle_request
 
 
3424
                           (*args[2:], **kwargs) or True))
 
 
3426
        logger.debug("Starting main loop")
 
1976
3427
        main_loop.run()
 
1977
 
    except AvahiError, error:
 
1978
 
        logger.critical(u"AvahiError: %s", error)
 
 
3428
    except AvahiError as error:
 
 
3429
        logger.critical("Avahi Error", exc_info=error)
 
1981
3432
    except KeyboardInterrupt:
 
1984
 
        logger.debug(u"Server received KeyboardInterrupt")
 
1985
 
    logger.debug(u"Server exiting")
 
 
3434
            print("", file=sys.stderr)
 
 
3435
        logger.debug("Server received KeyboardInterrupt")
 
 
3436
    logger.debug("Server exiting")
 
1986
3437
    # Must run before the D-Bus bus name gets deregistered
 
1989
3441
if __name__ == '__main__':