70
 
    import cPickle as pickle
 
 
63
import cPickle as pickle
 
73
64
import multiprocessing
 
82
67
import dbus.service
 
83
 
from gi.repository import GLib
 
84
70
from dbus.mainloop.glib import DBusGMainLoop
 
87
73
import xml.dom.minidom
 
90
 
# Try to find the value of SO_BINDTODEVICE:
 
92
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
93
 
    # newer, and it is also the most natural place for it:
 
94
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
95
78
except AttributeError:
 
97
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
99
80
        from IN import SO_BINDTODEVICE
 
100
81
    except ImportError:
 
101
 
        # In Python 2.7 it seems to have been removed entirely.
 
102
 
        # Try running the C preprocessor:
 
104
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
106
 
                                  stdin=subprocess.PIPE,
 
107
 
                                  stdout=subprocess.PIPE)
 
108
 
            stdout = cc.communicate(
 
109
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
110
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
111
 
        except (OSError, ValueError, IndexError):
 
113
 
            SO_BINDTODEVICE = None
 
115
 
if sys.version_info.major == 2:
 
119
 
stored_state_file = "clients.pickle"
 
121
 
logger = logging.getLogger()
 
125
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
126
 
        ctypes.util.find_library("c")).if_nametoindex
 
127
 
except (OSError, AttributeError):
 
129
 
    def if_nametoindex(interface):
 
130
 
        "Get an interface index the hard way, i.e. using fcntl()"
 
131
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
132
 
        with contextlib.closing(socket.socket()) as s:
 
133
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
134
 
                                struct.pack(b"16s16x", interface))
 
135
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
136
 
        return interface_index
 
139
 
def copy_function(func):
 
140
 
    """Make a copy of a function"""
 
141
 
    if sys.version_info.major == 2:
 
142
 
        return types.FunctionType(func.func_code,
 
148
 
        return types.FunctionType(func.__code__,
 
155
 
def initlogger(debug, level=logging.WARNING):
 
156
 
    """init logger and add loglevel"""
 
159
 
    syslogger = (logging.handlers.SysLogHandler(
 
160
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
162
 
    syslogger.setFormatter(logging.Formatter
 
163
 
                           ('Mandos [%(process)d]: %(levelname)s:'
 
165
 
    logger.addHandler(syslogger)
 
168
 
        console = logging.StreamHandler()
 
169
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
173
 
        logger.addHandler(console)
 
174
 
    logger.setLevel(level)
 
177
 
class PGPError(Exception):
 
178
 
    """Exception if encryption/decryption fails"""
 
182
 
class PGPEngine(object):
 
183
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
186
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
189
 
            output = subprocess.check_output(["gpgconf"])
 
190
 
            for line in output.splitlines():
 
191
 
                name, text, path = line.split(b":")
 
196
 
            if e.errno != errno.ENOENT:
 
198
 
        self.gnupgargs = ['--batch',
 
199
 
                          '--homedir', self.tempdir,
 
202
 
        # Only GPG version 1 has the --no-use-agent option.
 
203
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
204
 
            self.gnupgargs.append("--no-use-agent")
 
209
 
    def __exit__(self, exc_type, exc_value, traceback):
 
217
 
        if self.tempdir is not None:
 
218
 
            # Delete contents of tempdir
 
219
 
            for root, dirs, files in os.walk(self.tempdir,
 
221
 
                for filename in files:
 
222
 
                    os.remove(os.path.join(root, filename))
 
224
 
                    os.rmdir(os.path.join(root, dirname))
 
226
 
            os.rmdir(self.tempdir)
 
229
 
    def password_encode(self, password):
 
230
 
        # Passphrase can not be empty and can not contain newlines or
 
231
 
        # NUL bytes.  So we prefix it and hex encode it.
 
232
 
        encoded = b"mandos" + binascii.hexlify(password)
 
233
 
        if len(encoded) > 2048:
 
234
 
            # GnuPG can't handle long passwords, so encode differently
 
235
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
236
 
                       .replace(b"\n", b"\\n")
 
237
 
                       .replace(b"\0", b"\\x00"))
 
240
 
    def encrypt(self, data, password):
 
241
 
        passphrase = self.password_encode(password)
 
242
 
        with tempfile.NamedTemporaryFile(
 
243
 
                dir=self.tempdir) as passfile:
 
244
 
            passfile.write(passphrase)
 
246
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
250
 
                                    stdin=subprocess.PIPE,
 
251
 
                                    stdout=subprocess.PIPE,
 
252
 
                                    stderr=subprocess.PIPE)
 
253
 
            ciphertext, err = proc.communicate(input=data)
 
254
 
        if proc.returncode != 0:
 
258
 
    def decrypt(self, data, password):
 
259
 
        passphrase = self.password_encode(password)
 
260
 
        with tempfile.NamedTemporaryFile(
 
261
 
                dir=self.tempdir) as passfile:
 
262
 
            passfile.write(passphrase)
 
264
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
268
 
                                    stdin=subprocess.PIPE,
 
269
 
                                    stdout=subprocess.PIPE,
 
270
 
                                    stderr=subprocess.PIPE)
 
271
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
272
 
        if proc.returncode != 0:
 
274
 
        return decrypted_plaintext
 
277
 
# Pretend that we have an Avahi module
 
279
 
    """This isn't so much a class as it is a module-like namespace.
 
280
 
    It is instantiated once, and simulates having an Avahi module."""
 
281
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
282
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
283
 
    PROTO_INET = 0               # avahi-common/address.h
 
284
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
285
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
286
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
287
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
288
 
    DBUS_PATH_SERVER = "/"
 
290
 
    def string_array_to_txt_array(self, t):
 
291
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
292
 
                           for s in t), signature="ay")
 
293
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
294
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
295
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
296
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
297
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
298
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
299
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
300
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
 
82
        SO_BINDTODEVICE = None
 
 
87
#logger = logging.getLogger('mandos')
 
 
88
logger = logging.Logger('mandos')
 
 
89
syslogger = (logging.handlers.SysLogHandler
 
 
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
91
              address = str("/dev/log")))
 
 
92
syslogger.setFormatter(logging.Formatter
 
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
 
95
logger.addHandler(syslogger)
 
 
97
console = logging.StreamHandler()
 
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
 
101
logger.addHandler(console)
 
304
103
class AvahiError(Exception):
 
305
104
    def __init__(self, value, *args, **kwargs):
 
306
105
        self.value = value
 
307
 
        return super(AvahiError, self).__init__(value, *args,
 
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
107
    def __unicode__(self):
 
 
108
        return unicode(repr(self.value))
 
311
110
class AvahiServiceError(AvahiError):
 
315
113
class AvahiGroupError(AvahiError):
 
319
117
class AvahiService(object):
 
320
118
    """An Avahi (Zeroconf) service.
 
323
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
324
122
               Used to optionally bind to the specified interface.
 
325
123
    name: string; Example: 'Mandos'
 
326
124
    type: string; Example: '_mandos._tcp'.
 
327
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
 
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
328
126
    port: integer; what port to announce
 
329
127
    TXT: list of strings; TXT record for the service
 
330
128
    domain: string; Domain to publish on, default to .local if empty.
 
 
432
210
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
433
211
            logger.critical("Avahi: Error in group state changed %s",
 
435
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
 
213
            raise AvahiGroupError("State changed: %s"
 
437
215
    def cleanup(self):
 
438
216
        """Derived from the Avahi example code"""
 
439
217
        if self.group is not None:
 
442
 
            except (dbus.exceptions.UnknownMethodException,
 
443
 
                    dbus.exceptions.DBusException):
 
445
219
            self.group = None
 
448
 
    def server_state_changed(self, state, error=None):
 
 
220
    def server_state_changed(self, state):
 
449
221
        """Derived from the Avahi example code"""
 
450
222
        logger.debug("Avahi server state change: %i", state)
 
452
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
453
 
            avahi.SERVER_REGISTERING: None,
 
454
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
455
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
457
 
        if state in bad_states:
 
458
 
            if bad_states[state] is not None:
 
460
 
                    logger.error(bad_states[state])
 
462
 
                    logger.error(bad_states[state] + ": %r", error)
 
 
223
        if state == avahi.SERVER_COLLISION:
 
 
224
            logger.error("Zeroconf server name collision")
 
464
226
        elif state == avahi.SERVER_RUNNING:
 
467
 
            except dbus.exceptions.DBusException as error:
 
468
 
                if (error.get_dbus_name()
 
469
 
                    == "org.freedesktop.Avahi.CollisionError"):
 
470
 
                    logger.info("Local Zeroconf service name"
 
472
 
                    return self.rename(remove=False)
 
474
 
                    logger.critical("D-Bus Exception", exc_info=error)
 
479
 
                logger.debug("Unknown state: %r", state)
 
481
 
                logger.debug("Unknown state: %r: %r", state, error)
 
483
228
    def activate(self):
 
484
229
        """Derived from the Avahi example code"""
 
485
230
        if self.server is None:
 
486
231
            self.server = dbus.Interface(
 
487
232
                self.bus.get_object(avahi.DBUS_NAME,
 
488
 
                                    avahi.DBUS_PATH_SERVER,
 
489
 
                                    follow_name_owner_changes=True),
 
 
233
                                    avahi.DBUS_PATH_SERVER),
 
490
234
                avahi.DBUS_INTERFACE_SERVER)
 
491
235
        self.server.connect_to_signal("StateChanged",
 
492
 
                                      self.server_state_changed)
 
 
236
                                 self.server_state_changed)
 
493
237
        self.server_state_changed(self.server.GetState())
 
496
 
class AvahiServiceToSyslog(AvahiService):
 
497
 
    def rename(self, *args, **kwargs):
 
498
 
        """Add the new name to the syslog messages"""
 
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
500
 
        syslogger.setFormatter(logging.Formatter(
 
501
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
506
 
# Pretend that we have a GnuTLS module
 
507
 
class GnuTLS(object):
 
508
 
    """This isn't so much a class as it is a module-like namespace.
 
509
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
511
 
    library = ctypes.util.find_library("gnutls")
 
513
 
        library = ctypes.util.find_library("gnutls-deb0")
 
514
 
    _library = ctypes.cdll.LoadLibrary(library)
 
516
 
    _need_version = b"3.3.0"
 
519
 
        # Need to use "self" here, since this method is called before
 
520
 
        # the assignment to the "gnutls" global variable happens.
 
521
 
        if self.check_version(self._need_version) is None:
 
522
 
            raise self.Error("Needs GnuTLS {} or later"
 
523
 
                             .format(self._need_version))
 
525
 
    # Unless otherwise indicated, the constants and types below are
 
526
 
    # all from the gnutls/gnutls.h C header file.
 
536
 
    E_NO_CERTIFICATE_FOUND = -49
 
537
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
540
 
    class session_int(ctypes.Structure):
 
542
 
    session_t = ctypes.POINTER(session_int)
 
544
 
    class certificate_credentials_st(ctypes.Structure):
 
546
 
    certificate_credentials_t = ctypes.POINTER(
 
547
 
        certificate_credentials_st)
 
548
 
    certificate_type_t = ctypes.c_int
 
550
 
    class datum_t(ctypes.Structure):
 
551
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
552
 
                    ('size', ctypes.c_uint)]
 
554
 
    class openpgp_crt_int(ctypes.Structure):
 
556
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
557
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
558
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
559
 
    credentials_type_t = ctypes.c_int
 
560
 
    transport_ptr_t = ctypes.c_void_p
 
561
 
    close_request_t = ctypes.c_int
 
564
 
    class Error(Exception):
 
565
 
        # We need to use the class name "GnuTLS" here, since this
 
566
 
        # exception might be raised from within GnuTLS.__init__,
 
567
 
        # which is called before the assignment to the "gnutls"
 
568
 
        # global variable has happened.
 
569
 
        def __init__(self, message=None, code=None, args=()):
 
570
 
            # Default usage is by a message string, but if a return
 
571
 
            # code is passed, convert it to a string with
 
574
 
            if message is None and code is not None:
 
575
 
                message = GnuTLS.strerror(code)
 
576
 
            return super(GnuTLS.Error, self).__init__(
 
579
 
    class CertificateSecurityError(Error):
 
583
 
    class Credentials(object):
 
585
 
            self._c_object = gnutls.certificate_credentials_t()
 
586
 
            gnutls.certificate_allocate_credentials(
 
587
 
                ctypes.byref(self._c_object))
 
588
 
            self.type = gnutls.CRD_CERTIFICATE
 
591
 
            gnutls.certificate_free_credentials(self._c_object)
 
593
 
    class ClientSession(object):
 
594
 
        def __init__(self, socket, credentials=None):
 
595
 
            self._c_object = gnutls.session_t()
 
596
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
597
 
            gnutls.set_default_priority(self._c_object)
 
598
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
599
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
602
 
            if credentials is None:
 
603
 
                credentials = gnutls.Credentials()
 
604
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
605
 
                                   ctypes.cast(credentials._c_object,
 
607
 
            self.credentials = credentials
 
610
 
            gnutls.deinit(self._c_object)
 
613
 
            return gnutls.handshake(self._c_object)
 
615
 
        def send(self, data):
 
619
 
                data_len -= gnutls.record_send(self._c_object,
 
624
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
626
 
    # Error handling functions
 
627
 
    def _error_code(result):
 
628
 
        """A function to raise exceptions on errors, suitable
 
629
 
        for the 'restype' attribute on ctypes functions"""
 
632
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
633
 
            raise gnutls.CertificateSecurityError(code=result)
 
634
 
        raise gnutls.Error(code=result)
 
636
 
    def _retry_on_error(result, func, arguments):
 
637
 
        """A function to retry on some errors, suitable
 
638
 
        for the 'errcheck' attribute on ctypes functions"""
 
640
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
641
 
                return _error_code(result)
 
642
 
            result = func(*arguments)
 
645
 
    # Unless otherwise indicated, the function declarations below are
 
646
 
    # all from the gnutls/gnutls.h C header file.
 
649
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
650
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
651
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
652
 
    priority_set_direct.restype = _error_code
 
654
 
    init = _library.gnutls_init
 
655
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
656
 
    init.restype = _error_code
 
658
 
    set_default_priority = _library.gnutls_set_default_priority
 
659
 
    set_default_priority.argtypes = [session_t]
 
660
 
    set_default_priority.restype = _error_code
 
662
 
    record_send = _library.gnutls_record_send
 
663
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
665
 
    record_send.restype = ctypes.c_ssize_t
 
666
 
    record_send.errcheck = _retry_on_error
 
668
 
    certificate_allocate_credentials = (
 
669
 
        _library.gnutls_certificate_allocate_credentials)
 
670
 
    certificate_allocate_credentials.argtypes = [
 
671
 
        ctypes.POINTER(certificate_credentials_t)]
 
672
 
    certificate_allocate_credentials.restype = _error_code
 
674
 
    certificate_free_credentials = (
 
675
 
        _library.gnutls_certificate_free_credentials)
 
676
 
    certificate_free_credentials.argtypes = [
 
677
 
        certificate_credentials_t]
 
678
 
    certificate_free_credentials.restype = None
 
680
 
    handshake_set_private_extensions = (
 
681
 
        _library.gnutls_handshake_set_private_extensions)
 
682
 
    handshake_set_private_extensions.argtypes = [session_t,
 
684
 
    handshake_set_private_extensions.restype = None
 
686
 
    credentials_set = _library.gnutls_credentials_set
 
687
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
689
 
    credentials_set.restype = _error_code
 
691
 
    strerror = _library.gnutls_strerror
 
692
 
    strerror.argtypes = [ctypes.c_int]
 
693
 
    strerror.restype = ctypes.c_char_p
 
695
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
696
 
    certificate_type_get.argtypes = [session_t]
 
697
 
    certificate_type_get.restype = _error_code
 
699
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
700
 
    certificate_get_peers.argtypes = [session_t,
 
701
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
702
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
704
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
705
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
706
 
    global_set_log_level.restype = None
 
708
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
709
 
    global_set_log_function.argtypes = [log_func]
 
710
 
    global_set_log_function.restype = None
 
712
 
    deinit = _library.gnutls_deinit
 
713
 
    deinit.argtypes = [session_t]
 
714
 
    deinit.restype = None
 
716
 
    handshake = _library.gnutls_handshake
 
717
 
    handshake.argtypes = [session_t]
 
718
 
    handshake.restype = _error_code
 
719
 
    handshake.errcheck = _retry_on_error
 
721
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
722
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
723
 
    transport_set_ptr.restype = None
 
725
 
    bye = _library.gnutls_bye
 
726
 
    bye.argtypes = [session_t, close_request_t]
 
727
 
    bye.restype = _error_code
 
728
 
    bye.errcheck = _retry_on_error
 
730
 
    check_version = _library.gnutls_check_version
 
731
 
    check_version.argtypes = [ctypes.c_char_p]
 
732
 
    check_version.restype = ctypes.c_char_p
 
734
 
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
737
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
738
 
    openpgp_crt_init.restype = _error_code
 
740
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
741
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
742
 
                                   ctypes.POINTER(datum_t),
 
744
 
    openpgp_crt_import.restype = _error_code
 
746
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
747
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
748
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
749
 
    openpgp_crt_verify_self.restype = _error_code
 
751
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
752
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
753
 
    openpgp_crt_deinit.restype = None
 
755
 
    openpgp_crt_get_fingerprint = (
 
756
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
757
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
761
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
763
 
    # Remove non-public functions
 
764
 
    del _error_code, _retry_on_error
 
765
 
# Create the global "gnutls" object, simulating a module
 
769
 
def call_pipe(connection,       # : multiprocessing.Connection
 
770
 
              func, *args, **kwargs):
 
771
 
    """This function is meant to be called by multiprocessing.Process
 
773
 
    This function runs func(*args, **kwargs), and writes the resulting
 
774
 
    return value on the provided multiprocessing.Connection.
 
776
 
    connection.send(func(*args, **kwargs))
 
780
240
class Client(object):
 
781
241
    """A representation of a client host served by this server.
 
784
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
244
    _approved:   bool(); 'None' if not yet approved/disapproved
 
785
245
    approval_delay: datetime.timedelta(); Time to wait for approval
 
786
246
    approval_duration: datetime.timedelta(); Duration of one approval
 
787
247
    checker:    subprocess.Popen(); a running checker process used
 
788
248
                                    to see if the client lives.
 
789
249
                                    'None' if no process is running.
 
790
 
    checker_callback_tag: a GLib event source tag, or None
 
 
250
    checker_callback_tag: a gobject event source tag, or None
 
791
251
    checker_command: string; External command which is run to check
 
792
252
                     if client lives.  %() expansions are done at
 
793
253
                     runtime with vars(self) as dict, so that for
 
794
254
                     instance %(name)s can be used in the command.
 
795
 
    checker_initiator_tag: a GLib event source tag, or None
 
 
255
    checker_initiator_tag: a gobject event source tag, or None
 
796
256
    created:    datetime.datetime(); (UTC) object creation
 
797
 
    client_structure: Object describing what attributes a client has
 
798
 
                      and is used for storing the client at exit
 
799
257
    current_checker_command: string; current running checker_command
 
800
 
    disable_initiator_tag: a GLib event source tag, or None
 
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
 
 
259
    disable_initiator_tag: a gobject event source tag, or None
 
802
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
803
262
                 uniquely identify the client
 
 
805
264
    interval:   datetime.timedelta(); How often to start a new checker
 
806
265
    last_approval_request: datetime.datetime(); (UTC) or None
 
807
266
    last_checked_ok: datetime.datetime(); (UTC) or None
 
808
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
809
 
                         status of last checker. -1 reflects crashed
 
810
 
                         checker, -2 means no checker completed yet.
 
811
 
    last_checker_signal: The signal which killed the last checker, if
 
812
 
                         last_checker_status is -1
 
813
 
    last_enabled: datetime.datetime(); (UTC) or None
 
 
267
    last_enabled: datetime.datetime(); (UTC)
 
814
268
    name:       string; from the config file, used in log messages and
 
815
269
                        D-Bus identifiers
 
816
270
    secret:     bytestring; sent verbatim (over TLS) to client
 
817
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
818
272
                                      until this client is disabled
 
819
 
    extended_timeout:   extra long timeout when secret has been sent
 
820
273
    runtime_expansions: Allowed attributes for runtime expansion.
 
821
 
    expires:    datetime.datetime(); time (UTC) when a client will be
 
823
 
    server_settings: The server_settings dict from main()
 
826
276
    runtime_expansions = ("approval_delay", "approval_duration",
 
827
 
                          "created", "enabled", "expires",
 
828
 
                          "fingerprint", "host", "interval",
 
829
 
                          "last_approval_request", "last_checked_ok",
 
 
277
                          "created", "enabled", "fingerprint",
 
 
278
                          "host", "interval", "last_checked_ok",
 
830
279
                          "last_enabled", "name", "timeout")
 
833
 
        "extended_timeout": "PT15M",
 
835
 
        "checker": "fping -q -- %%(host)s",
 
837
 
        "approval_delay": "PT0S",
 
838
 
        "approval_duration": "PT1S",
 
839
 
        "approved_by_default": "True",
 
844
 
    def config_parser(config):
 
845
 
        """Construct a new dict of client settings of this form:
 
846
 
        { client_name: {setting_name: value, ...}, ...}
 
847
 
        with exceptions for any special settings as defined above.
 
848
 
        NOTE: Must be a pure function. Must return the same result
 
849
 
        value given the same arguments.
 
852
 
        for client_name in config.sections():
 
853
 
            section = dict(config.items(client_name))
 
854
 
            client = settings[client_name] = {}
 
856
 
            client["host"] = section["host"]
 
857
 
            # Reformat values from string types to Python types
 
858
 
            client["approved_by_default"] = config.getboolean(
 
859
 
                client_name, "approved_by_default")
 
860
 
            client["enabled"] = config.getboolean(client_name,
 
863
 
            # Uppercase and remove spaces from fingerprint for later
 
864
 
            # comparison purposes with return value from the
 
865
 
            # fingerprint() function
 
866
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
868
 
            if "secret" in section:
 
869
 
                client["secret"] = codecs.decode(section["secret"]
 
872
 
            elif "secfile" in section:
 
873
 
                with open(os.path.expanduser(os.path.expandvars
 
874
 
                                             (section["secfile"])),
 
876
 
                    client["secret"] = secfile.read()
 
878
 
                raise TypeError("No secret or secfile for section {}"
 
880
 
            client["timeout"] = string_to_delta(section["timeout"])
 
881
 
            client["extended_timeout"] = string_to_delta(
 
882
 
                section["extended_timeout"])
 
883
 
            client["interval"] = string_to_delta(section["interval"])
 
884
 
            client["approval_delay"] = string_to_delta(
 
885
 
                section["approval_delay"])
 
886
 
            client["approval_duration"] = string_to_delta(
 
887
 
                section["approval_duration"])
 
888
 
            client["checker_command"] = section["checker"]
 
889
 
            client["last_approval_request"] = None
 
890
 
            client["last_checked_ok"] = None
 
891
 
            client["last_checker_status"] = -2
 
895
 
    def __init__(self, settings, name=None, server_settings=None):
 
 
282
    def _timedelta_to_milliseconds(td):
 
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
 
285
                + (td.seconds * 1000)
 
 
286
                + (td.microseconds // 1000))
 
 
288
    def timeout_milliseconds(self):
 
 
289
        "Return the 'timeout' attribute in milliseconds"
 
 
290
        return self._timedelta_to_milliseconds(self.timeout)
 
 
292
    def interval_milliseconds(self):
 
 
293
        "Return the 'interval' attribute in milliseconds"
 
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
 
296
    def approval_delay_milliseconds(self):
 
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
 
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
 
 
300
        """Note: the 'checker' key in 'config' sets the
 
 
301
        'checker_command' attribute and *not* the 'checker'
 
897
 
        if server_settings is None:
 
899
 
        self.server_settings = server_settings
 
900
 
        # adding all client settings
 
901
 
        for setting, value in settings.items():
 
902
 
            setattr(self, setting, value)
 
905
 
            if not hasattr(self, "last_enabled"):
 
906
 
                self.last_enabled = datetime.datetime.utcnow()
 
907
 
            if not hasattr(self, "expires"):
 
908
 
                self.expires = (datetime.datetime.utcnow()
 
911
 
            self.last_enabled = None
 
914
306
        logger.debug("Creating client %r", self.name)
 
 
307
        # Uppercase and remove spaces from fingerprint for later
 
 
308
        # comparison purposes with return value from the fingerprint()
 
 
310
        self.fingerprint = (config["fingerprint"].upper()
 
915
312
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
916
 
        self.created = settings.get("created",
 
917
 
                                    datetime.datetime.utcnow())
 
919
 
        # attributes specific for this server instance
 
 
313
        if "secret" in config:
 
 
314
            self.secret = config["secret"].decode("base64")
 
 
315
        elif "secfile" in config:
 
 
316
            with open(os.path.expanduser(os.path.expandvars
 
 
317
                                         (config["secfile"])),
 
 
319
                self.secret = secfile.read()
 
 
321
            raise TypeError("No secret or secfile for client %s"
 
 
323
        self.host = config.get("host", "")
 
 
324
        self.created = datetime.datetime.utcnow()
 
 
326
        self.last_approval_request = None
 
 
327
        self.last_enabled = None
 
 
328
        self.last_checked_ok = None
 
 
329
        self.timeout = string_to_delta(config["timeout"])
 
 
330
        self.interval = string_to_delta(config["interval"])
 
 
331
        self.disable_hook = disable_hook
 
920
332
        self.checker = None
 
921
333
        self.checker_initiator_tag = None
 
922
334
        self.disable_initiator_tag = None
 
923
335
        self.checker_callback_tag = None
 
 
336
        self.checker_command = config["checker"]
 
924
337
        self.current_checker_command = None
 
 
338
        self.last_connect = None
 
 
339
        self._approved = None
 
 
340
        self.approved_by_default = config.get("approved_by_default",
 
926
342
        self.approvals_pending = 0
 
927
 
        self.changedstate = multiprocessing_manager.Condition(
 
928
 
            multiprocessing_manager.Lock())
 
929
 
        self.client_structure = [attr
 
930
 
                                 for attr in self.__dict__.keys()
 
931
 
                                 if not attr.startswith("_")]
 
932
 
        self.client_structure.append("client_structure")
 
934
 
        for name, t in inspect.getmembers(
 
935
 
                type(self), lambda obj: isinstance(obj, property)):
 
936
 
            if not name.startswith("_"):
 
937
 
                self.client_structure.append(name)
 
939
 
    # Send notice to process children that client state has changed
 
 
343
        self.approval_delay = string_to_delta(
 
 
344
            config["approval_delay"])
 
 
345
        self.approval_duration = string_to_delta(
 
 
346
            config["approval_duration"])
 
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
940
349
    def send_changedstate(self):
 
941
 
        with self.changedstate:
 
942
 
            self.changedstate.notify_all()
 
 
350
        self.changedstate.acquire()
 
 
351
        self.changedstate.notify_all()
 
 
352
        self.changedstate.release()
 
944
354
    def enable(self):
 
945
355
        """Start this client's checker and timeout hooks"""
 
946
356
        if getattr(self, "enabled", False):
 
947
357
            # Already enabled
 
949
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
 
359
        self.send_changedstate()
 
951
360
        self.last_enabled = datetime.datetime.utcnow()
 
953
 
        self.send_changedstate()
 
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
 
362
        # and every interval from then on.
 
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
 
364
                                      (self.interval_milliseconds(),
 
 
366
        # Schedule a disable() when 'timeout' has passed
 
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
 
368
                                   (self.timeout_milliseconds(),
 
 
371
        # Also start a new checker *right now*.
 
955
374
    def disable(self, quiet=True):
 
956
375
        """Disable this client."""
 
957
376
        if not getattr(self, "enabled", False):
 
 
379
            self.send_changedstate()
 
960
381
            logger.info("Disabling client %s", self.name)
 
961
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
962
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
382
        if getattr(self, "disable_initiator_tag", False):
 
 
383
            gobject.source_remove(self.disable_initiator_tag)
 
963
384
            self.disable_initiator_tag = None
 
965
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
966
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
385
        if getattr(self, "checker_initiator_tag", False):
 
 
386
            gobject.source_remove(self.checker_initiator_tag)
 
967
387
            self.checker_initiator_tag = None
 
968
388
        self.stop_checker()
 
 
389
        if self.disable_hook:
 
 
390
            self.disable_hook(self)
 
969
391
        self.enabled = False
 
971
 
            self.send_changedstate()
 
972
 
        # Do not run this again if called by a GLib.timeout_add
 
 
392
        # Do not run this again if called by a gobject.timeout_add
 
975
395
    def __del__(self):
 
 
396
        self.disable_hook = None
 
978
 
    def init_checker(self):
 
979
 
        # Schedule a new checker to be started an 'interval' from now,
 
980
 
        # and every interval from then on.
 
981
 
        if self.checker_initiator_tag is not None:
 
982
 
            GLib.source_remove(self.checker_initiator_tag)
 
983
 
        self.checker_initiator_tag = GLib.timeout_add(
 
984
 
            int(self.interval.total_seconds() * 1000),
 
986
 
        # Schedule a disable() when 'timeout' has passed
 
987
 
        if self.disable_initiator_tag is not None:
 
988
 
            GLib.source_remove(self.disable_initiator_tag)
 
989
 
        self.disable_initiator_tag = GLib.timeout_add(
 
990
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
991
 
        # Also start a new checker *right now*.
 
994
 
    def checker_callback(self, source, condition, connection,
 
 
399
    def checker_callback(self, pid, condition, command):
 
996
400
        """The checker has completed, so take appropriate actions."""
 
997
401
        self.checker_callback_tag = None
 
998
402
        self.checker = None
 
999
 
        # Read return code from connection (see call_pipe)
 
1000
 
        returncode = connection.recv()
 
1004
 
            self.last_checker_status = returncode
 
1005
 
            self.last_checker_signal = None
 
1006
 
            if self.last_checker_status == 0:
 
 
403
        if os.WIFEXITED(condition):
 
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
1007
406
                logger.info("Checker for %(name)s succeeded",
 
1009
408
                self.checked_ok()
 
1011
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
410
                logger.info("Checker for %(name)s failed",
 
1013
 
            self.last_checker_status = -1
 
1014
 
            self.last_checker_signal = -returncode
 
1015
413
            logger.warning("Checker for %(name)s crashed?",
 
1019
416
    def checked_ok(self):
 
1020
 
        """Assert that the client has been seen, alive and well."""
 
 
417
        """Bump up the timeout for this client.
 
 
419
        This should only be called when the client has been seen,
 
1021
422
        self.last_checked_ok = datetime.datetime.utcnow()
 
1022
 
        self.last_checker_status = 0
 
1023
 
        self.last_checker_signal = None
 
1026
 
    def bump_timeout(self, timeout=None):
 
1027
 
        """Bump up the timeout for this client."""
 
1029
 
            timeout = self.timeout
 
1030
 
        if self.disable_initiator_tag is not None:
 
1031
 
            GLib.source_remove(self.disable_initiator_tag)
 
1032
 
            self.disable_initiator_tag = None
 
1033
 
        if getattr(self, "enabled", False):
 
1034
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1035
 
                int(timeout.total_seconds() * 1000), self.disable)
 
1036
 
            self.expires = datetime.datetime.utcnow() + timeout
 
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
 
425
                                      (self.timeout_milliseconds(),
 
1038
428
    def need_approval(self):
 
1039
429
        self.last_approval_request = datetime.datetime.utcnow()
 
1041
431
    def start_checker(self):
 
1042
432
        """Start a new checker subprocess if one is not running.
 
1044
434
        If a checker already exists, leave it running and do
 
1046
436
        # The reason for not killing a running checker is that if we
 
1047
 
        # did that, and if a checker (for some reason) started running
 
1048
 
        # slowly and taking more than 'interval' time, then the client
 
1049
 
        # would inevitably timeout, since no checker would get a
 
1050
 
        # chance to run to completion.  If we instead leave running
 
 
437
        # did that, then if a checker (for some reason) started
 
 
438
        # running slowly and taking more than 'interval' time, the
 
 
439
        # client would inevitably timeout, since no checker would get
 
 
440
        # a chance to run to completion.  If we instead leave running
 
1051
441
        # checkers alone, the checker would have to take more time
 
1052
442
        # than 'timeout' for the client to be disabled, which is as it
 
1055
 
        if self.checker is not None and not self.checker.is_alive():
 
1056
 
            logger.warning("Checker was not alive; joining")
 
 
445
        # If a checker exists, make sure it is not a zombie
 
 
447
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
448
        except (AttributeError, OSError), error:
 
 
449
            if (isinstance(error, OSError)
 
 
450
                and error.errno != errno.ECHILD):
 
 
454
                logger.warning("Checker was a zombie")
 
 
455
                gobject.source_remove(self.checker_callback_tag)
 
 
456
                self.checker_callback(pid, status,
 
 
457
                                      self.current_checker_command)
 
1059
458
        # Start a new checker if needed
 
1060
459
        if self.checker is None:
 
1061
 
            # Escape attributes for the shell
 
1063
 
                attr: re.escape(str(getattr(self, attr)))
 
1064
 
                for attr in self.runtime_expansions}
 
1066
 
                command = self.checker_command % escaped_attrs
 
1067
 
            except TypeError as error:
 
1068
 
                logger.error('Could not format string "%s"',
 
1069
 
                             self.checker_command,
 
1071
 
                return True     # Try again later
 
 
461
                # In case checker_command has exactly one % operator
 
 
462
                command = self.checker_command % self.host
 
 
464
                # Escape attributes for the shell
 
 
465
                escaped_attrs = dict(
 
 
467
                     re.escape(unicode(str(getattr(self, attr, "")),
 
 
471
                    self.runtime_expansions)
 
 
474
                    command = self.checker_command % escaped_attrs
 
 
475
                except TypeError, error:
 
 
476
                    logger.error('Could not format string "%s":'
 
 
477
                                 ' %s', self.checker_command, error)
 
 
478
                    return True # Try again later
 
1072
479
            self.current_checker_command = command
 
1073
 
            logger.info("Starting checker %r for %s", command,
 
1075
 
            # We don't need to redirect stdout and stderr, since
 
1076
 
            # in normal mode, that is already done by daemon(),
 
1077
 
            # and in debug mode we don't want to.  (Stdin is
 
1078
 
            # always replaced by /dev/null.)
 
1079
 
            # The exception is when not debugging but nevertheless
 
1080
 
            # running in the foreground; use the previously
 
1082
 
            popen_args = {"close_fds": True,
 
1085
 
            if (not self.server_settings["debug"]
 
1086
 
                and self.server_settings["foreground"]):
 
1087
 
                popen_args.update({"stdout": wnull,
 
1089
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1090
 
            self.checker = multiprocessing.Process(
 
1092
 
                args=(pipe[1], subprocess.call, command),
 
1094
 
            self.checker.start()
 
1095
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1096
 
                pipe[0].fileno(), GLib.IO_IN,
 
1097
 
                self.checker_callback, pipe[0], command)
 
1098
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
481
                logger.info("Starting checker %r for %s",
 
 
483
                # We don't need to redirect stdout and stderr, since
 
 
484
                # in normal mode, that is already done by daemon(),
 
 
485
                # and in debug mode we don't want to.  (Stdin is
 
 
486
                # always replaced by /dev/null.)
 
 
487
                self.checker = subprocess.Popen(command,
 
 
490
                self.checker_callback_tag = (gobject.child_watch_add
 
 
492
                                              self.checker_callback,
 
 
494
                # The checker may have completed before the gobject
 
 
495
                # watch was added.  Check for this.
 
 
496
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
498
                    gobject.source_remove(self.checker_callback_tag)
 
 
499
                    self.checker_callback(pid, status, command)
 
 
500
            except OSError, error:
 
 
501
                logger.error("Failed to start subprocess: %s",
 
 
503
        # Re-run this periodically if run by gobject.timeout_add
 
1101
506
    def stop_checker(self):
 
1102
507
        """Force the checker process, if any, to stop."""
 
1103
508
        if self.checker_callback_tag:
 
1104
 
            GLib.source_remove(self.checker_callback_tag)
 
 
509
            gobject.source_remove(self.checker_callback_tag)
 
1105
510
            self.checker_callback_tag = None
 
1106
511
        if getattr(self, "checker", None) is None:
 
1108
513
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1109
 
        self.checker.terminate()
 
 
515
            os.kill(self.checker.pid, signal.SIGTERM)
 
 
517
            #if self.checker.poll() is None:
 
 
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
 
519
        except OSError, error:
 
 
520
            if error.errno != errno.ESRCH: # No such process
 
1110
522
        self.checker = None
 
1113
 
def dbus_service_property(dbus_interface,
 
 
524
def dbus_service_property(dbus_interface, signature="v",
 
 
525
                          access="readwrite", byte_arrays=False):
 
1117
526
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1118
527
    become properties on the D-Bus.
 
1120
529
    The decorated method will be called with no arguments by "Get"
 
1121
530
    and with one argument by "Set".
 
1123
532
    The parameters, where they are supported, are the same as
 
1124
533
    dbus.service.method, except there is only "signature", since the
 
1125
534
    type from Get() and the type sent to Set() is the same.
 
 
1208
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1209
 
    """A D-Bus object with annotations.
 
1211
 
    Classes inheriting from this can use the dbus_annotations
 
1212
 
    decorator to add annotations to methods or signals.
 
1216
 
    def _is_dbus_thing(thing):
 
1217
 
        """Returns a function testing if an attribute is a D-Bus thing
 
1219
 
        If called like _is_dbus_thing("method") it returns a function
 
1220
 
        suitable for use as predicate to inspect.getmembers().
 
1222
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1225
 
    def _get_all_dbus_things(self, thing):
 
1226
 
        """Returns a generator of (name, attribute) pairs
 
1228
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
1229
 
                 athing.__get__(self))
 
1230
 
                for cls in self.__class__.__mro__
 
1232
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1234
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1236
 
                         path_keyword='object_path',
 
1237
 
                         connection_keyword='connection')
 
1238
 
    def Introspect(self, object_path, connection):
 
1239
 
        """Overloading of standard D-Bus method.
 
1241
 
        Inserts annotation tags on methods and signals.
 
1243
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1246
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1248
 
            for if_tag in document.getElementsByTagName("interface"):
 
1249
 
                # Add annotation tags
 
1250
 
                for typ in ("method", "signal"):
 
1251
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1253
 
                        for name, prop in (self.
 
1254
 
                                           _get_all_dbus_things(typ)):
 
1255
 
                            if (name == tag.getAttribute("name")
 
1256
 
                                and prop._dbus_interface
 
1257
 
                                == if_tag.getAttribute("name")):
 
1258
 
                                annots.update(getattr(
 
1259
 
                                    prop, "_dbus_annotations", {}))
 
1260
 
                        for name, value in annots.items():
 
1261
 
                            ann_tag = document.createElement(
 
1263
 
                            ann_tag.setAttribute("name", name)
 
1264
 
                            ann_tag.setAttribute("value", value)
 
1265
 
                            tag.appendChild(ann_tag)
 
1266
 
                # Add interface annotation tags
 
1267
 
                for annotation, value in dict(
 
1268
 
                    itertools.chain.from_iterable(
 
1269
 
                        annotations().items()
 
1270
 
                        for name, annotations
 
1271
 
                        in self._get_all_dbus_things("interface")
 
1272
 
                        if name == if_tag.getAttribute("name")
 
1274
 
                    ann_tag = document.createElement("annotation")
 
1275
 
                    ann_tag.setAttribute("name", annotation)
 
1276
 
                    ann_tag.setAttribute("value", value)
 
1277
 
                    if_tag.appendChild(ann_tag)
 
1278
 
                # Fix argument name for the Introspect method itself
 
1279
 
                if (if_tag.getAttribute("name")
 
1280
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1281
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1282
 
                        if cn.getAttribute("name") == "Introspect":
 
1283
 
                            for arg in cn.getElementsByTagName("arg"):
 
1284
 
                                if (arg.getAttribute("direction")
 
1286
 
                                    arg.setAttribute("name",
 
1288
 
            xmlstring = document.toxml("utf-8")
 
1290
 
        except (AttributeError, xml.dom.DOMException,
 
1291
 
                xml.parsers.expat.ExpatError) as error:
 
1292
 
            logger.error("Failed to override Introspection method",
 
1297
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
573
class DBusObjectWithProperties(dbus.service.Object):
 
1298
574
    """A D-Bus object with properties.
 
1300
576
    Classes inheriting from this can use the dbus_service_property
 
1301
577
    decorator to expose methods as D-Bus properties.  It exposes the
 
1302
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
582
    def _is_dbus_property(obj):
 
 
583
        return getattr(obj, "_dbus_is_property", False)
 
 
585
    def _get_all_dbus_properties(self):
 
 
586
        """Returns a generator of (name, attribute) pairs
 
 
588
        return ((prop._dbus_name, prop)
 
 
590
                inspect.getmembers(self, self._is_dbus_property))
 
1305
592
    def _get_dbus_property(self, interface_name, property_name):
 
1306
593
        """Returns a bound method if one exists which is a D-Bus
 
1307
594
        property with the specified name and interface.
 
1309
 
        for cls in self.__class__.__mro__:
 
1310
 
            for name, value in inspect.getmembers(
 
1311
 
                    cls, self._is_dbus_thing("property")):
 
1312
 
                if (value._dbus_name == property_name
 
1313
 
                    and value._dbus_interface == interface_name):
 
1314
 
                    return value.__get__(self)
 
 
596
        for name in (property_name,
 
 
597
                     property_name + "_dbus_property"):
 
 
598
            prop = getattr(self, name, None)
 
 
600
                or not self._is_dbus_property(prop)
 
 
601
                or prop._dbus_name != property_name
 
 
602
                or (interface_name and prop._dbus_interface
 
 
603
                    and interface_name != prop._dbus_interface)):
 
1316
606
        # No such property
 
1317
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1318
 
            self.dbus_object_path, interface_name, property_name))
 
1321
 
    def _get_all_interface_names(cls):
 
1322
 
        """Get a sequence of all interfaces supported by an object"""
 
1323
 
        return (name for name in set(getattr(getattr(x, attr),
 
1324
 
                                             "_dbus_interface", None)
 
1325
 
                                     for x in (inspect.getmro(cls))
 
1327
 
                if name is not None)
 
1329
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
608
                                   + interface_name + "."
 
 
611
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1331
612
                         out_signature="v")
 
1332
613
    def Get(self, interface_name, property_name):
 
1333
614
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1456
704
            xmlstring = document.toxml("utf-8")
 
1457
705
            document.unlink()
 
1458
706
        except (AttributeError, xml.dom.DOMException,
 
1459
 
                xml.parsers.expat.ExpatError) as error:
 
1460
 
            logger.error("Failed to override Introspection method",
 
1466
 
    dbus.OBJECT_MANAGER_IFACE
 
1467
 
except AttributeError:
 
1468
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1471
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1472
 
    """A D-Bus object with an ObjectManager.
 
1474
 
    Classes inheriting from this exposes the standard
 
1475
 
    GetManagedObjects call and the InterfacesAdded and
 
1476
 
    InterfacesRemoved signals on the standard
 
1477
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1479
 
    Note: No signals are sent automatically; they must be sent
 
1482
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1483
 
                         out_signature="a{oa{sa{sv}}}")
 
1484
 
    def GetManagedObjects(self):
 
1485
 
        """This function must be overridden"""
 
1486
 
        raise NotImplementedError()
 
1488
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1489
 
                         signature="oa{sa{sv}}")
 
1490
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1493
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1494
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1497
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1499
 
                         path_keyword='object_path',
 
1500
 
                         connection_keyword='connection')
 
1501
 
    def Introspect(self, object_path, connection):
 
1502
 
        """Overloading of standard D-Bus method.
 
1504
 
        Override return argument name of GetManagedObjects to be
 
1505
 
        "objpath_interfaces_and_properties"
 
1507
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1511
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1513
 
            for if_tag in document.getElementsByTagName("interface"):
 
1514
 
                # Fix argument name for the GetManagedObjects method
 
1515
 
                if (if_tag.getAttribute("name")
 
1516
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1517
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1518
 
                        if (cn.getAttribute("name")
 
1519
 
                            == "GetManagedObjects"):
 
1520
 
                            for arg in cn.getElementsByTagName("arg"):
 
1521
 
                                if (arg.getAttribute("direction")
 
1525
 
                                        "objpath_interfaces"
 
1527
 
            xmlstring = document.toxml("utf-8")
 
1529
 
        except (AttributeError, xml.dom.DOMException,
 
1530
 
                xml.parsers.expat.ExpatError) as error:
 
1531
 
            logger.error("Failed to override Introspection method",
 
1536
 
def datetime_to_dbus(dt, variant_level=0):
 
1537
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1539
 
        return dbus.String("", variant_level=variant_level)
 
1540
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1543
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1544
 
    """A class decorator; applied to a subclass of
 
1545
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1546
 
    interface names according to the "alt_interface_names" mapping.
 
1549
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1550
 
                                    "net.example.AlternateInterface"})
 
1551
 
    class SampleDBusObject(dbus.service.Object):
 
1552
 
        @dbus.service.method("org.example.Interface")
 
1553
 
        def SampleDBusMethod():
 
1556
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1557
 
    reachable via two interfaces: "org.example.Interface" and
 
1558
 
    "net.example.AlternateInterface", the latter of which will have
 
1559
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1560
 
    "true", unless "deprecate" is passed with a False value.
 
1562
 
    This works for methods and signals, and also for D-Bus properties
 
1563
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1564
 
    dbus_interface_annotations decorator).
 
1568
 
        for orig_interface_name, alt_interface_name in (
 
1569
 
                alt_interface_names.items()):
 
1571
 
            interface_names = set()
 
1572
 
            # Go though all attributes of the class
 
1573
 
            for attrname, attribute in inspect.getmembers(cls):
 
1574
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1575
 
                # with the wrong interface name
 
1576
 
                if (not hasattr(attribute, "_dbus_interface")
 
1577
 
                    or not attribute._dbus_interface.startswith(
 
1578
 
                        orig_interface_name)):
 
1580
 
                # Create an alternate D-Bus interface name based on
 
1582
 
                alt_interface = attribute._dbus_interface.replace(
 
1583
 
                    orig_interface_name, alt_interface_name)
 
1584
 
                interface_names.add(alt_interface)
 
1585
 
                # Is this a D-Bus signal?
 
1586
 
                if getattr(attribute, "_dbus_is_signal", False):
 
1587
 
                    # Extract the original non-method undecorated
 
1588
 
                    # function by black magic
 
1589
 
                    if sys.version_info.major == 2:
 
1590
 
                        nonmethod_func = (dict(
 
1591
 
                            zip(attribute.func_code.co_freevars,
 
1592
 
                                attribute.__closure__))
 
1593
 
                                          ["func"].cell_contents)
 
1595
 
                        nonmethod_func = (dict(
 
1596
 
                            zip(attribute.__code__.co_freevars,
 
1597
 
                                attribute.__closure__))
 
1598
 
                                          ["func"].cell_contents)
 
1599
 
                    # Create a new, but exactly alike, function
 
1600
 
                    # object, and decorate it to be a new D-Bus signal
 
1601
 
                    # with the alternate D-Bus interface name
 
1602
 
                    new_function = copy_function(nonmethod_func)
 
1603
 
                    new_function = (dbus.service.signal(
 
1605
 
                        attribute._dbus_signature)(new_function))
 
1606
 
                    # Copy annotations, if any
 
1608
 
                        new_function._dbus_annotations = dict(
 
1609
 
                            attribute._dbus_annotations)
 
1610
 
                    except AttributeError:
 
1613
 
                    # Define a creator of a function to call both the
 
1614
 
                    # original and alternate functions, so both the
 
1615
 
                    # original and alternate signals gets sent when
 
1616
 
                    # the function is called
 
1617
 
                    def fixscope(func1, func2):
 
1618
 
                        """This function is a scope container to pass
 
1619
 
                        func1 and func2 to the "call_both" function
 
1620
 
                        outside of its arguments"""
 
1622
 
                        @functools.wraps(func2)
 
1623
 
                        def call_both(*args, **kwargs):
 
1624
 
                            """This function will emit two D-Bus
 
1625
 
                            signals by calling func1 and func2"""
 
1626
 
                            func1(*args, **kwargs)
 
1627
 
                            func2(*args, **kwargs)
 
1628
 
                        # Make wrapper function look like a D-Bus
 
1630
 
                        for name, attr in inspect.getmembers(func2):
 
1631
 
                            if name.startswith("_dbus_"):
 
1632
 
                                setattr(call_both, name, attr)
 
1635
 
                    # Create the "call_both" function and add it to
 
1637
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1638
 
                # Is this a D-Bus method?
 
1639
 
                elif getattr(attribute, "_dbus_is_method", False):
 
1640
 
                    # Create a new, but exactly alike, function
 
1641
 
                    # object.  Decorate it to be a new D-Bus method
 
1642
 
                    # with the alternate D-Bus interface name.  Add it
 
1645
 
                        dbus.service.method(
 
1647
 
                            attribute._dbus_in_signature,
 
1648
 
                            attribute._dbus_out_signature)
 
1649
 
                        (copy_function(attribute)))
 
1650
 
                    # Copy annotations, if any
 
1652
 
                        attr[attrname]._dbus_annotations = dict(
 
1653
 
                            attribute._dbus_annotations)
 
1654
 
                    except AttributeError:
 
1656
 
                # Is this a D-Bus property?
 
1657
 
                elif getattr(attribute, "_dbus_is_property", False):
 
1658
 
                    # Create a new, but exactly alike, function
 
1659
 
                    # object, and decorate it to be a new D-Bus
 
1660
 
                    # property with the alternate D-Bus interface
 
1661
 
                    # name.  Add it to the class.
 
1662
 
                    attr[attrname] = (dbus_service_property(
 
1663
 
                        alt_interface, attribute._dbus_signature,
 
1664
 
                        attribute._dbus_access,
 
1665
 
                        attribute._dbus_get_args_options
 
1667
 
                                      (copy_function(attribute)))
 
1668
 
                    # Copy annotations, if any
 
1670
 
                        attr[attrname]._dbus_annotations = dict(
 
1671
 
                            attribute._dbus_annotations)
 
1672
 
                    except AttributeError:
 
1674
 
                # Is this a D-Bus interface?
 
1675
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1676
 
                    # Create a new, but exactly alike, function
 
1677
 
                    # object.  Decorate it to be a new D-Bus interface
 
1678
 
                    # with the alternate D-Bus interface name.  Add it
 
1681
 
                        dbus_interface_annotations(alt_interface)
 
1682
 
                        (copy_function(attribute)))
 
1684
 
                # Deprecate all alternate interfaces
 
1685
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1686
 
                for interface_name in interface_names:
 
1688
 
                    @dbus_interface_annotations(interface_name)
 
1690
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1692
 
                    # Find an unused name
 
1693
 
                    for aname in (iname.format(i)
 
1694
 
                                  for i in itertools.count()):
 
1695
 
                        if aname not in attr:
 
1699
 
                # Replace the class with a new subclass of it with
 
1700
 
                # methods, signals, etc. as created above.
 
1701
 
                if sys.version_info.major == 2:
 
1702
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1705
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1712
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1713
 
                            "se.bsnet.fukt.Mandos"})
 
 
707
                xml.parsers.expat.ExpatError), error:
 
 
708
            logger.error("Failed to override Introspection method",
 
1714
713
class ClientDBus(Client, DBusObjectWithProperties):
 
1715
714
    """A Client class using D-Bus
 
1718
717
    dbus_object_path: dbus.ObjectPath
 
1719
718
    bus: dbus.SystemBus()
 
1722
721
    runtime_expansions = (Client.runtime_expansions
 
1723
 
                          + ("dbus_object_path", ))
 
1725
 
    _interface = "se.recompile.Mandos.Client"
 
 
722
                          + ("dbus_object_path",))
 
1727
724
    # dbus.service.Object doesn't use super(), so we can't either.
 
1729
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
726
    def __init__(self, bus = None, *args, **kwargs):
 
 
727
        self._approvals_pending = 0
 
1731
729
        Client.__init__(self, *args, **kwargs)
 
1732
730
        # Only now, when this client is initialized, can it show up on
 
1734
 
        client_object_name = str(self.name).translate(
 
 
732
        client_object_name = unicode(self.name).translate(
 
1735
733
            {ord("."): ord("_"),
 
1736
734
             ord("-"): ord("_")})
 
1737
 
        self.dbus_object_path = dbus.ObjectPath(
 
1738
 
            "/clients/" + client_object_name)
 
 
735
        self.dbus_object_path = (dbus.ObjectPath
 
 
736
                                 ("/clients/" + client_object_name))
 
1739
737
        DBusObjectWithProperties.__init__(self, self.bus,
 
1740
738
                                          self.dbus_object_path)
 
1742
 
    def notifychangeproperty(transform_func, dbus_name,
 
1743
 
                             type_func=lambda x: x,
 
1745
 
                             invalidate_only=False,
 
1746
 
                             _interface=_interface):
 
1747
 
        """ Modify a variable so that it's a property which announces
 
1748
 
        its changes to DBus.
 
1750
 
        transform_fun: Function that takes a value and a variant_level
 
1751
 
                       and transforms it to a D-Bus type.
 
1752
 
        dbus_name: D-Bus name of the variable
 
1753
 
        type_func: Function that transform the value before sending it
 
1754
 
                   to the D-Bus.  Default: no transform
 
1755
 
        variant_level: D-Bus variant level.  Default: 1
 
1757
 
        attrname = "_{}".format(dbus_name)
 
1759
 
        def setter(self, value):
 
1760
 
            if hasattr(self, "dbus_object_path"):
 
1761
 
                if (not hasattr(self, attrname) or
 
1762
 
                    type_func(getattr(self, attrname, None))
 
1763
 
                    != type_func(value)):
 
1765
 
                        self.PropertiesChanged(
 
1766
 
                            _interface, dbus.Dictionary(),
 
1767
 
                            dbus.Array((dbus_name, )))
 
1769
 
                        dbus_value = transform_func(
 
1771
 
                            variant_level=variant_level)
 
1772
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1774
 
                        self.PropertiesChanged(
 
1776
 
                            dbus.Dictionary({dbus.String(dbus_name):
 
1779
 
            setattr(self, attrname, value)
 
1781
 
        return property(lambda self: getattr(self, attrname), setter)
 
1783
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1784
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1787
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1788
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1790
 
    checker = notifychangeproperty(
 
1791
 
        dbus.Boolean, "CheckerRunning",
 
1792
 
        type_func=lambda checker: checker is not None)
 
1793
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1795
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1796
 
                                               "LastCheckerStatus")
 
1797
 
    last_approval_request = notifychangeproperty(
 
1798
 
        datetime_to_dbus, "LastApprovalRequest")
 
1799
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1800
 
                                               "ApprovedByDefault")
 
1801
 
    approval_delay = notifychangeproperty(
 
1802
 
        dbus.UInt64, "ApprovalDelay",
 
1803
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1804
 
    approval_duration = notifychangeproperty(
 
1805
 
        dbus.UInt64, "ApprovalDuration",
 
1806
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1807
 
    host = notifychangeproperty(dbus.String, "Host")
 
1808
 
    timeout = notifychangeproperty(
 
1809
 
        dbus.UInt64, "Timeout",
 
1810
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1811
 
    extended_timeout = notifychangeproperty(
 
1812
 
        dbus.UInt64, "ExtendedTimeout",
 
1813
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1814
 
    interval = notifychangeproperty(
 
1815
 
        dbus.UInt64, "Interval",
 
1816
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1817
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1818
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1819
 
                                  invalidate_only=True)
 
1821
 
    del notifychangeproperty
 
 
740
    def _get_approvals_pending(self):
 
 
741
        return self._approvals_pending
 
 
742
    def _set_approvals_pending(self, value):
 
 
743
        old_value = self._approvals_pending
 
 
744
        self._approvals_pending = value
 
 
746
        if (hasattr(self, "dbus_object_path")
 
 
747
            and bval is not bool(old_value)):
 
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
 
752
    approvals_pending = property(_get_approvals_pending,
 
 
753
                                 _set_approvals_pending)
 
 
754
    del _get_approvals_pending, _set_approvals_pending
 
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
759
        return dbus.String(dt.isoformat(),
 
 
760
                           variant_level=variant_level)
 
 
763
        oldstate = getattr(self, "enabled", False)
 
 
764
        r = Client.enable(self)
 
 
765
        if oldstate != self.enabled:
 
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
 
768
                                 dbus.Boolean(True, variant_level=1))
 
 
769
            self.PropertyChanged(
 
 
770
                dbus.String("LastEnabled"),
 
 
771
                self._datetime_to_dbus(self.last_enabled,
 
 
775
    def disable(self, quiet = False):
 
 
776
        oldstate = getattr(self, "enabled", False)
 
 
777
        r = Client.disable(self, quiet=quiet)
 
 
778
        if not quiet and oldstate != self.enabled:
 
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
 
781
                                 dbus.Boolean(False, variant_level=1))
 
1823
784
    def __del__(self, *args, **kwargs):
 
1825
786
            self.remove_from_connection()
 
 
2305
1289
                        delay -= time2 - time
 
2308
 
                    session.send(client.secret)
 
2309
 
                except gnutls.Error as error:
 
2310
 
                    logger.warning("gnutls send failed",
 
 
1292
                while sent_size < len(client.secret):
 
 
1294
                        sent = session.send(client.secret[sent_size:])
 
 
1295
                    except (gnutls.errors.GNUTLSError), error:
 
 
1296
                        logger.warning("gnutls send failed")
 
 
1298
                    logger.debug("Sent: %d, remaining: %d",
 
 
1299
                                 sent, len(client.secret)
 
 
1300
                                 - (sent_size + sent))
 
2314
1303
                logger.info("Sending secret to %s", client.name)
 
2315
 
                # bump the timeout using extended_timeout
 
2316
 
                client.bump_timeout(client.extended_timeout)
 
 
1304
                # bump the timeout as if seen
 
2317
1306
                if self.server.use_dbus:
 
2318
1307
                    # Emit D-Bus signal
 
2319
1308
                    client.GotSecret()
 
2322
1311
                if approval_required:
 
2323
1312
                    client.approvals_pending -= 1
 
2326
 
                except gnutls.Error as error:
 
2327
 
                    logger.warning("GnuTLS bye failed",
 
 
1315
                except (gnutls.errors.GNUTLSError), error:
 
 
1316
                    logger.warning("GnuTLS bye failed")
 
2331
1319
    def peer_certificate(session):
 
2332
1320
        "Return the peer's OpenPGP certificate as a bytestring"
 
2333
1321
        # If not an OpenPGP certificate...
 
2334
 
        if (gnutls.certificate_type_get(session._c_object)
 
2335
 
            != gnutls.CRT_OPENPGP):
 
2336
 
            # ...return invalid data
 
 
1322
        if (gnutls.library.functions
 
 
1323
            .gnutls_certificate_type_get(session._c_object)
 
 
1324
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1325
            # ...do the normal thing
 
 
1326
            return session.peer_certificate
 
2338
1327
        list_size = ctypes.c_uint(1)
 
2339
 
        cert_list = (gnutls.certificate_get_peers
 
 
1328
        cert_list = (gnutls.library.functions
 
 
1329
                     .gnutls_certificate_get_peers
 
2340
1330
                     (session._c_object, ctypes.byref(list_size)))
 
2341
1331
        if not bool(cert_list) and list_size.value != 0:
 
2342
 
            raise gnutls.Error("error getting peer certificate")
 
 
1332
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2343
1334
        if list_size.value == 0:
 
2345
1336
        cert = cert_list[0]
 
2346
1337
        return ctypes.string_at(cert.data, cert.size)
 
2349
1340
    def fingerprint(openpgp):
 
2350
1341
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2351
1342
        # New GnuTLS "datum" with the OpenPGP public key
 
2352
 
        datum = gnutls.datum_t(
 
2353
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2354
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2355
 
            ctypes.c_uint(len(openpgp)))
 
 
1343
        datum = (gnutls.library.types
 
 
1344
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1347
                                 ctypes.c_uint(len(openpgp))))
 
2356
1348
        # New empty GnuTLS certificate
 
2357
 
        crt = gnutls.openpgp_crt_t()
 
2358
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1349
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1350
        (gnutls.library.functions
 
 
1351
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2359
1352
        # Import the OpenPGP public key into the certificate
 
2360
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2361
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1353
        (gnutls.library.functions
 
 
1354
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1355
                                    gnutls.library.constants
 
 
1356
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2362
1357
        # Verify the self signature in the key
 
2363
1358
        crtverify = ctypes.c_uint()
 
2364
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2365
 
                                       ctypes.byref(crtverify))
 
 
1359
        (gnutls.library.functions
 
 
1360
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1361
                                         ctypes.byref(crtverify)))
 
2366
1362
        if crtverify.value != 0:
 
2367
 
            gnutls.openpgp_crt_deinit(crt)
 
2368
 
            raise gnutls.CertificateSecurityError(code
 
 
1363
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1364
            raise (gnutls.errors.CertificateSecurityError
 
2370
1366
        # New buffer for the fingerprint
 
2371
1367
        buf = ctypes.create_string_buffer(20)
 
2372
1368
        buf_len = ctypes.c_size_t()
 
2373
1369
        # Get the fingerprint from the certificate into the buffer
 
2374
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2375
 
                                           ctypes.byref(buf_len))
 
 
1370
        (gnutls.library.functions
 
 
1371
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1372
                                             ctypes.byref(buf_len)))
 
2376
1373
        # Deinit the certificate
 
2377
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1374
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2378
1375
        # Convert the buffer to a Python bytestring
 
2379
1376
        fpr = ctypes.string_at(buf, buf_len.value)
 
2380
1377
        # Convert the bytestring to hexadecimal notation
 
2381
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
 
1378
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
2385
1382
class MultiprocessingMixIn(object):
 
2386
1383
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2388
1384
    def sub_process_main(self, request, address):
 
2390
1386
            self.finish_request(request, address)
 
2392
1388
            self.handle_error(request, address)
 
2393
1389
        self.close_request(request)
 
2395
1391
    def process_request(self, request, address):
 
2396
1392
        """Start a new process to process the request."""
 
2397
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2398
 
                                       args=(request, address))
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
 
1394
                                args = (request, address)).start()
 
2403
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2404
1397
    """ adds a pipe to the MixIn """
 
2406
1398
    def process_request(self, request, client_address):
 
2407
1399
        """Overrides and wraps the original process_request().
 
2409
1401
        This function creates a new pipe in self.pipe
 
2411
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2413
 
        proc = MultiprocessingMixIn.process_request(self, request,
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
 
1406
              self).process_request(request, client_address)
 
2415
1407
        self.child_pipe.close()
 
2416
 
        self.add_pipe(parent_pipe, proc)
 
 
1408
        self.add_pipe(parent_pipe)
 
2418
 
    def add_pipe(self, parent_pipe, proc):
 
 
1410
    def add_pipe(self, parent_pipe):
 
2419
1411
        """Dummy function; override as necessary"""
 
2420
 
        raise NotImplementedError()
 
 
1412
        raise NotImplementedError
 
2423
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2424
1415
                     socketserver.TCPServer, object):
 
2425
1416
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2428
1419
        enabled:        Boolean; whether this server is activated yet
 
2429
1420
        interface:      None or a network interface name (string)
 
2430
1421
        use_ipv6:       Boolean; to use IPv6 or not
 
2433
1423
    def __init__(self, server_address, RequestHandlerClass,
 
2437
 
        """If socketfd is set, use that file descriptor instead of
 
2438
 
        creating a new one with socket.socket().
 
 
1424
                 interface=None, use_ipv6=True):
 
2440
1425
        self.interface = interface
 
2442
1427
            self.address_family = socket.AF_INET6
 
2443
 
        if socketfd is not None:
 
2444
 
            # Save the file descriptor
 
2445
 
            self.socketfd = socketfd
 
2446
 
            # Save the original socket.socket() function
 
2447
 
            self.socket_socket = socket.socket
 
2449
 
            # To implement --socket, we monkey patch socket.socket.
 
2451
 
            # (When socketserver.TCPServer is a new-style class, we
 
2452
 
            # could make self.socket into a property instead of monkey
 
2453
 
            # patching socket.socket.)
 
2455
 
            # Create a one-time-only replacement for socket.socket()
 
2456
 
            @functools.wraps(socket.socket)
 
2457
 
            def socket_wrapper(*args, **kwargs):
 
2458
 
                # Restore original function so subsequent calls are
 
2460
 
                socket.socket = self.socket_socket
 
2461
 
                del self.socket_socket
 
2462
 
                # This time only, return a new socket object from the
 
2463
 
                # saved file descriptor.
 
2464
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2465
 
            # Replace socket.socket() function with wrapper
 
2466
 
            socket.socket = socket_wrapper
 
2467
 
        # The socketserver.TCPServer.__init__ will call
 
2468
 
        # socket.socket(), which might be our replacement,
 
2469
 
        # socket_wrapper(), if socketfd was set.
 
2470
1428
        socketserver.TCPServer.__init__(self, server_address,
 
2471
1429
                                        RequestHandlerClass)
 
2473
1430
    def server_bind(self):
 
2474
1431
        """This overrides the normal server_bind() function
 
2475
1432
        to bind to an interface if one was specified, and also NOT to
 
2476
1433
        bind to an address or port if they were not specified."""
 
2477
 
        global SO_BINDTODEVICE
 
2478
1434
        if self.interface is not None:
 
2479
1435
            if SO_BINDTODEVICE is None:
 
2480
 
                # Fall back to a hard-coded value which seems to be
 
2482
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2483
 
                SO_BINDTODEVICE = 25
 
2485
 
                self.socket.setsockopt(
 
2486
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2487
 
                    (self.interface + "\0").encode("utf-8"))
 
2488
 
            except socket.error as error:
 
2489
 
                if error.errno == errno.EPERM:
 
2490
 
                    logger.error("No permission to bind to"
 
2491
 
                                 " interface %s", self.interface)
 
2492
 
                elif error.errno == errno.ENOPROTOOPT:
 
2493
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2494
 
                                 " cannot bind to interface %s",
 
2496
 
                elif error.errno == errno.ENODEV:
 
2497
 
                    logger.error("Interface %s does not exist,"
 
2498
 
                                 " cannot bind", self.interface)
 
 
1436
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1437
                             " cannot bind to interface %s",
 
 
1441
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1445
                except socket.error, error:
 
 
1446
                    if error[0] == errno.EPERM:
 
 
1447
                        logger.error("No permission to"
 
 
1448
                                     " bind to interface %s",
 
 
1450
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1451
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1452
                                     " cannot bind to interface %s",
 
2501
1456
        # Only bind(2) the socket if we really need to.
 
2502
1457
        if self.server_address[0] or self.server_address[1]:
 
2503
1458
            if not self.server_address[0]:
 
2504
1459
                if self.address_family == socket.AF_INET6:
 
2505
 
                    any_address = "::"  # in6addr_any
 
 
1460
                    any_address = "::" # in6addr_any
 
2507
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1462
                    any_address = socket.INADDR_ANY
 
2508
1463
                self.server_address = (any_address,
 
2509
1464
                                       self.server_address[1])
 
2510
1465
            elif not self.server_address[1]:
 
2511
 
                self.server_address = (self.server_address[0], 0)
 
 
1466
                self.server_address = (self.server_address[0],
 
2512
1468
#                 if self.interface:
 
2513
1469
#                     self.server_address = (self.server_address[0],
 
 
2835
1701
    parser.add_argument("--no-dbus", action="store_false",
 
2836
1702
                        dest="use_dbus", help="Do not provide D-Bus"
 
2837
 
                        " system bus interface", default=None)
 
 
1703
                        " system bus interface")
 
2838
1704
    parser.add_argument("--no-ipv6", action="store_false",
 
2839
 
                        dest="use_ipv6", help="Do not use IPv6",
 
2841
 
    parser.add_argument("--no-restore", action="store_false",
 
2842
 
                        dest="restore", help="Do not restore stored"
 
2843
 
                        " state", default=None)
 
2844
 
    parser.add_argument("--socket", type=int,
 
2845
 
                        help="Specify a file descriptor to a network"
 
2846
 
                        " socket to use instead of creating one")
 
2847
 
    parser.add_argument("--statedir", metavar="DIR",
 
2848
 
                        help="Directory to save/restore state in")
 
2849
 
    parser.add_argument("--foreground", action="store_true",
 
2850
 
                        help="Run in foreground", default=None)
 
2851
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2852
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
1705
                        dest="use_ipv6", help="Do not use IPv6")
 
2855
1706
    options = parser.parse_args()
 
2857
1708
    if options.check:
 
2859
 
        fail_count, test_count = doctest.testmod()
 
2860
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2862
1713
    # Default values for config file for server-global settings
 
2863
 
    server_defaults = {"interface": "",
 
2868
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2869
 
                       ":+SIGN-DSA-SHA256",
 
2870
 
                       "servicename": "Mandos",
 
2876
 
                       "statedir": "/var/lib/mandos",
 
2877
 
                       "foreground": "False",
 
 
1714
    server_defaults = { "interface": "",
 
 
1719
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1720
                        "servicename": "Mandos",
 
2881
1726
    # Parse config file for server-global settings
 
2882
1727
    server_config = configparser.SafeConfigParser(server_defaults)
 
2883
1728
    del server_defaults
 
2884
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
1729
    server_config.read(os.path.join(options.configdir,
 
2885
1731
    # Convert the SafeConfigParser object to a dict
 
2886
1732
    server_settings = server_config.defaults()
 
2887
1733
    # Use the appropriate methods on the non-string config options
 
2888
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2889
 
                   "foreground", "zeroconf"):
 
 
1734
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2890
1735
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2892
1737
    if server_settings["port"]:
 
2893
1738
        server_settings["port"] = server_config.getint("DEFAULT",
 
2895
 
    if server_settings["socket"]:
 
2896
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2898
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2899
 
        # over with an opened os.devnull.  But we don't want this to
 
2900
 
        # happen with a supplied network socket.
 
2901
 
        if 0 <= server_settings["socket"] <= 2:
 
2902
 
            server_settings["socket"] = os.dup(server_settings
 
2904
1740
    del server_config
 
2906
1742
    # Override the settings from the config file with command line
 
2907
1743
    # options, if set.
 
2908
1744
    for option in ("interface", "address", "port", "debug",
 
2909
 
                   "priority", "servicename", "configdir", "use_dbus",
 
2910
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2911
 
                   "socket", "foreground", "zeroconf"):
 
 
1745
                   "priority", "servicename", "configdir",
 
 
1746
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2912
1747
        value = getattr(options, option)
 
2913
1748
        if value is not None:
 
2914
1749
            server_settings[option] = value
 
2916
1751
    # Force all strings to be unicode
 
2917
1752
    for option in server_settings.keys():
 
2918
 
        if isinstance(server_settings[option], bytes):
 
2919
 
            server_settings[option] = (server_settings[option]
 
2921
 
    # Force all boolean options to be boolean
 
2922
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2923
 
                   "foreground", "zeroconf"):
 
2924
 
        server_settings[option] = bool(server_settings[option])
 
2925
 
    # Debug implies foreground
 
2926
 
    if server_settings["debug"]:
 
2927
 
        server_settings["foreground"] = True
 
 
1753
        if type(server_settings[option]) is str:
 
 
1754
            server_settings[option] = unicode(server_settings[option])
 
2928
1755
    # Now we have our good server settings in "server_settings"
 
2930
1757
    ##################################################################
 
2932
 
    if (not server_settings["zeroconf"]
 
2933
 
        and not (server_settings["port"]
 
2934
 
                 or server_settings["socket"] != "")):
 
2935
 
        parser.error("Needs port or socket to work without Zeroconf")
 
2937
1759
    # For convenience
 
2938
1760
    debug = server_settings["debug"]
 
2939
1761
    debuglevel = server_settings["debuglevel"]
 
2940
1762
    use_dbus = server_settings["use_dbus"]
 
2941
1763
    use_ipv6 = server_settings["use_ipv6"]
 
2942
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
2944
 
    foreground = server_settings["foreground"]
 
2945
 
    zeroconf = server_settings["zeroconf"]
 
2948
 
        initlogger(debug, logging.DEBUG)
 
2953
 
            level = getattr(logging, debuglevel.upper())
 
2954
 
            initlogger(debug, level)
 
2956
1765
    if server_settings["servicename"] != "Mandos":
 
2957
 
        syslogger.setFormatter(
 
2958
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2959
 
                              ' %(levelname)s: %(message)s'.format(
 
2960
 
                                  server_settings["servicename"])))
 
 
1766
        syslogger.setFormatter(logging.Formatter
 
 
1767
                               ('Mandos (%s) [%%(process)d]:'
 
 
1768
                                ' %%(levelname)s: %%(message)s'
 
 
1769
                                % server_settings["servicename"]))
 
2962
1771
    # Parse config file with clients
 
2963
 
    client_config = configparser.SafeConfigParser(Client
 
 
1772
    client_defaults = { "timeout": "1h",
 
 
1774
                        "checker": "fping -q -- %%(host)s",
 
 
1776
                        "approval_delay": "0s",
 
 
1777
                        "approval_duration": "1s",
 
 
1779
    client_config = configparser.SafeConfigParser(client_defaults)
 
2965
1780
    client_config.read(os.path.join(server_settings["configdir"],
 
2966
1781
                                    "clients.conf"))
 
2968
1783
    global mandos_dbus_service
 
2969
1784
    mandos_dbus_service = None
 
2972
 
    if server_settings["socket"] != "":
 
2973
 
        socketfd = server_settings["socket"]
 
2974
 
    tcp_server = MandosServer(
 
2975
 
        (server_settings["address"], server_settings["port"]),
 
2977
 
        interface=(server_settings["interface"] or None),
 
2979
 
        gnutls_priority=server_settings["priority"],
 
2983
 
        pidfilename = "/run/mandos.pid"
 
2984
 
        if not os.path.isdir("/run/."):
 
2985
 
            pidfilename = "/var/run/mandos.pid"
 
2988
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2989
 
        except IOError as e:
 
2990
 
            logger.error("Could not open file %r", pidfilename,
 
2993
 
    for name, group in (("_mandos", "_mandos"),
 
2994
 
                        ("mandos", "mandos"),
 
2995
 
                        ("nobody", "nogroup")):
 
2997
 
            uid = pwd.getpwnam(name).pw_uid
 
2998
 
            gid = pwd.getpwnam(group).pw_gid
 
 
1786
    tcp_server = MandosServer((server_settings["address"],
 
 
1787
                               server_settings["port"]),
 
 
1789
                              interface=(server_settings["interface"]
 
 
1793
                              server_settings["priority"],
 
 
1796
        pidfilename = "/var/run/mandos.pid"
 
 
1798
            pidfile = open(pidfilename, "w")
 
 
1800
            logger.error("Could not open file %r", pidfilename)
 
 
1803
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
1804
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
1807
            uid = pwd.getpwnam("mandos").pw_uid
 
 
1808
            gid = pwd.getpwnam("mandos").pw_gid
 
3000
1809
        except KeyError:
 
 
1811
                uid = pwd.getpwnam("nobody").pw_uid
 
 
1812
                gid = pwd.getpwnam("nobody").pw_gid
 
3009
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3011
 
    except OSError as error:
 
3012
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3013
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3014
 
        if error.errno != errno.EPERM:
 
 
1819
    except OSError, error:
 
 
1820
        if error[0] != errno.EPERM:
 
 
1823
    if not debug and not debuglevel:
 
 
1824
        syslogger.setLevel(logging.WARNING)
 
 
1825
        console.setLevel(logging.WARNING)
 
 
1827
        level = getattr(logging, debuglevel.upper())
 
 
1828
        syslogger.setLevel(level)
 
 
1829
        console.setLevel(level)
 
3018
1832
        # Enable all possible GnuTLS debugging
 
3020
1834
        # "Use a log level over 10 to enable all debugging options."
 
3021
1835
        # - GnuTLS manual
 
3022
 
        gnutls.global_set_log_level(11)
 
 
1836
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
1838
        @gnutls.library.types.gnutls_log_func
 
3025
1839
        def debug_gnutls(level, string):
 
3026
1840
            logger.debug("GnuTLS: %s", string[:-1])
 
3028
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
1842
        (gnutls.library.functions
 
 
1843
         .gnutls_global_set_log_function(debug_gnutls))
 
3030
1845
        # Redirect stdin so all checkers get /dev/null
 
3031
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1846
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
3032
1847
        os.dup2(null, sys.stdin.fileno())
 
 
1851
        # No console logging
 
 
1852
        logger.removeHandler(console)
 
3036
1854
    # Need to fork before connecting to D-Bus
 
3038
1856
        # Close all input and output, do double fork, etc.
 
3041
 
    # multiprocessing will use threads, so before we use GLib we need
 
3042
 
    # to inform GLib that threads will be used.
 
3045
1859
    global main_loop
 
3046
1860
    # From the Avahi example code
 
3047
 
    DBusGMainLoop(set_as_default=True)
 
3048
 
    main_loop = GLib.MainLoop()
 
 
1861
    DBusGMainLoop(set_as_default=True )
 
 
1862
    main_loop = gobject.MainLoop()
 
3049
1863
    bus = dbus.SystemBus()
 
3050
1864
    # End of Avahi example code
 
3053
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3056
 
            old_bus_name = dbus.service.BusName(
 
3057
 
                "se.bsnet.fukt.Mandos", bus,
 
3059
 
        except dbus.exceptions.DBusException as e:
 
3060
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
1867
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
 
1868
                                            bus, do_not_queue=True)
 
 
1869
        except dbus.exceptions.NameExistsException, e:
 
 
1870
            logger.error(unicode(e) + ", disabling D-Bus")
 
3061
1871
            use_dbus = False
 
3062
1872
            server_settings["use_dbus"] = False
 
3063
1873
            tcp_server.use_dbus = False
 
3065
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3066
 
        service = AvahiServiceToSyslog(
 
3067
 
            name=server_settings["servicename"],
 
3068
 
            servicetype="_mandos._tcp",
 
3071
 
        if server_settings["interface"]:
 
3072
 
            service.interface = if_nametoindex(
 
3073
 
                server_settings["interface"].encode("utf-8"))
 
 
1874
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
1875
    service = AvahiService(name = server_settings["servicename"],
 
 
1876
                           servicetype = "_mandos._tcp",
 
 
1877
                           protocol = protocol, bus = bus)
 
 
1878
    if server_settings["interface"]:
 
 
1879
        service.interface = (if_nametoindex
 
 
1880
                             (str(server_settings["interface"])))
 
3075
1882
    global multiprocessing_manager
 
3076
1883
    multiprocessing_manager = multiprocessing.Manager()
 
3078
1885
    client_class = Client
 
3080
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
3082
 
    client_settings = Client.config_parser(client_config)
 
3083
 
    old_client_settings = {}
 
3086
 
    # This is used to redirect stdout and stderr for checker processes
 
3088
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3089
 
    # Only used if server is running in foreground but not in debug
 
3091
 
    if debug or not foreground:
 
3094
 
    # Get client data and settings from last running state.
 
3095
 
    if server_settings["restore"]:
 
3097
 
            with open(stored_state_path, "rb") as stored_state:
 
3098
 
                if sys.version_info.major == 2:
 
3099
 
                    clients_data, old_client_settings = pickle.load(
 
3102
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3103
 
                        pickle.load(stored_state, encoding="bytes"))
 
3104
 
                    #   Fix bytes to strings
 
3107
 
                    clients_data = {(key.decode("utf-8")
 
3108
 
                                     if isinstance(key, bytes)
 
3111
 
                                    bytes_clients_data.items()}
 
3112
 
                    del bytes_clients_data
 
3113
 
                    for key in clients_data:
 
3114
 
                        value = {(k.decode("utf-8")
 
3115
 
                                  if isinstance(k, bytes) else k): v
 
3117
 
                                 clients_data[key].items()}
 
3118
 
                        clients_data[key] = value
 
3120
 
                        value["client_structure"] = [
 
3122
 
                             if isinstance(s, bytes)
 
3124
 
                            value["client_structure"]]
 
3126
 
                        for k in ("name", "host"):
 
3127
 
                            if isinstance(value[k], bytes):
 
3128
 
                                value[k] = value[k].decode("utf-8")
 
3129
 
                    #  old_client_settings
 
3131
 
                    old_client_settings = {
 
3132
 
                        (key.decode("utf-8")
 
3133
 
                         if isinstance(key, bytes)
 
3136
 
                        bytes_old_client_settings.items()}
 
3137
 
                    del bytes_old_client_settings
 
3139
 
                    for value in old_client_settings.values():
 
3140
 
                        if isinstance(value["host"], bytes):
 
3141
 
                            value["host"] = (value["host"]
 
3143
 
            os.remove(stored_state_path)
 
3144
 
        except IOError as e:
 
3145
 
            if e.errno == errno.ENOENT:
 
3146
 
                logger.warning("Could not load persistent state:"
 
3147
 
                               " {}".format(os.strerror(e.errno)))
 
3149
 
                logger.critical("Could not load persistent state:",
 
3152
 
        except EOFError as e:
 
3153
 
            logger.warning("Could not load persistent state: "
 
3157
 
    with PGPEngine() as pgp:
 
3158
 
        for client_name, client in clients_data.items():
 
3159
 
            # Skip removed clients
 
3160
 
            if client_name not in client_settings:
 
3163
 
            # Decide which value to use after restoring saved state.
 
3164
 
            # We have three different values: Old config file,
 
3165
 
            # new config file, and saved state.
 
3166
 
            # New config value takes precedence if it differs from old
 
3167
 
            # config value, otherwise use saved state.
 
3168
 
            for name, value in client_settings[client_name].items():
 
3170
 
                    # For each value in new config, check if it
 
3171
 
                    # differs from the old config value (Except for
 
3172
 
                    # the "secret" attribute)
 
3173
 
                    if (name != "secret"
 
3175
 
                             old_client_settings[client_name][name])):
 
3176
 
                        client[name] = value
 
3180
 
            # Clients who has passed its expire date can still be
 
3181
 
            # enabled if its last checker was successful.  A Client
 
3182
 
            # whose checker succeeded before we stored its state is
 
3183
 
            # assumed to have successfully run all checkers during
 
3185
 
            if client["enabled"]:
 
3186
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
3187
 
                    if not client["last_checked_ok"]:
 
3189
 
                            "disabling client {} - Client never "
 
3190
 
                            "performed a successful checker".format(
 
3192
 
                        client["enabled"] = False
 
3193
 
                    elif client["last_checker_status"] != 0:
 
3195
 
                            "disabling client {} - Client last"
 
3196
 
                            " checker failed with error code"
 
3199
 
                                client["last_checker_status"]))
 
3200
 
                        client["enabled"] = False
 
3202
 
                        client["expires"] = (
 
3203
 
                            datetime.datetime.utcnow()
 
3204
 
                            + client["timeout"])
 
3205
 
                        logger.debug("Last checker succeeded,"
 
3206
 
                                     " keeping {} enabled".format(
 
 
1887
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
1888
    def client_config_items(config, section):
 
 
1889
        special_settings = {
 
 
1890
            "approved_by_default":
 
 
1891
                lambda: config.getboolean(section,
 
 
1892
                                          "approved_by_default"),
 
 
1894
        for name, value in config.items(section):
 
3209
 
                client["secret"] = pgp.decrypt(
 
3210
 
                    client["encrypted_secret"],
 
3211
 
                    client_settings[client_name]["secret"])
 
3213
 
                # If decryption fails, we use secret from new settings
 
3214
 
                logger.debug("Failed to decrypt {} old secret".format(
 
3216
 
                client["secret"] = (client_settings[client_name]
 
3219
 
    # Add/remove clients based on new changes made to config
 
3220
 
    for client_name in (set(old_client_settings)
 
3221
 
                        - set(client_settings)):
 
3222
 
        del clients_data[client_name]
 
3223
 
    for client_name in (set(client_settings)
 
3224
 
                        - set(old_client_settings)):
 
3225
 
        clients_data[client_name] = client_settings[client_name]
 
3227
 
    # Create all client objects
 
3228
 
    for client_name, client in clients_data.items():
 
3229
 
        tcp_server.clients[client_name] = client_class(
 
3232
 
            server_settings=server_settings)
 
 
1896
                yield (name, special_settings[name]())
 
 
1900
    tcp_server.clients.update(set(
 
 
1901
            client_class(name = section,
 
 
1902
                         config= dict(client_config_items(
 
 
1903
                        client_config, section)))
 
 
1904
            for section in client_config.sections()))
 
3234
1905
    if not tcp_server.clients:
 
3235
1906
        logger.warning("No clients defined")
 
3238
 
        if pidfile is not None:
 
3242
 
                    print(pid, file=pidfile)
 
3244
 
                logger.error("Could not write to file %r with PID %d",
 
 
1912
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
1915
            logger.error("Could not write to file %r with PID %d",
 
 
1918
            # "pidfile" was never created
 
3247
1920
        del pidfilename
 
3249
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3250
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3251
 
                             lambda: main_loop.quit() and False)
 
 
1922
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
1924
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
1925
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3255
 
        @alternate_dbus_interfaces(
 
3256
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3257
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
1928
        class MandosDBusService(dbus.service.Object):
 
3258
1929
            """A D-Bus proxy object"""
 
3260
1930
            def __init__(self):
 
3261
1931
                dbus.service.Object.__init__(self, bus, "/")
 
3263
 
            _interface = "se.recompile.Mandos"
 
 
1932
            _interface = "se.bsnet.fukt.Mandos"
 
3265
1934
            @dbus.service.signal(_interface, signature="o")
 
3266
1935
            def ClientAdded(self, objpath):
 
3270
1939
            @dbus.service.signal(_interface, signature="ss")
 
3271
1940
            def ClientNotFound(self, fingerprint, address):
 
3275
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3277
1944
            @dbus.service.signal(_interface, signature="os")
 
3278
1945
            def ClientRemoved(self, objpath, name):
 
3282
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3284
1949
            @dbus.service.method(_interface, out_signature="ao")
 
3285
1950
            def GetAllClients(self):
 
3287
 
                return dbus.Array(c.dbus_object_path for c in
 
3288
 
                                  tcp_server.clients.values())
 
3290
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
1952
                return dbus.Array(c.dbus_object_path
 
 
1953
                                  for c in tcp_server.clients)
 
3292
1955
            @dbus.service.method(_interface,
 
3293
1956
                                 out_signature="a{oa{sv}}")
 
3294
1957
            def GetAllClientsWithProperties(self):
 
3296
1959
                return dbus.Dictionary(
 
3297
 
                    {c.dbus_object_path: c.GetAll(
 
3298
 
                        "se.recompile.Mandos.Client")
 
3299
 
                     for c in tcp_server.clients.values()},
 
 
1960
                    ((c.dbus_object_path, c.GetAll(""))
 
 
1961
                     for c in tcp_server.clients),
 
3300
1962
                    signature="oa{sv}")
 
3302
1964
            @dbus.service.method(_interface, in_signature="o")
 
3303
1965
            def RemoveClient(self, object_path):
 
3305
 
                for c in tcp_server.clients.values():
 
 
1967
                for c in tcp_server.clients:
 
3306
1968
                    if c.dbus_object_path == object_path:
 
3307
 
                        del tcp_server.clients[c.name]
 
 
1969
                        tcp_server.clients.remove(c)
 
3308
1970
                        c.remove_from_connection()
 
3309
 
                        # Don't signal the disabling
 
 
1971
                        # Don't signal anything except ClientRemoved
 
3310
1972
                        c.disable(quiet=True)
 
3311
 
                        # Emit D-Bus signal for removal
 
3312
 
                        self.client_removed_signal(c)
 
 
1974
                        self.ClientRemoved(object_path, c.name)
 
3314
1976
                raise KeyError(object_path)
 
3318
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3319
 
                                 out_signature="a{oa{sa{sv}}}")
 
3320
 
            def GetManagedObjects(self):
 
3322
 
                return dbus.Dictionary(
 
3323
 
                    {client.dbus_object_path:
 
3325
 
                         {interface: client.GetAll(interface)
 
3327
 
                          client._get_all_interface_names()})
 
3328
 
                     for client in tcp_server.clients.values()})
 
3330
 
            def client_added_signal(self, client):
 
3331
 
                """Send the new standard signal and the old signal"""
 
3333
 
                    # New standard signal
 
3334
 
                    self.InterfacesAdded(
 
3335
 
                        client.dbus_object_path,
 
3337
 
                            {interface: client.GetAll(interface)
 
3339
 
                             client._get_all_interface_names()}))
 
3341
 
                    self.ClientAdded(client.dbus_object_path)
 
3343
 
            def client_removed_signal(self, client):
 
3344
 
                """Send the new standard signal and the old signal"""
 
3346
 
                    # New standard signal
 
3347
 
                    self.InterfacesRemoved(
 
3348
 
                        client.dbus_object_path,
 
3349
 
                        client._get_all_interface_names())
 
3351
 
                    self.ClientRemoved(client.dbus_object_path,
 
3354
1980
        mandos_dbus_service = MandosDBusService()
 
3356
 
    # Save modules to variables to exempt the modules from being
 
3357
 
    # unloaded before the function registered with atexit() is run.
 
3358
 
    mp = multiprocessing
 
3362
1983
        "Cleanup function; run on exit"
 
3366
 
        mp.active_children()
 
3368
 
        if not (tcp_server.clients or client_settings):
 
3371
 
        # Store client before exiting. Secrets are encrypted with key
 
3372
 
        # based on what config file has. If config file is
 
3373
 
        # removed/edited, old secret will thus be unrecovable.
 
3375
 
        with PGPEngine() as pgp:
 
3376
 
            for client in tcp_server.clients.values():
 
3377
 
                key = client_settings[client.name]["secret"]
 
3378
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3382
 
                # A list of attributes that can not be pickled
 
3384
 
                exclude = {"bus", "changedstate", "secret",
 
3385
 
                           "checker", "server_settings"}
 
3386
 
                for name, typ in inspect.getmembers(dbus.service
 
3390
 
                client_dict["encrypted_secret"] = (client
 
3392
 
                for attr in client.client_structure:
 
3393
 
                    if attr not in exclude:
 
3394
 
                        client_dict[attr] = getattr(client, attr)
 
3396
 
                clients[client.name] = client_dict
 
3397
 
                del client_settings[client.name]["secret"]
 
3400
 
            with tempfile.NamedTemporaryFile(
 
3404
 
                    dir=os.path.dirname(stored_state_path),
 
3405
 
                    delete=False) as stored_state:
 
3406
 
                pickle.dump((clients, client_settings), stored_state,
 
3408
 
                tempname = stored_state.name
 
3409
 
            os.rename(tempname, stored_state_path)
 
3410
 
        except (IOError, OSError) as e:
 
3416
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3417
 
                logger.warning("Could not save persistent state: {}"
 
3418
 
                               .format(os.strerror(e.errno)))
 
3420
 
                logger.warning("Could not save persistent state:",
 
3424
 
        # Delete all clients, and settings from config
 
3425
1986
        while tcp_server.clients:
 
3426
 
            name, client = tcp_server.clients.popitem()
 
 
1987
            client = tcp_server.clients.pop()
 
3428
1989
                client.remove_from_connection()
 
3429
 
            # Don't signal the disabling
 
 
1990
            client.disable_hook = None
 
 
1991
            # Don't signal anything except ClientRemoved
 
3430
1992
            client.disable(quiet=True)
 
3431
 
            # Emit D-Bus signal for removal
 
3433
 
                mandos_dbus_service.client_removed_signal(client)
 
3434
 
        client_settings.clear()
 
 
1995
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
3436
1998
    atexit.register(cleanup)
 
3438
 
    for client in tcp_server.clients.values():
 
 
2000
    for client in tcp_server.clients:
 
3440
 
            # Emit D-Bus signal for adding
 
3441
 
            mandos_dbus_service.client_added_signal(client)
 
3442
 
        # Need to initiate checking of clients
 
3444
 
            client.init_checker()
 
 
2003
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3446
2006
    tcp_server.enable()
 
3447
2007
    tcp_server.server_activate()
 
3449
2009
    # Find out what port we got
 
3451
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2010
    service.port = tcp_server.socket.getsockname()[1]
 
3453
2012
        logger.info("Now listening on address %r, port %d,"
 
3454
 
                    " flowinfo %d, scope_id %d",
 
3455
 
                    *tcp_server.socket.getsockname())
 
 
2013
                    " flowinfo %d, scope_id %d"
 
 
2014
                    % tcp_server.socket.getsockname())
 
3457
 
        logger.info("Now listening on address %r, port %d",
 
3458
 
                    *tcp_server.socket.getsockname())
 
3460
 
    # service.interface = tcp_server.socket.getsockname()[3]
 
 
2016
        logger.info("Now listening on address %r, port %d"
 
 
2017
                    % tcp_server.socket.getsockname())
 
 
2019
    #service.interface = tcp_server.socket.getsockname()[3]
 
3464
 
            # From the Avahi example code
 
3467
 
            except dbus.exceptions.DBusException as error:
 
3468
 
                logger.critical("D-Bus Exception", exc_info=error)
 
3471
 
            # End of Avahi example code
 
3473
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3474
 
                          lambda *args, **kwargs:
 
3475
 
                          (tcp_server.handle_request
 
3476
 
                           (*args[2:], **kwargs) or True))
 
 
2022
        # From the Avahi example code
 
 
2025
        except dbus.exceptions.DBusException, error:
 
 
2026
            logger.critical("DBusException: %s", error)
 
 
2029
        # End of Avahi example code
 
 
2031
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
 
2032
                             lambda *args, **kwargs:
 
 
2033
                             (tcp_server.handle_request
 
 
2034
                              (*args[2:], **kwargs) or True))
 
3478
2036
        logger.debug("Starting main loop")
 
3479
2037
        main_loop.run()
 
3480
 
    except AvahiError as error:
 
3481
 
        logger.critical("Avahi Error", exc_info=error)
 
 
2038
    except AvahiError, error:
 
 
2039
        logger.critical("AvahiError: %s", error)
 
3484
2042
    except KeyboardInterrupt: