62
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
63
73
import multiprocessing
 
66
82
import dbus.service
 
 
84
from gi.repository import GLib
 
69
85
from dbus.mainloop.glib import DBusGMainLoop
 
72
88
import xml.dom.minidom
 
 
91
# Try to find the value of SO_BINDTODEVICE:
 
 
93
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
94
    # newer, and it is also the most natural place for it:
 
76
95
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
77
96
except AttributeError:
 
 
98
        # This is where SO_BINDTODEVICE was up to and including Python
 
79
100
        from IN import SO_BINDTODEVICE
 
80
101
    except ImportError:
 
81
 
        SO_BINDTODEVICE = None
 
86
 
#logger = logging.getLogger(u'mandos')
 
87
 
logger = logging.Logger(u'mandos')
 
88
 
syslogger = (logging.handlers.SysLogHandler
 
89
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
90
 
              address = "/dev/log"))
 
91
 
syslogger.setFormatter(logging.Formatter
 
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
94
 
logger.addHandler(syslogger)
 
96
 
console = logging.StreamHandler()
 
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
100
 
logger.addHandler(console)
 
 
102
        # In Python 2.7 it seems to have been removed entirely.
 
 
103
        # Try running the C preprocessor:
 
 
105
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
107
                                  stdin=subprocess.PIPE,
 
 
108
                                  stdout=subprocess.PIPE)
 
 
109
            stdout = cc.communicate(
 
 
110
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
111
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
112
        except (OSError, ValueError, IndexError):
 
 
114
            SO_BINDTODEVICE = None
 
 
116
if sys.version_info.major == 2:
 
 
119
if sys.version_info < (3, 2):
 
 
120
    configparser.Configparser = configparser.SafeConfigParser
 
 
123
stored_state_file = "clients.pickle"
 
 
125
logger = logging.getLogger()
 
 
129
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
130
        ctypes.util.find_library("c")).if_nametoindex
 
 
131
except (OSError, AttributeError):
 
 
133
    def if_nametoindex(interface):
 
 
134
        "Get an interface index the hard way, i.e. using fcntl()"
 
 
135
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
 
136
        with contextlib.closing(socket.socket()) as s:
 
 
137
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
 
138
                                struct.pack(b"16s16x", interface))
 
 
139
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
 
140
        return interface_index
 
 
143
def copy_function(func):
 
 
144
    """Make a copy of a function"""
 
 
145
    if sys.version_info.major == 2:
 
 
146
        return types.FunctionType(func.func_code,
 
 
152
        return types.FunctionType(func.__code__,
 
 
159
def initlogger(debug, level=logging.WARNING):
 
 
160
    """init logger and add loglevel"""
 
 
163
    syslogger = (logging.handlers.SysLogHandler(
 
 
164
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
166
    syslogger.setFormatter(logging.Formatter
 
 
167
                           ('Mandos [%(process)d]: %(levelname)s:'
 
 
169
    logger.addHandler(syslogger)
 
 
172
        console = logging.StreamHandler()
 
 
173
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
177
        logger.addHandler(console)
 
 
178
    logger.setLevel(level)
 
 
181
class PGPError(Exception):
 
 
182
    """Exception if encryption/decryption fails"""
 
 
186
class PGPEngine(object):
 
 
187
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
 
190
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
 
193
            output = subprocess.check_output(["gpgconf"])
 
 
194
            for line in output.splitlines():
 
 
195
                name, text, path = line.split(b":")
 
 
200
            if e.errno != errno.ENOENT:
 
 
202
        self.gnupgargs = ['--batch',
 
 
203
                          '--homedir', self.tempdir,
 
 
206
        # Only GPG version 1 has the --no-use-agent option.
 
 
207
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
 
208
            self.gnupgargs.append("--no-use-agent")
 
 
213
    def __exit__(self, exc_type, exc_value, traceback):
 
 
221
        if self.tempdir is not None:
 
 
222
            # Delete contents of tempdir
 
 
223
            for root, dirs, files in os.walk(self.tempdir,
 
 
225
                for filename in files:
 
 
226
                    os.remove(os.path.join(root, filename))
 
 
228
                    os.rmdir(os.path.join(root, dirname))
 
 
230
            os.rmdir(self.tempdir)
 
 
233
    def password_encode(self, password):
 
 
234
        # Passphrase can not be empty and can not contain newlines or
 
 
235
        # NUL bytes.  So we prefix it and hex encode it.
 
 
236
        encoded = b"mandos" + binascii.hexlify(password)
 
 
237
        if len(encoded) > 2048:
 
 
238
            # GnuPG can't handle long passwords, so encode differently
 
 
239
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
240
                       .replace(b"\n", b"\\n")
 
 
241
                       .replace(b"\0", b"\\x00"))
 
 
244
    def encrypt(self, data, password):
 
 
245
        passphrase = self.password_encode(password)
 
 
246
        with tempfile.NamedTemporaryFile(
 
 
247
                dir=self.tempdir) as passfile:
 
 
248
            passfile.write(passphrase)
 
 
250
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
254
                                    stdin=subprocess.PIPE,
 
 
255
                                    stdout=subprocess.PIPE,
 
 
256
                                    stderr=subprocess.PIPE)
 
 
257
            ciphertext, err = proc.communicate(input=data)
 
 
258
        if proc.returncode != 0:
 
 
262
    def decrypt(self, data, password):
 
 
263
        passphrase = self.password_encode(password)
 
 
264
        with tempfile.NamedTemporaryFile(
 
 
265
                dir=self.tempdir) as passfile:
 
 
266
            passfile.write(passphrase)
 
 
268
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
272
                                    stdin=subprocess.PIPE,
 
 
273
                                    stdout=subprocess.PIPE,
 
 
274
                                    stderr=subprocess.PIPE)
 
 
275
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
276
        if proc.returncode != 0:
 
 
278
        return decrypted_plaintext
 
 
281
# Pretend that we have an Avahi module
 
 
283
    """This isn't so much a class as it is a module-like namespace."""
 
 
284
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
285
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
286
    PROTO_INET = 0               # avahi-common/address.h
 
 
287
    PROTO_INET6 = 1              # avahi-common/address.h
 
 
288
    DBUS_NAME = "org.freedesktop.Avahi"
 
 
289
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
 
290
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
 
291
    DBUS_PATH_SERVER = "/"
 
 
294
    def string_array_to_txt_array(t):
 
 
295
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
 
296
                           for s in t), signature="ay")
 
 
297
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
298
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
299
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
300
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
301
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
302
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
303
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
304
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
102
307
class AvahiError(Exception):
 
103
308
    def __init__(self, value, *args, **kwargs):
 
104
309
        self.value = value
 
105
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
106
 
    def __unicode__(self):
 
107
 
        return unicode(repr(self.value))
 
 
310
        return super(AvahiError, self).__init__(value, *args,
 
109
314
class AvahiServiceError(AvahiError):
 
112
318
class AvahiGroupError(AvahiError):
 
116
322
class AvahiService(object):
 
117
323
    """An Avahi (Zeroconf) service.
 
120
326
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
121
327
               Used to optionally bind to the specified interface.
 
122
 
    name: string; Example: u'Mandos'
 
123
 
    type: string; Example: u'_mandos._tcp'.
 
124
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
328
    name: string; Example: 'Mandos'
 
 
329
    type: string; Example: '_mandos._tcp'.
 
 
330
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
125
331
    port: integer; what port to announce
 
126
332
    TXT: list of strings; TXT record for the service
 
127
333
    domain: string; Domain to publish on, default to .local if empty.
 
 
197
422
            dbus.UInt16(self.port),
 
198
423
            avahi.string_array_to_txt_array(self.TXT))
 
199
424
        self.group.Commit()
 
200
426
    def entry_group_state_changed(self, state, error):
 
201
427
        """Derived from the Avahi example code"""
 
202
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
 
428
        logger.debug("Avahi entry group state change: %i", state)
 
204
430
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
205
 
            logger.debug(u"Zeroconf service established.")
 
 
431
            logger.debug("Zeroconf service established.")
 
206
432
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
207
 
            logger.warning(u"Zeroconf service name collision.")
 
 
433
            logger.info("Zeroconf service name collision.")
 
209
435
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
210
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
212
 
            raise AvahiGroupError(u"State changed: %s"
 
 
436
            logger.critical("Avahi: Error in group state changed %s",
 
 
438
            raise AvahiGroupError("State changed: {!s}".format(error))
 
214
440
    def cleanup(self):
 
215
441
        """Derived from the Avahi example code"""
 
216
442
        if self.group is not None:
 
 
445
            except (dbus.exceptions.UnknownMethodException,
 
 
446
                    dbus.exceptions.DBusException):
 
218
448
            self.group = None
 
219
 
    def server_state_changed(self, state):
 
 
451
    def server_state_changed(self, state, error=None):
 
220
452
        """Derived from the Avahi example code"""
 
221
 
        logger.debug(u"Avahi server state change: %i", state)
 
222
 
        if state == avahi.SERVER_COLLISION:
 
223
 
            logger.error(u"Zeroconf server name collision")
 
 
453
        logger.debug("Avahi server state change: %i", state)
 
 
455
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
 
456
            avahi.SERVER_REGISTERING: None,
 
 
457
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
 
458
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
 
460
        if state in bad_states:
 
 
461
            if bad_states[state] is not None:
 
 
463
                    logger.error(bad_states[state])
 
 
465
                    logger.error(bad_states[state] + ": %r", error)
 
225
467
        elif state == avahi.SERVER_RUNNING:
 
 
470
            except dbus.exceptions.DBusException as error:
 
 
471
                if (error.get_dbus_name()
 
 
472
                    == "org.freedesktop.Avahi.CollisionError"):
 
 
473
                    logger.info("Local Zeroconf service name"
 
 
475
                    return self.rename(remove=False)
 
 
477
                    logger.critical("D-Bus Exception", exc_info=error)
 
 
482
                logger.debug("Unknown state: %r", state)
 
 
484
                logger.debug("Unknown state: %r: %r", state, error)
 
227
486
    def activate(self):
 
228
487
        """Derived from the Avahi example code"""
 
229
488
        if self.server is None:
 
230
489
            self.server = dbus.Interface(
 
231
490
                self.bus.get_object(avahi.DBUS_NAME,
 
232
 
                                    avahi.DBUS_PATH_SERVER),
 
 
491
                                    avahi.DBUS_PATH_SERVER,
 
 
492
                                    follow_name_owner_changes=True),
 
233
493
                avahi.DBUS_INTERFACE_SERVER)
 
234
 
        self.server.connect_to_signal(u"StateChanged",
 
235
 
                                 self.server_state_changed)
 
 
494
        self.server.connect_to_signal("StateChanged",
 
 
495
                                      self.server_state_changed)
 
236
496
        self.server_state_changed(self.server.GetState())
 
 
499
class AvahiServiceToSyslog(AvahiService):
 
 
500
    def rename(self, *args, **kwargs):
 
 
501
        """Add the new name to the syslog messages"""
 
 
502
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
503
        syslogger.setFormatter(logging.Formatter(
 
 
504
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
509
# Pretend that we have a GnuTLS module
 
 
510
class gnutls(object):
 
 
511
    """This isn't so much a class as it is a module-like namespace."""
 
 
513
    library = ctypes.util.find_library("gnutls")
 
 
515
        library = ctypes.util.find_library("gnutls-deb0")
 
 
516
    _library = ctypes.cdll.LoadLibrary(library)
 
 
519
    # Unless otherwise indicated, the constants and types below are
 
 
520
    # all from the gnutls/gnutls.h C header file.
 
 
531
    E_NO_CERTIFICATE_FOUND = -49
 
 
536
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
 
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
        def __init__(self, message=None, code=None, args=()):
 
 
566
            # Default usage is by a message string, but if a return
 
 
567
            # code is passed, convert it to a string with
 
 
570
            if message is None and code is not None:
 
 
571
                message = gnutls.strerror(code)
 
 
572
            return super(gnutls.Error, self).__init__(
 
 
575
    class CertificateSecurityError(Error):
 
 
579
    class Credentials(object):
 
 
581
            self._c_object = gnutls.certificate_credentials_t()
 
 
582
            gnutls.certificate_allocate_credentials(
 
 
583
                ctypes.byref(self._c_object))
 
 
584
            self.type = gnutls.CRD_CERTIFICATE
 
 
587
            gnutls.certificate_free_credentials(self._c_object)
 
 
589
    class ClientSession(object):
 
 
590
        def __init__(self, socket, credentials=None):
 
 
591
            self._c_object = gnutls.session_t()
 
 
592
            gnutls_flags = gnutls.CLIENT
 
 
593
            if gnutls.check_version(b"3.5.6"):
 
 
594
                gnutls_flags |= gnutls.NO_TICKETS
 
 
596
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
597
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
599
            gnutls.set_default_priority(self._c_object)
 
 
600
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
601
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
604
            if credentials is None:
 
 
605
                credentials = gnutls.Credentials()
 
 
606
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
607
                                   ctypes.cast(credentials._c_object,
 
 
609
            self.credentials = credentials
 
 
612
            gnutls.deinit(self._c_object)
 
 
615
            return gnutls.handshake(self._c_object)
 
 
617
        def send(self, data):
 
 
621
                data_len -= gnutls.record_send(self._c_object,
 
 
626
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
628
    # Error handling functions
 
 
629
    def _error_code(result):
 
 
630
        """A function to raise exceptions on errors, suitable
 
 
631
        for the 'restype' attribute on ctypes functions"""
 
 
634
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
635
            raise gnutls.CertificateSecurityError(code=result)
 
 
636
        raise gnutls.Error(code=result)
 
 
638
    def _retry_on_error(result, func, arguments):
 
 
639
        """A function to retry on some errors, suitable
 
 
640
        for the 'errcheck' attribute on ctypes functions"""
 
 
642
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
643
                return _error_code(result)
 
 
644
            result = func(*arguments)
 
 
647
    # Unless otherwise indicated, the function declarations below are
 
 
648
    # all from the gnutls/gnutls.h C header file.
 
 
651
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
652
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
653
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
654
    priority_set_direct.restype = _error_code
 
 
656
    init = _library.gnutls_init
 
 
657
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
658
    init.restype = _error_code
 
 
660
    set_default_priority = _library.gnutls_set_default_priority
 
 
661
    set_default_priority.argtypes = [session_t]
 
 
662
    set_default_priority.restype = _error_code
 
 
664
    record_send = _library.gnutls_record_send
 
 
665
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
667
    record_send.restype = ctypes.c_ssize_t
 
 
668
    record_send.errcheck = _retry_on_error
 
 
670
    certificate_allocate_credentials = (
 
 
671
        _library.gnutls_certificate_allocate_credentials)
 
 
672
    certificate_allocate_credentials.argtypes = [
 
 
673
        ctypes.POINTER(certificate_credentials_t)]
 
 
674
    certificate_allocate_credentials.restype = _error_code
 
 
676
    certificate_free_credentials = (
 
 
677
        _library.gnutls_certificate_free_credentials)
 
 
678
    certificate_free_credentials.argtypes = [
 
 
679
        certificate_credentials_t]
 
 
680
    certificate_free_credentials.restype = None
 
 
682
    handshake_set_private_extensions = (
 
 
683
        _library.gnutls_handshake_set_private_extensions)
 
 
684
    handshake_set_private_extensions.argtypes = [session_t,
 
 
686
    handshake_set_private_extensions.restype = None
 
 
688
    credentials_set = _library.gnutls_credentials_set
 
 
689
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
691
    credentials_set.restype = _error_code
 
 
693
    strerror = _library.gnutls_strerror
 
 
694
    strerror.argtypes = [ctypes.c_int]
 
 
695
    strerror.restype = ctypes.c_char_p
 
 
697
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
698
    certificate_type_get.argtypes = [session_t]
 
 
699
    certificate_type_get.restype = _error_code
 
 
701
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
702
    certificate_get_peers.argtypes = [session_t,
 
 
703
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
704
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
706
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
707
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
708
    global_set_log_level.restype = None
 
 
710
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
711
    global_set_log_function.argtypes = [log_func]
 
 
712
    global_set_log_function.restype = None
 
 
714
    deinit = _library.gnutls_deinit
 
 
715
    deinit.argtypes = [session_t]
 
 
716
    deinit.restype = None
 
 
718
    handshake = _library.gnutls_handshake
 
 
719
    handshake.argtypes = [session_t]
 
 
720
    handshake.restype = _error_code
 
 
721
    handshake.errcheck = _retry_on_error
 
 
723
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
724
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
725
    transport_set_ptr.restype = None
 
 
727
    bye = _library.gnutls_bye
 
 
728
    bye.argtypes = [session_t, close_request_t]
 
 
729
    bye.restype = _error_code
 
 
730
    bye.errcheck = _retry_on_error
 
 
732
    check_version = _library.gnutls_check_version
 
 
733
    check_version.argtypes = [ctypes.c_char_p]
 
 
734
    check_version.restype = ctypes.c_char_p
 
 
736
    _need_version = b"3.3.0"
 
 
737
    if check_version(_need_version) is None:
 
 
738
        raise self.Error("Needs GnuTLS {} or later"
 
 
739
                         .format(_need_version))
 
 
741
    _tls_rawpk_version = b"3.6.6"
 
 
742
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
746
        class pubkey_st(ctypes.Structure):
 
 
748
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
750
        x509_crt_fmt_t = ctypes.c_int
 
 
752
        # All the function declarations below are from gnutls/abstract.h
 
 
753
        pubkey_init = _library.gnutls_pubkey_init
 
 
754
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
755
        pubkey_init.restype = _error_code
 
 
757
        pubkey_import = _library.gnutls_pubkey_import
 
 
758
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
760
        pubkey_import.restype = _error_code
 
 
762
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
763
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
764
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
765
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
766
        pubkey_get_key_id.restype = _error_code
 
 
768
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
769
        pubkey_deinit.argtypes = [pubkey_t]
 
 
770
        pubkey_deinit.restype = None
 
 
772
        # All the function declarations below are from gnutls/openpgp.h
 
 
774
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
775
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
776
        openpgp_crt_init.restype = _error_code
 
 
778
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
779
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
780
                                       ctypes.POINTER(datum_t),
 
 
782
        openpgp_crt_import.restype = _error_code
 
 
784
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
785
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
786
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
787
        openpgp_crt_verify_self.restype = _error_code
 
 
789
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
790
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
791
        openpgp_crt_deinit.restype = None
 
 
793
        openpgp_crt_get_fingerprint = (
 
 
794
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
795
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
799
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
801
    if check_version(b"3.6.4"):
 
 
802
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
803
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
804
        certificate_type_get2.restype = _error_code
 
 
806
    # Remove non-public functions
 
 
807
    del _error_code, _retry_on_error
 
 
810
def call_pipe(connection,       # : multiprocessing.Connection
 
 
811
              func, *args, **kwargs):
 
 
812
    """This function is meant to be called by multiprocessing.Process
 
 
814
    This function runs func(*args, **kwargs), and writes the resulting
 
 
815
    return value on the provided multiprocessing.Connection.
 
 
817
    connection.send(func(*args, **kwargs))
 
239
821
class Client(object):
 
240
822
    """A representation of a client host served by this server.
 
243
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
 
825
    approved:   bool(); 'None' if not yet approved/disapproved
 
244
826
    approval_delay: datetime.timedelta(); Time to wait for approval
 
245
827
    approval_duration: datetime.timedelta(); Duration of one approval
 
246
 
    checker:    subprocess.Popen(); a running checker process used
 
247
 
                                    to see if the client lives.
 
248
 
                                    'None' if no process is running.
 
249
 
    checker_callback_tag: a gobject event source tag, or None
 
 
828
    checker: multiprocessing.Process(); a running checker process used
 
 
829
             to see if the client lives. 'None' if no process is
 
 
831
    checker_callback_tag: a GLib event source tag, or None
 
250
832
    checker_command: string; External command which is run to check
 
251
833
                     if client lives.  %() expansions are done at
 
252
834
                     runtime with vars(self) as dict, so that for
 
253
835
                     instance %(name)s can be used in the command.
 
254
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
836
    checker_initiator_tag: a GLib event source tag, or None
 
255
837
    created:    datetime.datetime(); (UTC) object creation
 
 
838
    client_structure: Object describing what attributes a client has
 
 
839
                      and is used for storing the client at exit
 
256
840
    current_checker_command: string; current running checker_command
 
257
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
258
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
841
    disable_initiator_tag: a GLib event source tag, or None
 
260
843
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
261
 
                 uniquely identify the client
 
 
844
                 uniquely identify an OpenPGP client
 
 
845
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
846
            a client using raw public keys
 
262
847
    host:       string; available for use by the checker command
 
263
848
    interval:   datetime.timedelta(); How often to start a new checker
 
264
849
    last_approval_request: datetime.datetime(); (UTC) or None
 
265
850
    last_checked_ok: datetime.datetime(); (UTC) or None
 
266
 
    last_enabled: datetime.datetime(); (UTC)
 
 
851
    last_checker_status: integer between 0 and 255 reflecting exit
 
 
852
                         status of last checker. -1 reflects crashed
 
 
853
                         checker, -2 means no checker completed yet.
 
 
854
    last_checker_signal: The signal which killed the last checker, if
 
 
855
                         last_checker_status is -1
 
 
856
    last_enabled: datetime.datetime(); (UTC) or None
 
267
857
    name:       string; from the config file, used in log messages and
 
268
858
                        D-Bus identifiers
 
269
859
    secret:     bytestring; sent verbatim (over TLS) to client
 
270
860
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
271
861
                                      until this client is disabled
 
 
862
    extended_timeout:   extra long timeout when secret has been sent
 
272
863
    runtime_expansions: Allowed attributes for runtime expansion.
 
 
864
    expires:    datetime.datetime(); time (UTC) when a client will be
 
 
866
    server_settings: The server_settings dict from main()
 
275
 
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
276
 
                          u"created", u"enabled", u"fingerprint",
 
277
 
                          u"host", u"interval", u"last_checked_ok",
 
278
 
                          u"last_enabled", u"name", u"timeout")
 
 
869
    runtime_expansions = ("approval_delay", "approval_duration",
 
 
870
                          "created", "enabled", "expires", "key_id",
 
 
871
                          "fingerprint", "host", "interval",
 
 
872
                          "last_approval_request", "last_checked_ok",
 
 
873
                          "last_enabled", "name", "timeout")
 
 
876
        "extended_timeout": "PT15M",
 
 
878
        "checker": "fping -q -- %%(host)s",
 
 
880
        "approval_delay": "PT0S",
 
 
881
        "approval_duration": "PT1S",
 
 
882
        "approved_by_default": "True",
 
281
 
    def _timedelta_to_milliseconds(td):
 
282
 
        "Convert a datetime.timedelta() to milliseconds"
 
283
 
        return ((td.days * 24 * 60 * 60 * 1000)
 
284
 
                + (td.seconds * 1000)
 
285
 
                + (td.microseconds // 1000))
 
287
 
    def timeout_milliseconds(self):
 
288
 
        "Return the 'timeout' attribute in milliseconds"
 
289
 
        return self._timedelta_to_milliseconds(self.timeout)
 
291
 
    def interval_milliseconds(self):
 
292
 
        "Return the 'interval' attribute in milliseconds"
 
293
 
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
    def approval_delay_milliseconds(self):
 
296
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
298
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
299
 
        """Note: the 'checker' key in 'config' sets the
 
300
 
        'checker_command' attribute and *not* the 'checker'
 
 
887
    def config_parser(config):
 
 
888
        """Construct a new dict of client settings of this form:
 
 
889
        { client_name: {setting_name: value, ...}, ...}
 
 
890
        with exceptions for any special settings as defined above.
 
 
891
        NOTE: Must be a pure function. Must return the same result
 
 
892
        value given the same arguments.
 
 
895
        for client_name in config.sections():
 
 
896
            section = dict(config.items(client_name))
 
 
897
            client = settings[client_name] = {}
 
 
899
            client["host"] = section["host"]
 
 
900
            # Reformat values from string types to Python types
 
 
901
            client["approved_by_default"] = config.getboolean(
 
 
902
                client_name, "approved_by_default")
 
 
903
            client["enabled"] = config.getboolean(client_name,
 
 
906
            # Uppercase and remove spaces from key_id and fingerprint
 
 
907
            # for later comparison purposes with return value from the
 
 
908
            # key_id() and fingerprint() functions
 
 
909
            client["key_id"] = (section.get("key_id", "").upper()
 
 
911
            client["fingerprint"] = (section["fingerprint"].upper()
 
 
913
            if "secret" in section:
 
 
914
                client["secret"] = codecs.decode(section["secret"]
 
 
917
            elif "secfile" in section:
 
 
918
                with open(os.path.expanduser(os.path.expandvars
 
 
919
                                             (section["secfile"])),
 
 
921
                    client["secret"] = secfile.read()
 
 
923
                raise TypeError("No secret or secfile for section {}"
 
 
925
            client["timeout"] = string_to_delta(section["timeout"])
 
 
926
            client["extended_timeout"] = string_to_delta(
 
 
927
                section["extended_timeout"])
 
 
928
            client["interval"] = string_to_delta(section["interval"])
 
 
929
            client["approval_delay"] = string_to_delta(
 
 
930
                section["approval_delay"])
 
 
931
            client["approval_duration"] = string_to_delta(
 
 
932
                section["approval_duration"])
 
 
933
            client["checker_command"] = section["checker"]
 
 
934
            client["last_approval_request"] = None
 
 
935
            client["last_checked_ok"] = None
 
 
936
            client["last_checker_status"] = -2
 
 
940
    def __init__(self, settings, name=None, server_settings=None):
 
305
 
        logger.debug(u"Creating client %r", self.name)
 
306
 
        # Uppercase and remove spaces from fingerprint for later
 
307
 
        # comparison purposes with return value from the fingerprint()
 
309
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
311
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
312
 
        if u"secret" in config:
 
313
 
            self.secret = config[u"secret"].decode(u"base64")
 
314
 
        elif u"secfile" in config:
 
315
 
            with open(os.path.expanduser(os.path.expandvars
 
316
 
                                         (config[u"secfile"])),
 
318
 
                self.secret = secfile.read()
 
 
942
        if server_settings is None:
 
 
944
        self.server_settings = server_settings
 
 
945
        # adding all client settings
 
 
946
        for setting, value in settings.items():
 
 
947
            setattr(self, setting, value)
 
 
950
            if not hasattr(self, "last_enabled"):
 
 
951
                self.last_enabled = datetime.datetime.utcnow()
 
 
952
            if not hasattr(self, "expires"):
 
 
953
                self.expires = (datetime.datetime.utcnow()
 
320
 
            raise TypeError(u"No secret or secfile for client %s"
 
322
 
        self.host = config.get(u"host", u"")
 
323
 
        self.created = datetime.datetime.utcnow()
 
325
 
        self.last_approval_request = None
 
326
 
        self.last_enabled = None
 
327
 
        self.last_checked_ok = None
 
328
 
        self.timeout = string_to_delta(config[u"timeout"])
 
329
 
        self.interval = string_to_delta(config[u"interval"])
 
330
 
        self.disable_hook = disable_hook
 
 
956
            self.last_enabled = None
 
 
959
        logger.debug("Creating client %r", self.name)
 
 
960
        logger.debug("  Key ID: %s", self.key_id)
 
 
961
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
 
962
        self.created = settings.get("created",
 
 
963
                                    datetime.datetime.utcnow())
 
 
965
        # attributes specific for this server instance
 
331
966
        self.checker = None
 
332
967
        self.checker_initiator_tag = None
 
333
968
        self.disable_initiator_tag = None
 
334
969
        self.checker_callback_tag = None
 
335
 
        self.checker_command = config[u"checker"]
 
336
970
        self.current_checker_command = None
 
337
 
        self.last_connect = None
 
338
 
        self._approved = None
 
339
 
        self.approved_by_default = config.get(u"approved_by_default",
 
341
972
        self.approvals_pending = 0
 
342
 
        self.approval_delay = string_to_delta(
 
343
 
            config[u"approval_delay"])
 
344
 
        self.approval_duration = string_to_delta(
 
345
 
            config[u"approval_duration"])
 
346
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
 
973
        self.changedstate = multiprocessing_manager.Condition(
 
 
974
            multiprocessing_manager.Lock())
 
 
975
        self.client_structure = [attr
 
 
976
                                 for attr in self.__dict__.keys()
 
 
977
                                 if not attr.startswith("_")]
 
 
978
        self.client_structure.append("client_structure")
 
 
980
        for name, t in inspect.getmembers(
 
 
981
                type(self), lambda obj: isinstance(obj, property)):
 
 
982
            if not name.startswith("_"):
 
 
983
                self.client_structure.append(name)
 
 
985
    # Send notice to process children that client state has changed
 
348
986
    def send_changedstate(self):
 
349
 
        self.changedstate.acquire()
 
350
 
        self.changedstate.notify_all()
 
351
 
        self.changedstate.release()
 
 
987
        with self.changedstate:
 
 
988
            self.changedstate.notify_all()
 
353
990
    def enable(self):
 
354
991
        """Start this client's checker and timeout hooks"""
 
355
 
        if getattr(self, u"enabled", False):
 
 
992
        if getattr(self, "enabled", False):
 
356
993
            # Already enabled
 
358
 
        self.send_changedstate()
 
 
995
        self.expires = datetime.datetime.utcnow() + self.timeout
 
359
997
        self.last_enabled = datetime.datetime.utcnow()
 
 
999
        self.send_changedstate()
 
 
1001
    def disable(self, quiet=True):
 
 
1002
        """Disable this client."""
 
 
1003
        if not getattr(self, "enabled", False):
 
 
1006
            logger.info("Disabling client %s", self.name)
 
 
1007
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
1008
            GLib.source_remove(self.disable_initiator_tag)
 
 
1009
            self.disable_initiator_tag = None
 
 
1011
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
1012
            GLib.source_remove(self.checker_initiator_tag)
 
 
1013
            self.checker_initiator_tag = None
 
 
1015
        self.enabled = False
 
 
1017
            self.send_changedstate()
 
 
1018
        # Do not run this again if called by a GLib.timeout_add
 
 
1024
    def init_checker(self):
 
360
1025
        # Schedule a new checker to be started an 'interval' from now,
 
361
1026
        # and every interval from then on.
 
362
 
        self.checker_initiator_tag = (gobject.timeout_add
 
363
 
                                      (self.interval_milliseconds(),
 
 
1027
        if self.checker_initiator_tag is not None:
 
 
1028
            GLib.source_remove(self.checker_initiator_tag)
 
 
1029
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1030
            int(self.interval.total_seconds() * 1000),
 
365
1032
        # Schedule a disable() when 'timeout' has passed
 
366
 
        self.disable_initiator_tag = (gobject.timeout_add
 
367
 
                                   (self.timeout_milliseconds(),
 
 
1033
        if self.disable_initiator_tag is not None:
 
 
1034
            GLib.source_remove(self.disable_initiator_tag)
 
 
1035
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1036
            int(self.timeout.total_seconds() * 1000), self.disable)
 
370
1037
        # Also start a new checker *right now*.
 
371
1038
        self.start_checker()
 
373
 
    def disable(self, quiet=True):
 
374
 
        """Disable this client."""
 
375
 
        if not getattr(self, "enabled", False):
 
378
 
            self.send_changedstate()
 
380
 
            logger.info(u"Disabling client %s", self.name)
 
381
 
        if getattr(self, u"disable_initiator_tag", False):
 
382
 
            gobject.source_remove(self.disable_initiator_tag)
 
383
 
            self.disable_initiator_tag = None
 
384
 
        if getattr(self, u"checker_initiator_tag", False):
 
385
 
            gobject.source_remove(self.checker_initiator_tag)
 
386
 
            self.checker_initiator_tag = None
 
388
 
        if self.disable_hook:
 
389
 
            self.disable_hook(self)
 
391
 
        # Do not run this again if called by a gobject.timeout_add
 
395
 
        self.disable_hook = None
 
398
 
    def checker_callback(self, pid, condition, command):
 
 
1040
    def checker_callback(self, source, condition, connection,
 
399
1042
        """The checker has completed, so take appropriate actions."""
 
 
1043
        # Read return code from connection (see call_pipe)
 
 
1044
        returncode = connection.recv()
 
400
1047
        self.checker_callback_tag = None
 
401
1048
        self.checker = None
 
402
 
        if os.WIFEXITED(condition):
 
403
 
            exitstatus = os.WEXITSTATUS(condition)
 
405
 
                logger.info(u"Checker for %(name)s succeeded",
 
 
1051
            self.last_checker_status = returncode
 
 
1052
            self.last_checker_signal = None
 
 
1053
            if self.last_checker_status == 0:
 
 
1054
                logger.info("Checker for %(name)s succeeded",
 
407
1056
                self.checked_ok()
 
409
 
                logger.info(u"Checker for %(name)s failed",
 
 
1058
                logger.info("Checker for %(name)s failed", vars(self))
 
412
 
            logger.warning(u"Checker for %(name)s crashed?",
 
 
1060
            self.last_checker_status = -1
 
 
1061
            self.last_checker_signal = -returncode
 
 
1062
            logger.warning("Checker for %(name)s crashed?",
 
415
1066
    def checked_ok(self):
 
416
 
        """Bump up the timeout for this client.
 
418
 
        This should only be called when the client has been seen,
 
 
1067
        """Assert that the client has been seen, alive and well."""
 
421
1068
        self.last_checked_ok = datetime.datetime.utcnow()
 
422
 
        gobject.source_remove(self.disable_initiator_tag)
 
423
 
        self.disable_initiator_tag = (gobject.timeout_add
 
424
 
                                      (self.timeout_milliseconds(),
 
 
1069
        self.last_checker_status = 0
 
 
1070
        self.last_checker_signal = None
 
 
1073
    def bump_timeout(self, timeout=None):
 
 
1074
        """Bump up the timeout for this client."""
 
 
1076
            timeout = self.timeout
 
 
1077
        if self.disable_initiator_tag is not None:
 
 
1078
            GLib.source_remove(self.disable_initiator_tag)
 
 
1079
            self.disable_initiator_tag = None
 
 
1080
        if getattr(self, "enabled", False):
 
 
1081
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1082
                int(timeout.total_seconds() * 1000), self.disable)
 
 
1083
            self.expires = datetime.datetime.utcnow() + timeout
 
427
1085
    def need_approval(self):
 
428
1086
        self.last_approval_request = datetime.datetime.utcnow()
 
430
1088
    def start_checker(self):
 
431
1089
        """Start a new checker subprocess if one is not running.
 
433
1091
        If a checker already exists, leave it running and do
 
435
1093
        # The reason for not killing a running checker is that if we
 
436
 
        # did that, then if a checker (for some reason) started
 
437
 
        # running slowly and taking more than 'interval' time, the
 
438
 
        # client would inevitably timeout, since no checker would get
 
439
 
        # a chance to run to completion.  If we instead leave running
 
 
1094
        # did that, and if a checker (for some reason) started running
 
 
1095
        # slowly and taking more than 'interval' time, then the client
 
 
1096
        # would inevitably timeout, since no checker would get a
 
 
1097
        # chance to run to completion.  If we instead leave running
 
440
1098
        # checkers alone, the checker would have to take more time
 
441
1099
        # than 'timeout' for the client to be disabled, which is as it
 
444
 
        # If a checker exists, make sure it is not a zombie
 
446
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
447
 
        except (AttributeError, OSError), error:
 
448
 
            if (isinstance(error, OSError)
 
449
 
                and error.errno != errno.ECHILD):
 
453
 
                logger.warning(u"Checker was a zombie")
 
454
 
                gobject.source_remove(self.checker_callback_tag)
 
455
 
                self.checker_callback(pid, status,
 
456
 
                                      self.current_checker_command)
 
 
1102
        if self.checker is not None and not self.checker.is_alive():
 
 
1103
            logger.warning("Checker was not alive; joining")
 
457
1106
        # Start a new checker if needed
 
458
1107
        if self.checker is None:
 
 
1108
            # Escape attributes for the shell
 
 
1110
                attr: re.escape(str(getattr(self, attr)))
 
 
1111
                for attr in self.runtime_expansions}
 
460
 
                # In case checker_command has exactly one % operator
 
461
 
                command = self.checker_command % self.host
 
463
 
                # Escape attributes for the shell
 
464
 
                escaped_attrs = dict(
 
466
 
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
470
 
                    self.runtime_expansions)
 
473
 
                    command = self.checker_command % escaped_attrs
 
474
 
                except TypeError, error:
 
475
 
                    logger.error(u'Could not format string "%s":'
 
476
 
                                 u' %s', self.checker_command, error)
 
477
 
                    return True # Try again later
 
 
1113
                command = self.checker_command % escaped_attrs
 
 
1114
            except TypeError as error:
 
 
1115
                logger.error('Could not format string "%s"',
 
 
1116
                             self.checker_command,
 
 
1118
                return True     # Try again later
 
478
1119
            self.current_checker_command = command
 
480
 
                logger.info(u"Starting checker %r for %s",
 
482
 
                # We don't need to redirect stdout and stderr, since
 
483
 
                # in normal mode, that is already done by daemon(),
 
484
 
                # and in debug mode we don't want to.  (Stdin is
 
485
 
                # always replaced by /dev/null.)
 
486
 
                self.checker = subprocess.Popen(command,
 
488
 
                                                shell=True, cwd=u"/")
 
489
 
                self.checker_callback_tag = (gobject.child_watch_add
 
491
 
                                              self.checker_callback,
 
493
 
                # The checker may have completed before the gobject
 
494
 
                # watch was added.  Check for this.
 
495
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
497
 
                    gobject.source_remove(self.checker_callback_tag)
 
498
 
                    self.checker_callback(pid, status, command)
 
499
 
            except OSError, error:
 
500
 
                logger.error(u"Failed to start subprocess: %s",
 
502
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
1120
            logger.info("Starting checker %r for %s", command,
 
 
1122
            # We don't need to redirect stdout and stderr, since
 
 
1123
            # in normal mode, that is already done by daemon(),
 
 
1124
            # and in debug mode we don't want to.  (Stdin is
 
 
1125
            # always replaced by /dev/null.)
 
 
1126
            # The exception is when not debugging but nevertheless
 
 
1127
            # running in the foreground; use the previously
 
 
1129
            popen_args = {"close_fds": True,
 
 
1132
            if (not self.server_settings["debug"]
 
 
1133
                and self.server_settings["foreground"]):
 
 
1134
                popen_args.update({"stdout": wnull,
 
 
1136
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1137
            self.checker = multiprocessing.Process(
 
 
1139
                args=(pipe[1], subprocess.call, command),
 
 
1141
            self.checker.start()
 
 
1142
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1143
                pipe[0].fileno(), GLib.IO_IN,
 
 
1144
                self.checker_callback, pipe[0], command)
 
 
1145
        # Re-run this periodically if run by GLib.timeout_add
 
505
1148
    def stop_checker(self):
 
506
1149
        """Force the checker process, if any, to stop."""
 
507
1150
        if self.checker_callback_tag:
 
508
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1151
            GLib.source_remove(self.checker_callback_tag)
 
509
1152
            self.checker_callback_tag = None
 
510
 
        if getattr(self, u"checker", None) is None:
 
 
1153
        if getattr(self, "checker", None) is None:
 
512
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
514
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
516
 
            #if self.checker.poll() is None:
 
517
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
518
 
        except OSError, error:
 
519
 
            if error.errno != errno.ESRCH: # No such process
 
 
1155
        logger.debug("Stopping checker for %(name)s", vars(self))
 
 
1156
        self.checker.terminate()
 
521
1157
        self.checker = None
 
523
 
def dbus_service_property(dbus_interface, signature=u"v",
 
524
 
                          access=u"readwrite", byte_arrays=False):
 
 
1160
def dbus_service_property(dbus_interface,
 
525
1164
    """Decorators for marking methods of a DBusObjectWithProperties to
 
526
1165
    become properties on the D-Bus.
 
528
1167
    The decorated method will be called with no arguments by "Get"
 
529
1168
    and with one argument by "Set".
 
531
1170
    The parameters, where they are supported, are the same as
 
532
1171
    dbus.service.method, except there is only "signature", since the
 
533
1172
    type from Get() and the type sent to Set() is the same.
 
535
1174
    # Encoding deeply encoded byte arrays is not supported yet by the
 
536
1175
    # "Set" method, so we fail early here:
 
537
 
    if byte_arrays and signature != u"ay":
 
538
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
539
 
                         u" signature %r" % signature)
 
 
1176
    if byte_arrays and signature != "ay":
 
 
1177
        raise ValueError("Byte arrays not supported for non-'ay'"
 
 
1178
                         " signature {!r}".format(signature))
 
540
1180
    def decorator(func):
 
541
1181
        func._dbus_is_property = True
 
542
1182
        func._dbus_interface = dbus_interface
 
543
1183
        func._dbus_signature = signature
 
544
1184
        func._dbus_access = access
 
545
1185
        func._dbus_name = func.__name__
 
546
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
 
1186
        if func._dbus_name.endswith("_dbus_property"):
 
547
1187
            func._dbus_name = func._dbus_name[:-14]
 
548
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
 
1188
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
 
1194
def dbus_interface_annotations(dbus_interface):
 
 
1195
    """Decorator for marking functions returning interface annotations
 
 
1199
    @dbus_interface_annotations("org.example.Interface")
 
 
1200
    def _foo(self):  # Function name does not matter
 
 
1201
        return {"org.freedesktop.DBus.Deprecated": "true",
 
 
1202
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
 
1206
    def decorator(func):
 
 
1207
        func._dbus_is_interface = True
 
 
1208
        func._dbus_interface = dbus_interface
 
 
1209
        func._dbus_name = dbus_interface
 
 
1215
def dbus_annotations(annotations):
 
 
1216
    """Decorator to annotate D-Bus methods, signals or properties
 
 
1219
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
 
1220
                       "org.freedesktop.DBus.Property."
 
 
1221
                       "EmitsChangedSignal": "false"})
 
 
1222
    @dbus_service_property("org.example.Interface", signature="b",
 
 
1224
    def Property_dbus_property(self):
 
 
1225
        return dbus.Boolean(False)
 
 
1227
    See also the DBusObjectWithAnnotations class.
 
 
1230
    def decorator(func):
 
 
1231
        func._dbus_annotations = annotations
 
550
1234
    return decorator
 
553
1237
class DBusPropertyException(dbus.exceptions.DBusException):
 
554
1238
    """A base class for D-Bus property-related exceptions
 
556
 
    def __unicode__(self):
 
557
 
        return unicode(str(self))
 
560
1243
class DBusPropertyAccessException(DBusPropertyException):
 
 
572
 
class DBusObjectWithProperties(dbus.service.Object):
 
 
1255
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1256
    """A D-Bus object with annotations.
 
 
1258
    Classes inheriting from this can use the dbus_annotations
 
 
1259
    decorator to add annotations to methods or signals.
 
 
1263
    def _is_dbus_thing(thing):
 
 
1264
        """Returns a function testing if an attribute is a D-Bus thing
 
 
1266
        If called like _is_dbus_thing("method") it returns a function
 
 
1267
        suitable for use as predicate to inspect.getmembers().
 
 
1269
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
1272
    def _get_all_dbus_things(self, thing):
 
 
1273
        """Returns a generator of (name, attribute) pairs
 
 
1275
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
1276
                 athing.__get__(self))
 
 
1277
                for cls in self.__class__.__mro__
 
 
1279
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1281
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1283
                         path_keyword='object_path',
 
 
1284
                         connection_keyword='connection')
 
 
1285
    def Introspect(self, object_path, connection):
 
 
1286
        """Overloading of standard D-Bus method.
 
 
1288
        Inserts annotation tags on methods and signals.
 
 
1290
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1293
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1295
            for if_tag in document.getElementsByTagName("interface"):
 
 
1296
                # Add annotation tags
 
 
1297
                for typ in ("method", "signal"):
 
 
1298
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1300
                        for name, prop in (self.
 
 
1301
                                           _get_all_dbus_things(typ)):
 
 
1302
                            if (name == tag.getAttribute("name")
 
 
1303
                                and prop._dbus_interface
 
 
1304
                                == if_tag.getAttribute("name")):
 
 
1305
                                annots.update(getattr(
 
 
1306
                                    prop, "_dbus_annotations", {}))
 
 
1307
                        for name, value in annots.items():
 
 
1308
                            ann_tag = document.createElement(
 
 
1310
                            ann_tag.setAttribute("name", name)
 
 
1311
                            ann_tag.setAttribute("value", value)
 
 
1312
                            tag.appendChild(ann_tag)
 
 
1313
                # Add interface annotation tags
 
 
1314
                for annotation, value in dict(
 
 
1315
                    itertools.chain.from_iterable(
 
 
1316
                        annotations().items()
 
 
1317
                        for name, annotations
 
 
1318
                        in self._get_all_dbus_things("interface")
 
 
1319
                        if name == if_tag.getAttribute("name")
 
 
1321
                    ann_tag = document.createElement("annotation")
 
 
1322
                    ann_tag.setAttribute("name", annotation)
 
 
1323
                    ann_tag.setAttribute("value", value)
 
 
1324
                    if_tag.appendChild(ann_tag)
 
 
1325
                # Fix argument name for the Introspect method itself
 
 
1326
                if (if_tag.getAttribute("name")
 
 
1327
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1328
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1329
                        if cn.getAttribute("name") == "Introspect":
 
 
1330
                            for arg in cn.getElementsByTagName("arg"):
 
 
1331
                                if (arg.getAttribute("direction")
 
 
1333
                                    arg.setAttribute("name",
 
 
1335
            xmlstring = document.toxml("utf-8")
 
 
1337
        except (AttributeError, xml.dom.DOMException,
 
 
1338
                xml.parsers.expat.ExpatError) as error:
 
 
1339
            logger.error("Failed to override Introspection method",
 
 
1344
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
573
1345
    """A D-Bus object with properties.
 
575
1347
    Classes inheriting from this can use the dbus_service_property
 
576
1348
    decorator to expose methods as D-Bus properties.  It exposes the
 
577
1349
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
581
 
    def _is_dbus_property(obj):
 
582
 
        return getattr(obj, u"_dbus_is_property", False)
 
584
 
    def _get_all_dbus_properties(self):
 
585
 
        """Returns a generator of (name, attribute) pairs
 
587
 
        return ((prop._dbus_name, prop)
 
589
 
                inspect.getmembers(self, self._is_dbus_property))
 
591
1352
    def _get_dbus_property(self, interface_name, property_name):
 
592
1353
        """Returns a bound method if one exists which is a D-Bus
 
593
1354
        property with the specified name and interface.
 
595
 
        for name in (property_name,
 
596
 
                     property_name + u"_dbus_property"):
 
597
 
            prop = getattr(self, name, None)
 
599
 
                or not self._is_dbus_property(prop)
 
600
 
                or prop._dbus_name != property_name
 
601
 
                or (interface_name and prop._dbus_interface
 
602
 
                    and interface_name != prop._dbus_interface)):
 
 
1356
        for cls in self.__class__.__mro__:
 
 
1357
            for name, value in inspect.getmembers(
 
 
1358
                    cls, self._is_dbus_thing("property")):
 
 
1359
                if (value._dbus_name == property_name
 
 
1360
                    and value._dbus_interface == interface_name):
 
 
1361
                    return value.__get__(self)
 
605
1363
        # No such property
 
606
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
607
 
                                   + interface_name + u"."
 
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
 
1364
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1365
            self.dbus_object_path, interface_name, property_name))
 
 
1368
    def _get_all_interface_names(cls):
 
 
1369
        """Get a sequence of all interfaces supported by an object"""
 
 
1370
        return (name for name in set(getattr(getattr(x, attr),
 
 
1371
                                             "_dbus_interface", None)
 
 
1372
                                     for x in (inspect.getmro(cls))
 
 
1374
                if name is not None)
 
 
1376
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
612
1379
    def Get(self, interface_name, property_name):
 
613
1380
        """Standard D-Bus property Get() method, see D-Bus standard.
 
615
1382
        prop = self._get_dbus_property(interface_name, property_name)
 
616
 
        if prop._dbus_access == u"write":
 
 
1383
        if prop._dbus_access == "write":
 
617
1384
            raise DBusPropertyAccessException(property_name)
 
619
 
        if not hasattr(value, u"variant_level"):
 
 
1386
        if not hasattr(value, "variant_level"):
 
621
1388
        return type(value)(value, variant_level=value.variant_level+1)
 
623
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
1390
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
624
1391
    def Set(self, interface_name, property_name, value):
 
625
1392
        """Standard D-Bus property Set() method, see D-Bus standard.
 
627
1394
        prop = self._get_dbus_property(interface_name, property_name)
 
628
 
        if prop._dbus_access == u"read":
 
 
1395
        if prop._dbus_access == "read":
 
629
1396
            raise DBusPropertyAccessException(property_name)
 
630
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
1397
        if prop._dbus_get_args_options["byte_arrays"]:
 
631
1398
            # The byte_arrays option is not supported yet on
 
632
1399
            # signatures other than "ay".
 
633
 
            if prop._dbus_signature != u"ay":
 
635
 
            value = dbus.ByteArray(''.join(unichr(byte)
 
 
1400
            if prop._dbus_signature != "ay":
 
 
1401
                raise ValueError("Byte arrays not supported for non-"
 
 
1402
                                 "'ay' signature {!r}"
 
 
1403
                                 .format(prop._dbus_signature))
 
 
1404
            value = dbus.ByteArray(b''.join(chr(byte)
 
639
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
640
 
                         out_signature=u"a{sv}")
 
 
1408
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
1410
                         out_signature="a{sv}")
 
641
1411
    def GetAll(self, interface_name):
 
642
1412
        """Standard D-Bus property GetAll() method, see D-Bus
 
645
1415
        Note: Will not include properties with access="write".
 
648
 
        for name, prop in self._get_all_dbus_properties():
 
 
1418
        for name, prop in self._get_all_dbus_things("property"):
 
649
1419
            if (interface_name
 
650
1420
                and interface_name != prop._dbus_interface):
 
651
1421
                # Interface non-empty but did not match
 
653
1423
            # Ignore write-only properties
 
654
 
            if prop._dbus_access == u"write":
 
 
1424
            if prop._dbus_access == "write":
 
657
 
            if not hasattr(value, u"variant_level"):
 
 
1427
            if not hasattr(value, "variant_level"):
 
 
1428
                properties[name] = value
 
660
 
            all[name] = type(value)(value, variant_level=
 
661
 
                                    value.variant_level+1)
 
662
 
        return dbus.Dictionary(all, signature=u"sv")
 
 
1430
            properties[name] = type(value)(
 
 
1431
                value, variant_level=value.variant_level + 1)
 
 
1432
        return dbus.Dictionary(properties, signature="sv")
 
 
1434
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
 
1435
    def PropertiesChanged(self, interface_name, changed_properties,
 
 
1436
                          invalidated_properties):
 
 
1437
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
664
1442
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
666
1444
                         path_keyword='object_path',
 
667
1445
                         connection_keyword='connection')
 
668
1446
    def Introspect(self, object_path, connection):
 
669
 
        """Standard D-Bus method, overloaded to insert property tags.
 
 
1447
        """Overloading of standard D-Bus method.
 
 
1449
        Inserts property tags and interface annotation tags.
 
671
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1451
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
674
1455
            document = xml.dom.minidom.parseString(xmlstring)
 
675
1457
            def make_tag(document, name, prop):
 
676
 
                e = document.createElement(u"property")
 
677
 
                e.setAttribute(u"name", name)
 
678
 
                e.setAttribute(u"type", prop._dbus_signature)
 
679
 
                e.setAttribute(u"access", prop._dbus_access)
 
 
1458
                e = document.createElement("property")
 
 
1459
                e.setAttribute("name", name)
 
 
1460
                e.setAttribute("type", prop._dbus_signature)
 
 
1461
                e.setAttribute("access", prop._dbus_access)
 
681
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
1464
            for if_tag in document.getElementsByTagName("interface"):
 
682
1466
                for tag in (make_tag(document, name, prop)
 
684
 
                            in self._get_all_dbus_properties()
 
 
1468
                            in self._get_all_dbus_things("property")
 
685
1469
                            if prop._dbus_interface
 
686
 
                            == if_tag.getAttribute(u"name")):
 
 
1470
                            == if_tag.getAttribute("name")):
 
687
1471
                    if_tag.appendChild(tag)
 
 
1472
                # Add annotation tags for properties
 
 
1473
                for tag in if_tag.getElementsByTagName("property"):
 
 
1475
                    for name, prop in self._get_all_dbus_things(
 
 
1477
                        if (name == tag.getAttribute("name")
 
 
1478
                            and prop._dbus_interface
 
 
1479
                            == if_tag.getAttribute("name")):
 
 
1480
                            annots.update(getattr(
 
 
1481
                                prop, "_dbus_annotations", {}))
 
 
1482
                    for name, value in annots.items():
 
 
1483
                        ann_tag = document.createElement(
 
 
1485
                        ann_tag.setAttribute("name", name)
 
 
1486
                        ann_tag.setAttribute("value", value)
 
 
1487
                        tag.appendChild(ann_tag)
 
688
1488
                # Add the names to the return values for the
 
689
1489
                # "org.freedesktop.DBus.Properties" methods
 
690
 
                if (if_tag.getAttribute(u"name")
 
691
 
                    == u"org.freedesktop.DBus.Properties"):
 
692
 
                    for cn in if_tag.getElementsByTagName(u"method"):
 
693
 
                        if cn.getAttribute(u"name") == u"Get":
 
694
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
695
 
                                if (arg.getAttribute(u"direction")
 
697
 
                                    arg.setAttribute(u"name", u"value")
 
698
 
                        elif cn.getAttribute(u"name") == u"GetAll":
 
699
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
700
 
                                if (arg.getAttribute(u"direction")
 
702
 
                                    arg.setAttribute(u"name", u"props")
 
703
 
            xmlstring = document.toxml(u"utf-8")
 
705
 
        except (AttributeError, xml.dom.DOMException,
 
706
 
                xml.parsers.expat.ExpatError), error:
 
707
 
            logger.error(u"Failed to override Introspection method",
 
 
1490
                if (if_tag.getAttribute("name")
 
 
1491
                    == "org.freedesktop.DBus.Properties"):
 
 
1492
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1493
                        if cn.getAttribute("name") == "Get":
 
 
1494
                            for arg in cn.getElementsByTagName("arg"):
 
 
1495
                                if (arg.getAttribute("direction")
 
 
1497
                                    arg.setAttribute("name", "value")
 
 
1498
                        elif cn.getAttribute("name") == "GetAll":
 
 
1499
                            for arg in cn.getElementsByTagName("arg"):
 
 
1500
                                if (arg.getAttribute("direction")
 
 
1502
                                    arg.setAttribute("name", "props")
 
 
1503
            xmlstring = document.toxml("utf-8")
 
 
1505
        except (AttributeError, xml.dom.DOMException,
 
 
1506
                xml.parsers.expat.ExpatError) as error:
 
 
1507
            logger.error("Failed to override Introspection method",
 
 
1513
    dbus.OBJECT_MANAGER_IFACE
 
 
1514
except AttributeError:
 
 
1515
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1518
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1519
    """A D-Bus object with an ObjectManager.
 
 
1521
    Classes inheriting from this exposes the standard
 
 
1522
    GetManagedObjects call and the InterfacesAdded and
 
 
1523
    InterfacesRemoved signals on the standard
 
 
1524
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1526
    Note: No signals are sent automatically; they must be sent
 
 
1529
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1530
                         out_signature="a{oa{sa{sv}}}")
 
 
1531
    def GetManagedObjects(self):
 
 
1532
        """This function must be overridden"""
 
 
1533
        raise NotImplementedError()
 
 
1535
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1536
                         signature="oa{sa{sv}}")
 
 
1537
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1540
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1541
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1544
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1546
                         path_keyword='object_path',
 
 
1547
                         connection_keyword='connection')
 
 
1548
    def Introspect(self, object_path, connection):
 
 
1549
        """Overloading of standard D-Bus method.
 
 
1551
        Override return argument name of GetManagedObjects to be
 
 
1552
        "objpath_interfaces_and_properties"
 
 
1554
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1558
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1560
            for if_tag in document.getElementsByTagName("interface"):
 
 
1561
                # Fix argument name for the GetManagedObjects method
 
 
1562
                if (if_tag.getAttribute("name")
 
 
1563
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1564
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1565
                        if (cn.getAttribute("name")
 
 
1566
                            == "GetManagedObjects"):
 
 
1567
                            for arg in cn.getElementsByTagName("arg"):
 
 
1568
                                if (arg.getAttribute("direction")
 
 
1572
                                        "objpath_interfaces"
 
 
1574
            xmlstring = document.toxml("utf-8")
 
 
1576
        except (AttributeError, xml.dom.DOMException,
 
 
1577
                xml.parsers.expat.ExpatError) as error:
 
 
1578
            logger.error("Failed to override Introspection method",
 
 
1583
def datetime_to_dbus(dt, variant_level=0):
 
 
1584
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
1586
        return dbus.String("", variant_level=variant_level)
 
 
1587
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1590
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1591
    """A class decorator; applied to a subclass of
 
 
1592
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1593
    interface names according to the "alt_interface_names" mapping.
 
 
1596
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1597
                                    "net.example.AlternateInterface"})
 
 
1598
    class SampleDBusObject(dbus.service.Object):
 
 
1599
        @dbus.service.method("org.example.Interface")
 
 
1600
        def SampleDBusMethod():
 
 
1603
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1604
    reachable via two interfaces: "org.example.Interface" and
 
 
1605
    "net.example.AlternateInterface", the latter of which will have
 
 
1606
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1607
    "true", unless "deprecate" is passed with a False value.
 
 
1609
    This works for methods and signals, and also for D-Bus properties
 
 
1610
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1611
    dbus_interface_annotations decorator).
 
 
1615
        for orig_interface_name, alt_interface_name in (
 
 
1616
                alt_interface_names.items()):
 
 
1618
            interface_names = set()
 
 
1619
            # Go though all attributes of the class
 
 
1620
            for attrname, attribute in inspect.getmembers(cls):
 
 
1621
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
 
1622
                # with the wrong interface name
 
 
1623
                if (not hasattr(attribute, "_dbus_interface")
 
 
1624
                    or not attribute._dbus_interface.startswith(
 
 
1625
                        orig_interface_name)):
 
 
1627
                # Create an alternate D-Bus interface name based on
 
 
1629
                alt_interface = attribute._dbus_interface.replace(
 
 
1630
                    orig_interface_name, alt_interface_name)
 
 
1631
                interface_names.add(alt_interface)
 
 
1632
                # Is this a D-Bus signal?
 
 
1633
                if getattr(attribute, "_dbus_is_signal", False):
 
 
1634
                    # Extract the original non-method undecorated
 
 
1635
                    # function by black magic
 
 
1636
                    if sys.version_info.major == 2:
 
 
1637
                        nonmethod_func = (dict(
 
 
1638
                            zip(attribute.func_code.co_freevars,
 
 
1639
                                attribute.__closure__))
 
 
1640
                                          ["func"].cell_contents)
 
 
1642
                        nonmethod_func = (dict(
 
 
1643
                            zip(attribute.__code__.co_freevars,
 
 
1644
                                attribute.__closure__))
 
 
1645
                                          ["func"].cell_contents)
 
 
1646
                    # Create a new, but exactly alike, function
 
 
1647
                    # object, and decorate it to be a new D-Bus signal
 
 
1648
                    # with the alternate D-Bus interface name
 
 
1649
                    new_function = copy_function(nonmethod_func)
 
 
1650
                    new_function = (dbus.service.signal(
 
 
1652
                        attribute._dbus_signature)(new_function))
 
 
1653
                    # Copy annotations, if any
 
 
1655
                        new_function._dbus_annotations = dict(
 
 
1656
                            attribute._dbus_annotations)
 
 
1657
                    except AttributeError:
 
 
1660
                    # Define a creator of a function to call both the
 
 
1661
                    # original and alternate functions, so both the
 
 
1662
                    # original and alternate signals gets sent when
 
 
1663
                    # the function is called
 
 
1664
                    def fixscope(func1, func2):
 
 
1665
                        """This function is a scope container to pass
 
 
1666
                        func1 and func2 to the "call_both" function
 
 
1667
                        outside of its arguments"""
 
 
1669
                        @functools.wraps(func2)
 
 
1670
                        def call_both(*args, **kwargs):
 
 
1671
                            """This function will emit two D-Bus
 
 
1672
                            signals by calling func1 and func2"""
 
 
1673
                            func1(*args, **kwargs)
 
 
1674
                            func2(*args, **kwargs)
 
 
1675
                        # Make wrapper function look like a D-Bus
 
 
1677
                        for name, attr in inspect.getmembers(func2):
 
 
1678
                            if name.startswith("_dbus_"):
 
 
1679
                                setattr(call_both, name, attr)
 
 
1682
                    # Create the "call_both" function and add it to
 
 
1684
                    attr[attrname] = fixscope(attribute, new_function)
 
 
1685
                # Is this a D-Bus method?
 
 
1686
                elif getattr(attribute, "_dbus_is_method", False):
 
 
1687
                    # Create a new, but exactly alike, function
 
 
1688
                    # object.  Decorate it to be a new D-Bus method
 
 
1689
                    # with the alternate D-Bus interface name.  Add it
 
 
1692
                        dbus.service.method(
 
 
1694
                            attribute._dbus_in_signature,
 
 
1695
                            attribute._dbus_out_signature)
 
 
1696
                        (copy_function(attribute)))
 
 
1697
                    # Copy annotations, if any
 
 
1699
                        attr[attrname]._dbus_annotations = dict(
 
 
1700
                            attribute._dbus_annotations)
 
 
1701
                    except AttributeError:
 
 
1703
                # Is this a D-Bus property?
 
 
1704
                elif getattr(attribute, "_dbus_is_property", False):
 
 
1705
                    # Create a new, but exactly alike, function
 
 
1706
                    # object, and decorate it to be a new D-Bus
 
 
1707
                    # property with the alternate D-Bus interface
 
 
1708
                    # name.  Add it to the class.
 
 
1709
                    attr[attrname] = (dbus_service_property(
 
 
1710
                        alt_interface, attribute._dbus_signature,
 
 
1711
                        attribute._dbus_access,
 
 
1712
                        attribute._dbus_get_args_options
 
 
1714
                                      (copy_function(attribute)))
 
 
1715
                    # Copy annotations, if any
 
 
1717
                        attr[attrname]._dbus_annotations = dict(
 
 
1718
                            attribute._dbus_annotations)
 
 
1719
                    except AttributeError:
 
 
1721
                # Is this a D-Bus interface?
 
 
1722
                elif getattr(attribute, "_dbus_is_interface", False):
 
 
1723
                    # Create a new, but exactly alike, function
 
 
1724
                    # object.  Decorate it to be a new D-Bus interface
 
 
1725
                    # with the alternate D-Bus interface name.  Add it
 
 
1728
                        dbus_interface_annotations(alt_interface)
 
 
1729
                        (copy_function(attribute)))
 
 
1731
                # Deprecate all alternate interfaces
 
 
1732
                iname = "_AlternateDBusNames_interface_annotation{}"
 
 
1733
                for interface_name in interface_names:
 
 
1735
                    @dbus_interface_annotations(interface_name)
 
 
1737
                        return {"org.freedesktop.DBus.Deprecated":
 
 
1739
                    # Find an unused name
 
 
1740
                    for aname in (iname.format(i)
 
 
1741
                                  for i in itertools.count()):
 
 
1742
                        if aname not in attr:
 
 
1746
                # Replace the class with a new subclass of it with
 
 
1747
                # methods, signals, etc. as created above.
 
 
1748
                if sys.version_info.major == 2:
 
 
1749
                    cls = type(b"{}Alternate".format(cls.__name__),
 
 
1752
                    cls = type("{}Alternate".format(cls.__name__),
 
 
1759
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1760
                            "se.bsnet.fukt.Mandos"})
 
712
1761
class ClientDBus(Client, DBusObjectWithProperties):
 
713
1762
    """A Client class using D-Bus
 
716
1765
    dbus_object_path: dbus.ObjectPath
 
717
1766
    bus: dbus.SystemBus()
 
720
1769
    runtime_expansions = (Client.runtime_expansions
 
721
 
                          + (u"dbus_object_path",))
 
 
1770
                          + ("dbus_object_path", ))
 
 
1772
    _interface = "se.recompile.Mandos.Client"
 
723
1774
    # dbus.service.Object doesn't use super(), so we can't either.
 
725
 
    def __init__(self, bus = None, *args, **kwargs):
 
726
 
        self._approvals_pending = 0
 
 
1776
    def __init__(self, bus=None, *args, **kwargs):
 
728
1778
        Client.__init__(self, *args, **kwargs)
 
729
1779
        # Only now, when this client is initialized, can it show up on
 
731
 
        client_object_name = unicode(self.name).translate(
 
732
 
            {ord(u"."): ord(u"_"),
 
733
 
             ord(u"-"): ord(u"_")})
 
734
 
        self.dbus_object_path = (dbus.ObjectPath
 
735
 
                                 (u"/clients/" + client_object_name))
 
 
1781
        client_object_name = str(self.name).translate(
 
 
1782
            {ord("."): ord("_"),
 
 
1783
             ord("-"): ord("_")})
 
 
1784
        self.dbus_object_path = dbus.ObjectPath(
 
 
1785
            "/clients/" + client_object_name)
 
736
1786
        DBusObjectWithProperties.__init__(self, self.bus,
 
737
1787
                                          self.dbus_object_path)
 
739
 
    def _get_approvals_pending(self):
 
740
 
        return self._approvals_pending
 
741
 
    def _set_approvals_pending(self, value):
 
742
 
        old_value = self._approvals_pending
 
743
 
        self._approvals_pending = value
 
745
 
        if (hasattr(self, "dbus_object_path")
 
746
 
            and bval is not bool(old_value)):
 
747
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
748
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
751
 
    approvals_pending = property(_get_approvals_pending,
 
752
 
                                 _set_approvals_pending)
 
753
 
    del _get_approvals_pending, _set_approvals_pending
 
756
 
    def _datetime_to_dbus(dt, variant_level=0):
 
757
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
758
 
        return dbus.String(dt.isoformat(),
 
759
 
                           variant_level=variant_level)
 
762
 
        oldstate = getattr(self, u"enabled", False)
 
763
 
        r = Client.enable(self)
 
764
 
        if oldstate != self.enabled:
 
766
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
767
 
                                 dbus.Boolean(True, variant_level=1))
 
768
 
            self.PropertyChanged(
 
769
 
                dbus.String(u"LastEnabled"),
 
770
 
                self._datetime_to_dbus(self.last_enabled,
 
774
 
    def disable(self, quiet = False):
 
775
 
        oldstate = getattr(self, u"enabled", False)
 
776
 
        r = Client.disable(self, quiet=quiet)
 
777
 
        if not quiet and oldstate != self.enabled:
 
779
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
780
 
                                 dbus.Boolean(False, variant_level=1))
 
 
1789
    def notifychangeproperty(transform_func, dbus_name,
 
 
1790
                             type_func=lambda x: x,
 
 
1792
                             invalidate_only=False,
 
 
1793
                             _interface=_interface):
 
 
1794
        """ Modify a variable so that it's a property which announces
 
 
1795
        its changes to DBus.
 
 
1797
        transform_fun: Function that takes a value and a variant_level
 
 
1798
                       and transforms it to a D-Bus type.
 
 
1799
        dbus_name: D-Bus name of the variable
 
 
1800
        type_func: Function that transform the value before sending it
 
 
1801
                   to the D-Bus.  Default: no transform
 
 
1802
        variant_level: D-Bus variant level.  Default: 1
 
 
1804
        attrname = "_{}".format(dbus_name)
 
 
1806
        def setter(self, value):
 
 
1807
            if hasattr(self, "dbus_object_path"):
 
 
1808
                if (not hasattr(self, attrname) or
 
 
1809
                    type_func(getattr(self, attrname, None))
 
 
1810
                    != type_func(value)):
 
 
1812
                        self.PropertiesChanged(
 
 
1813
                            _interface, dbus.Dictionary(),
 
 
1814
                            dbus.Array((dbus_name, )))
 
 
1816
                        dbus_value = transform_func(
 
 
1818
                            variant_level=variant_level)
 
 
1819
                        self.PropertyChanged(dbus.String(dbus_name),
 
 
1821
                        self.PropertiesChanged(
 
 
1823
                            dbus.Dictionary({dbus.String(dbus_name):
 
 
1826
            setattr(self, attrname, value)
 
 
1828
        return property(lambda self: getattr(self, attrname), setter)
 
 
1830
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
 
1831
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
 
1834
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
 
1835
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
 
1837
    checker = notifychangeproperty(
 
 
1838
        dbus.Boolean, "CheckerRunning",
 
 
1839
        type_func=lambda checker: checker is not None)
 
 
1840
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
 
1842
    last_checker_status = notifychangeproperty(dbus.Int16,
 
 
1843
                                               "LastCheckerStatus")
 
 
1844
    last_approval_request = notifychangeproperty(
 
 
1845
        datetime_to_dbus, "LastApprovalRequest")
 
 
1846
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
 
1847
                                               "ApprovedByDefault")
 
 
1848
    approval_delay = notifychangeproperty(
 
 
1849
        dbus.UInt64, "ApprovalDelay",
 
 
1850
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1851
    approval_duration = notifychangeproperty(
 
 
1852
        dbus.UInt64, "ApprovalDuration",
 
 
1853
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1854
    host = notifychangeproperty(dbus.String, "Host")
 
 
1855
    timeout = notifychangeproperty(
 
 
1856
        dbus.UInt64, "Timeout",
 
 
1857
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1858
    extended_timeout = notifychangeproperty(
 
 
1859
        dbus.UInt64, "ExtendedTimeout",
 
 
1860
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1861
    interval = notifychangeproperty(
 
 
1862
        dbus.UInt64, "Interval",
 
 
1863
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1864
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
 
1865
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
 
1866
                                  invalidate_only=True)
 
 
1868
    del notifychangeproperty
 
783
1870
    def __del__(self, *args, **kwargs):
 
785
1872
            self.remove_from_connection()
 
786
1873
        except LookupError:
 
788
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
 
1875
        if hasattr(DBusObjectWithProperties, "__del__"):
 
789
1876
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
790
1877
        Client.__del__(self, *args, **kwargs)
 
792
 
    def checker_callback(self, pid, condition, command,
 
794
 
        self.checker_callback_tag = None
 
797
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
798
 
                             dbus.Boolean(False, variant_level=1))
 
799
 
        if os.WIFEXITED(condition):
 
800
 
            exitstatus = os.WEXITSTATUS(condition)
 
 
1879
    def checker_callback(self, source, condition,
 
 
1880
                         connection, command, *args, **kwargs):
 
 
1881
        ret = Client.checker_callback(self, source, condition,
 
 
1882
                                      connection, command, *args,
 
 
1884
        exitstatus = self.last_checker_status
 
801
1886
            # Emit D-Bus signal
 
802
1887
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
803
 
                                  dbus.Int64(condition),
 
 
1888
                                  # This is specific to GNU libC
 
 
1889
                                  dbus.Int64(exitstatus << 8),
 
804
1890
                                  dbus.String(command))
 
806
1892
            # Emit D-Bus signal
 
807
1893
            self.CheckerCompleted(dbus.Int16(-1),
 
808
 
                                  dbus.Int64(condition),
 
 
1895
                                      # This is specific to GNU libC
 
 
1897
                                      | self.last_checker_signal),
 
809
1898
                                  dbus.String(command))
 
811
 
        return Client.checker_callback(self, pid, condition, command,
 
814
 
    def checked_ok(self, *args, **kwargs):
 
815
 
        r = Client.checked_ok(self, *args, **kwargs)
 
817
 
        self.PropertyChanged(
 
818
 
            dbus.String(u"LastCheckedOK"),
 
819
 
            (self._datetime_to_dbus(self.last_checked_ok,
 
823
 
    def need_approval(self, *args, **kwargs):
 
824
 
        r = Client.need_approval(self, *args, **kwargs)
 
826
 
        self.PropertyChanged(
 
827
 
            dbus.String(u"LastApprovalRequest"),
 
828
 
            (self._datetime_to_dbus(self.last_approval_request,
 
832
1901
    def start_checker(self, *args, **kwargs):
 
833
 
        old_checker = self.checker
 
834
 
        if self.checker is not None:
 
835
 
            old_checker_pid = self.checker.pid
 
837
 
            old_checker_pid = None
 
 
1902
        old_checker_pid = getattr(self.checker, "pid", None)
 
838
1903
        r = Client.start_checker(self, *args, **kwargs)
 
839
1904
        # Only if new checker process was started
 
840
1905
        if (self.checker is not None
 
841
1906
            and old_checker_pid != self.checker.pid):
 
842
1907
            # Emit D-Bus signal
 
843
1908
            self.CheckerStarted(self.current_checker_command)
 
844
 
            self.PropertyChanged(
 
845
 
                dbus.String(u"CheckerRunning"),
 
846
 
                dbus.Boolean(True, variant_level=1))
 
849
 
    def stop_checker(self, *args, **kwargs):
 
850
 
        old_checker = getattr(self, u"checker", None)
 
851
 
        r = Client.stop_checker(self, *args, **kwargs)
 
852
 
        if (old_checker is not None
 
853
 
            and getattr(self, u"checker", None) is None):
 
854
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
855
 
                                 dbus.Boolean(False, variant_level=1))
 
858
1911
    def _reset_approved(self):
 
859
 
        self._approved = None
 
 
1912
        self.approved = None
 
862
1915
    def approve(self, value=True):
 
 
1916
        self.approved = value
 
 
1917
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
 
1918
                             * 1000), self._reset_approved)
 
863
1919
        self.send_changedstate()
 
864
 
        self._approved = value
 
865
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
866
 
                            (self.approval_duration),
 
867
 
                            self._reset_approved)
 
870
 
    ## D-Bus methods, signals & properties
 
871
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
 
1921
    #  D-Bus methods, signals & properties
 
875
1927
    # CheckerCompleted - signal
 
876
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
 
1928
    @dbus.service.signal(_interface, signature="nxs")
 
877
1929
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
881
1933
    # CheckerStarted - signal
 
882
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
1934
    @dbus.service.signal(_interface, signature="s")
 
883
1935
    def CheckerStarted(self, command):
 
887
1939
    # PropertyChanged - signal
 
888
 
    @dbus.service.signal(_interface, signature=u"sv")
 
 
1940
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
 
1941
    @dbus.service.signal(_interface, signature="sv")
 
889
1942
    def PropertyChanged(self, property, value):
 
893
1946
    # GotSecret - signal
 
894
1947
    @dbus.service.signal(_interface)
 
895
1948
    def GotSecret(self):
 
 
1120
2190
            self.start_checker()
 
1122
2192
            self.stop_checker()
 
1124
2194
    # ObjectPath - property
 
1125
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
 
2196
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
 
2197
         "org.freedesktop.DBus.Deprecated": "true"})
 
 
2198
    @dbus_service_property(_interface, signature="o", access="read")
 
1126
2199
    def ObjectPath_dbus_property(self):
 
1127
 
        return self.dbus_object_path # is already a dbus.ObjectPath
 
 
2200
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
1129
2202
    # Secret = property
 
1130
 
    @dbus_service_property(_interface, signature=u"ay",
 
1131
 
                           access=u"write", byte_arrays=True)
 
 
2204
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
 
2206
    @dbus_service_property(_interface,
 
1132
2210
    def Secret_dbus_property(self, value):
 
1133
 
        self.secret = str(value)
 
 
2211
        self.secret = bytes(value)
 
1138
2216
class ProxyClient(object):
 
1139
 
    def __init__(self, child_pipe, fpr, address):
 
 
2217
    def __init__(self, child_pipe, key_id, fpr, address):
 
1140
2218
        self._pipe = child_pipe
 
1141
 
        self._pipe.send(('init', fpr, address))
 
 
2219
        self._pipe.send(('init', key_id, fpr, address))
 
1142
2220
        if not self._pipe.recv():
 
 
2221
            raise KeyError(key_id or fpr)
 
1145
2223
    def __getattribute__(self, name):
 
1146
 
        if(name == '_pipe'):
 
1147
2225
            return super(ProxyClient, self).__getattribute__(name)
 
1148
2226
        self._pipe.send(('getattr', name))
 
1149
2227
        data = self._pipe.recv()
 
1150
2228
        if data[0] == 'data':
 
1152
2230
        if data[0] == 'function':
 
1153
2232
            def func(*args, **kwargs):
 
1154
2233
                self._pipe.send(('funcall', name, args, kwargs))
 
1155
2234
                return self._pipe.recv()[1]
 
1158
2238
    def __setattr__(self, name, value):
 
1159
 
        if(name == '_pipe'):
 
1160
2240
            return super(ProxyClient, self).__setattr__(name, value)
 
1161
2241
        self._pipe.send(('setattr', name, value))
 
1164
2244
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1165
2245
    """A class to handle client connections.
 
1167
2247
    Instantiated once for each connection to handle it.
 
1168
2248
    Note: This will run in its own forked process."""
 
1170
2250
    def handle(self):
 
1171
2251
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1172
 
            logger.info(u"TCP connection from: %s",
 
1173
 
                        unicode(self.client_address))
 
1174
 
            logger.debug(u"Pipe FD: %d",
 
 
2252
            logger.info("TCP connection from: %s",
 
 
2253
                        str(self.client_address))
 
 
2254
            logger.debug("Pipe FD: %d",
 
1175
2255
                         self.server.child_pipe.fileno())
 
1177
 
            session = (gnutls.connection
 
1178
 
                       .ClientSession(self.request,
 
1180
 
                                      .X509Credentials()))
 
1182
 
            # Note: gnutls.connection.X509Credentials is really a
 
1183
 
            # generic GnuTLS certificate credentials object so long as
 
1184
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1185
 
            # here despite using OpenPGP certificates.
 
1187
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1188
 
            #                      u"+AES-256-CBC", u"+SHA1",
 
1189
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
 
2257
            session = gnutls.ClientSession(self.request)
 
 
2259
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2260
            #                       "+AES-256-CBC", "+SHA1",
 
 
2261
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1191
2263
            # Use a fallback default, since this MUST be set.
 
1192
2264
            priority = self.server.gnutls_priority
 
1193
2265
            if priority is None:
 
1194
 
                priority = u"NORMAL"
 
1195
 
            (gnutls.library.functions
 
1196
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2267
            gnutls.priority_set_direct(session._c_object,
 
 
2268
                                       priority.encode("utf-8"),
 
1199
2271
            # Start communication using the Mandos protocol
 
1200
2272
            # Get protocol number
 
1201
2273
            line = self.request.makefile().readline()
 
1202
 
            logger.debug(u"Protocol version: %r", line)
 
 
2274
            logger.debug("Protocol version: %r", line)
 
1204
2276
                if int(line.strip().split()[0]) > 1:
 
1206
 
            except (ValueError, IndexError, RuntimeError), error:
 
1207
 
                logger.error(u"Unknown protocol version: %s", error)
 
 
2277
                    raise RuntimeError(line)
 
 
2278
            except (ValueError, IndexError, RuntimeError) as error:
 
 
2279
                logger.error("Unknown protocol version: %s", error)
 
1210
2282
            # Start GnuTLS connection
 
1212
2284
                session.handshake()
 
1213
 
            except gnutls.errors.GNUTLSError, error:
 
1214
 
                logger.warning(u"Handshake failed: %s", error)
 
 
2285
            except gnutls.Error as error:
 
 
2286
                logger.warning("Handshake failed: %s", error)
 
1215
2287
                # Do not run session.bye() here: the session is not
 
1216
2288
                # established.  Just abandon the request.
 
1218
 
            logger.debug(u"Handshake succeeded")
 
 
2290
            logger.debug("Handshake succeeded")
 
1220
2292
            approval_required = False
 
1223
 
                    fpr = self.fingerprint(self.peer_certificate
 
1225
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1226
 
                    logger.warning(u"Bad certificate: %s", error)
 
1228
 
                logger.debug(u"Fingerprint: %s", fpr)
 
1231
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2294
                if gnutls.has_rawpk:
 
 
2297
                        key_id = self.key_id(
 
 
2298
                            self.peer_certificate(session))
 
 
2299
                    except (TypeError, gnutls.Error) as error:
 
 
2300
                        logger.warning("Bad certificate: %s", error)
 
 
2302
                    logger.debug("Key ID: %s", key_id)
 
 
2307
                        fpr = self.fingerprint(
 
 
2308
                            self.peer_certificate(session))
 
 
2309
                    except (TypeError, gnutls.Error) as error:
 
 
2310
                        logger.warning("Bad certificate: %s", error)
 
 
2312
                    logger.debug("Fingerprint: %s", fpr)
 
 
2315
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1232
2316
                                         self.client_address)
 
1233
2317
                except KeyError:
 
1236
2320
                if client.approval_delay:
 
1237
2321
                    delay = client.approval_delay
 
1238
2322
                    client.approvals_pending += 1
 
1239
2323
                    approval_required = True
 
1242
2326
                    if not client.enabled:
 
1243
 
                        logger.warning(u"Client %s is disabled",
 
 
2327
                        logger.info("Client %s is disabled",
 
1245
2329
                        if self.server.use_dbus:
 
1246
2330
                            # Emit D-Bus signal
 
1247
 
                            client.Rejected("Disabled")                    
 
 
2331
                            client.Rejected("Disabled")
 
1250
 
                    if client._approved or not client.approval_delay:
 
1251
 
                        #We are approved or approval is disabled
 
 
2334
                    if client.approved or not client.approval_delay:
 
 
2335
                        # We are approved or approval is disabled
 
1253
 
                    elif client._approved is None:
 
1254
 
                        logger.info(u"Client %s needs approval",
 
 
2337
                    elif client.approved is None:
 
 
2338
                        logger.info("Client %s needs approval",
 
1256
2340
                        if self.server.use_dbus:
 
1257
2341
                            # Emit D-Bus signal
 
1258
2342
                            client.NeedApproval(
 
1259
 
                                client.approval_delay_milliseconds(),
 
1260
 
                                client.approved_by_default)
 
 
2343
                                client.approval_delay.total_seconds()
 
 
2344
                                * 1000, client.approved_by_default)
 
1262
 
                        logger.warning(u"Client %s was not approved",
 
 
2346
                        logger.warning("Client %s was not approved",
 
1264
2348
                        if self.server.use_dbus:
 
1265
2349
                            # Emit D-Bus signal
 
1266
2350
                            client.Rejected("Denied")
 
1269
 
                    #wait until timeout or approved
 
1270
 
                    #x = float(client._timedelta_to_milliseconds(delay))
 
 
2353
                    # wait until timeout or approved
 
1271
2354
                    time = datetime.datetime.now()
 
1272
2355
                    client.changedstate.acquire()
 
1273
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
 
2356
                    client.changedstate.wait(delay.total_seconds())
 
1274
2357
                    client.changedstate.release()
 
1275
2358
                    time2 = datetime.datetime.now()
 
1276
2359
                    if (time2 - time) >= delay:
 
 
1288
2371
                        delay -= time2 - time
 
1291
 
                while sent_size < len(client.secret):
 
1293
 
                        sent = session.send(client.secret[sent_size:])
 
1294
 
                    except (gnutls.errors.GNUTLSError), error:
 
1295
 
                        logger.warning("gnutls send failed")
 
1297
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1298
 
                                 sent, len(client.secret)
 
1299
 
                                 - (sent_size + sent))
 
1302
 
                logger.info(u"Sending secret to %s", client.name)
 
1303
 
                # bump the timeout as if seen
 
 
2374
                    session.send(client.secret)
 
 
2375
                except gnutls.Error as error:
 
 
2376
                    logger.warning("gnutls send failed",
 
 
2380
                logger.info("Sending secret to %s", client.name)
 
 
2381
                # bump the timeout using extended_timeout
 
 
2382
                client.bump_timeout(client.extended_timeout)
 
1305
2383
                if self.server.use_dbus:
 
1306
2384
                    # Emit D-Bus signal
 
1307
2385
                    client.GotSecret()
 
1310
2388
                if approval_required:
 
1311
2389
                    client.approvals_pending -= 1
 
1314
 
                except (gnutls.errors.GNUTLSError), error:
 
1315
 
                    logger.warning("GnuTLS bye failed")
 
 
2392
                except gnutls.Error as error:
 
 
2393
                    logger.warning("GnuTLS bye failed",
 
1318
2397
    def peer_certificate(session):
 
1319
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1320
 
        # If not an OpenPGP certificate...
 
1321
 
        if (gnutls.library.functions
 
1322
 
            .gnutls_certificate_type_get(session._c_object)
 
1323
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1324
 
            # ...do the normal thing
 
1325
 
            return session.peer_certificate
 
 
2398
        "Return the peer's certificate as a bytestring"
 
 
2400
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2402
        except AttributeError:
 
 
2403
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2404
        if gnutls.has_rawpk:
 
 
2405
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2407
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2408
        # If not a valid certificate type...
 
 
2409
        if cert_type not in valid_cert_types:
 
 
2410
            logger.info("Cert type %r not in %r", cert_type,
 
 
2412
            # ...return invalid data
 
1326
2414
        list_size = ctypes.c_uint(1)
 
1327
 
        cert_list = (gnutls.library.functions
 
1328
 
                     .gnutls_certificate_get_peers
 
 
2415
        cert_list = (gnutls.certificate_get_peers
 
1329
2416
                     (session._c_object, ctypes.byref(list_size)))
 
1330
2417
        if not bool(cert_list) and list_size.value != 0:
 
1331
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
 
2418
            raise gnutls.Error("error getting peer certificate")
 
1333
2419
        if list_size.value == 0:
 
1335
2421
        cert = cert_list[0]
 
1336
2422
        return ctypes.string_at(cert.data, cert.size)
 
 
2425
    def key_id(certificate):
 
 
2426
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2427
        # New GnuTLS "datum" with the public key
 
 
2428
        datum = gnutls.datum_t(
 
 
2429
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2430
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2431
            ctypes.c_uint(len(certificate)))
 
 
2432
        # XXX all these need to be created in the gnutls "module"
 
 
2433
        # New empty GnuTLS certificate
 
 
2434
        pubkey = gnutls.pubkey_t()
 
 
2435
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2436
        # Import the raw public key into the certificate
 
 
2437
        gnutls.pubkey_import(pubkey,
 
 
2438
                             ctypes.byref(datum),
 
 
2439
                             gnutls.X509_FMT_DER)
 
 
2440
        # New buffer for the key ID
 
 
2441
        buf = ctypes.create_string_buffer(32)
 
 
2442
        buf_len = ctypes.c_size_t(len(buf))
 
 
2443
        # Get the key ID from the raw public key into the buffer
 
 
2444
        gnutls.pubkey_get_key_id(pubkey,
 
 
2445
                                 gnutls.KEYID_USE_SHA256,
 
 
2446
                                 ctypes.cast(ctypes.byref(buf),
 
 
2447
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2448
                                 ctypes.byref(buf_len))
 
 
2449
        # Deinit the certificate
 
 
2450
        gnutls.pubkey_deinit(pubkey)
 
 
2452
        # Convert the buffer to a Python bytestring
 
 
2453
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2454
        # Convert the bytestring to hexadecimal notation
 
 
2455
        hex_key_id = binascii.hexlify(key_id).upper()
 
1339
2459
    def fingerprint(openpgp):
 
1340
2460
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1341
2461
        # New GnuTLS "datum" with the OpenPGP public key
 
1342
 
        datum = (gnutls.library.types
 
1343
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1346
 
                                 ctypes.c_uint(len(openpgp))))
 
 
2462
        datum = gnutls.datum_t(
 
 
2463
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2464
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2465
            ctypes.c_uint(len(openpgp)))
 
1347
2466
        # New empty GnuTLS certificate
 
1348
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1349
 
        (gnutls.library.functions
 
1350
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2467
        crt = gnutls.openpgp_crt_t()
 
 
2468
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1351
2469
        # Import the OpenPGP public key into the certificate
 
1352
 
        (gnutls.library.functions
 
1353
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1354
 
                                    gnutls.library.constants
 
1355
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2470
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2471
                                  gnutls.OPENPGP_FMT_RAW)
 
1356
2472
        # Verify the self signature in the key
 
1357
2473
        crtverify = ctypes.c_uint()
 
1358
 
        (gnutls.library.functions
 
1359
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1360
 
                                         ctypes.byref(crtverify)))
 
 
2474
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2475
                                       ctypes.byref(crtverify))
 
1361
2476
        if crtverify.value != 0:
 
1362
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1363
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2477
            gnutls.openpgp_crt_deinit(crt)
 
 
2478
            raise gnutls.CertificateSecurityError(code
 
1365
2480
        # New buffer for the fingerprint
 
1366
2481
        buf = ctypes.create_string_buffer(20)
 
1367
2482
        buf_len = ctypes.c_size_t()
 
1368
2483
        # Get the fingerprint from the certificate into the buffer
 
1369
 
        (gnutls.library.functions
 
1370
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1371
 
                                             ctypes.byref(buf_len)))
 
 
2484
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2485
                                           ctypes.byref(buf_len))
 
1372
2486
        # Deinit the certificate
 
1373
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2487
        gnutls.openpgp_crt_deinit(crt)
 
1374
2488
        # Convert the buffer to a Python bytestring
 
1375
2489
        fpr = ctypes.string_at(buf, buf_len.value)
 
1376
2490
        # Convert the bytestring to hexadecimal notation
 
1377
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
 
2491
        hex_fpr = binascii.hexlify(fpr).upper()
 
1381
2495
class MultiprocessingMixIn(object):
 
1382
2496
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1383
2498
    def sub_process_main(self, request, address):
 
1385
2500
            self.finish_request(request, address)
 
1387
2502
            self.handle_error(request, address)
 
1388
2503
        self.close_request(request)
 
1390
2505
    def process_request(self, request, address):
 
1391
2506
        """Start a new process to process the request."""
 
1392
 
        multiprocessing.Process(target = self.sub_process_main,
 
1393
 
                                args = (request, address)).start()
 
 
2507
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2508
                                       args=(request, address))
 
1395
2513
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1396
2514
    """ adds a pipe to the MixIn """
 
1397
2516
    def process_request(self, request, client_address):
 
1398
2517
        """Overrides and wraps the original process_request().
 
1400
2519
        This function creates a new pipe in self.pipe
 
1402
2521
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1404
 
        super(MultiprocessingMixInWithPipe,
 
1405
 
              self).process_request(request, client_address)
 
 
2523
        proc = MultiprocessingMixIn.process_request(self, request,
 
1406
2525
        self.child_pipe.close()
 
1407
 
        self.add_pipe(parent_pipe)
 
 
2526
        self.add_pipe(parent_pipe, proc)
 
1409
 
    def add_pipe(self, parent_pipe):
 
 
2528
    def add_pipe(self, parent_pipe, proc):
 
1410
2529
        """Dummy function; override as necessary"""
 
 
2530
        raise NotImplementedError()
 
1413
2533
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1414
2534
                     socketserver.TCPServer, object):
 
1415
2535
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1418
2538
        enabled:        Boolean; whether this server is activated yet
 
1419
2539
        interface:      None or a network interface name (string)
 
1420
2540
        use_ipv6:       Boolean; to use IPv6 or not
 
1422
2543
    def __init__(self, server_address, RequestHandlerClass,
 
1423
 
                 interface=None, use_ipv6=True):
 
 
2547
        """If socketfd is set, use that file descriptor instead of
 
 
2548
        creating a new one with socket.socket().
 
1424
2550
        self.interface = interface
 
1426
2552
            self.address_family = socket.AF_INET6
 
 
2553
        if socketfd is not None:
 
 
2554
            # Save the file descriptor
 
 
2555
            self.socketfd = socketfd
 
 
2556
            # Save the original socket.socket() function
 
 
2557
            self.socket_socket = socket.socket
 
 
2559
            # To implement --socket, we monkey patch socket.socket.
 
 
2561
            # (When socketserver.TCPServer is a new-style class, we
 
 
2562
            # could make self.socket into a property instead of monkey
 
 
2563
            # patching socket.socket.)
 
 
2565
            # Create a one-time-only replacement for socket.socket()
 
 
2566
            @functools.wraps(socket.socket)
 
 
2567
            def socket_wrapper(*args, **kwargs):
 
 
2568
                # Restore original function so subsequent calls are
 
 
2570
                socket.socket = self.socket_socket
 
 
2571
                del self.socket_socket
 
 
2572
                # This time only, return a new socket object from the
 
 
2573
                # saved file descriptor.
 
 
2574
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
2575
            # Replace socket.socket() function with wrapper
 
 
2576
            socket.socket = socket_wrapper
 
 
2577
        # The socketserver.TCPServer.__init__ will call
 
 
2578
        # socket.socket(), which might be our replacement,
 
 
2579
        # socket_wrapper(), if socketfd was set.
 
1427
2580
        socketserver.TCPServer.__init__(self, server_address,
 
1428
2581
                                        RequestHandlerClass)
 
1429
2583
    def server_bind(self):
 
1430
2584
        """This overrides the normal server_bind() function
 
1431
2585
        to bind to an interface if one was specified, and also NOT to
 
1432
2586
        bind to an address or port if they were not specified."""
 
 
2587
        global SO_BINDTODEVICE
 
1433
2588
        if self.interface is not None:
 
1434
2589
            if SO_BINDTODEVICE is None:
 
1435
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1436
 
                             u" cannot bind to interface %s",
 
1440
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1444
 
                except socket.error, error:
 
1445
 
                    if error[0] == errno.EPERM:
 
1446
 
                        logger.error(u"No permission to"
 
1447
 
                                     u" bind to interface %s",
 
1449
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1450
 
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1451
 
                                     u" cannot bind to interface %s",
 
 
2590
                # Fall back to a hard-coded value which seems to be
 
 
2592
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2593
                SO_BINDTODEVICE = 25
 
 
2595
                self.socket.setsockopt(
 
 
2596
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2597
                    (self.interface + "\0").encode("utf-8"))
 
 
2598
            except socket.error as error:
 
 
2599
                if error.errno == errno.EPERM:
 
 
2600
                    logger.error("No permission to bind to"
 
 
2601
                                 " interface %s", self.interface)
 
 
2602
                elif error.errno == errno.ENOPROTOOPT:
 
 
2603
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2604
                                 " cannot bind to interface %s",
 
 
2606
                elif error.errno == errno.ENODEV:
 
 
2607
                    logger.error("Interface %s does not exist,"
 
 
2608
                                 " cannot bind", self.interface)
 
1455
2611
        # Only bind(2) the socket if we really need to.
 
1456
2612
        if self.server_address[0] or self.server_address[1]:
 
 
2613
            if self.server_address[1]:
 
 
2614
                self.allow_reuse_address = True
 
1457
2615
            if not self.server_address[0]:
 
1458
2616
                if self.address_family == socket.AF_INET6:
 
1459
 
                    any_address = u"::" # in6addr_any
 
 
2617
                    any_address = "::"  # in6addr_any
 
1461
 
                    any_address = socket.INADDR_ANY
 
 
2619
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1462
2620
                self.server_address = (any_address,
 
1463
2621
                                       self.server_address[1])
 
1464
2622
            elif not self.server_address[1]:
 
1465
 
                self.server_address = (self.server_address[0],
 
 
2623
                self.server_address = (self.server_address[0], 0)
 
1467
2624
#                 if self.interface:
 
1468
2625
#                     self.server_address = (self.server_address[0],
 
 
 
2754
def rfc3339_duration_to_delta(duration):
 
 
2755
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2757
    >>> rfc3339_duration_to_delta("P7D")
 
 
2758
    datetime.timedelta(7)
 
 
2759
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2760
    datetime.timedelta(0, 60)
 
 
2761
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2762
    datetime.timedelta(0, 3600)
 
 
2763
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2764
    datetime.timedelta(1)
 
 
2765
    >>> rfc3339_duration_to_delta("P1W")
 
 
2766
    datetime.timedelta(7)
 
 
2767
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2768
    datetime.timedelta(0, 330)
 
 
2769
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2770
    datetime.timedelta(1, 200)
 
 
2773
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2774
    # possible - there would have to be multiple places for the same
 
 
2775
    # values, like seconds.  The current code, while more esoteric, is
 
 
2776
    # cleaner without depending on a parsing library.  If Python had a
 
 
2777
    # built-in library for parsing we would use it, but we'd like to
 
 
2778
    # avoid excessive use of external libraries.
 
 
2780
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2781
    Token = collections.namedtuple("Token", (
 
 
2782
        "regexp",  # To match token; if "value" is not None, must have
 
 
2783
                   # a "group" containing digits
 
 
2784
        "value",   # datetime.timedelta or None
 
 
2785
        "followers"))           # Tokens valid after this token
 
 
2786
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2787
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2788
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2789
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2790
                         datetime.timedelta(seconds=1),
 
 
2791
                         frozenset((token_end, )))
 
 
2792
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2793
                         datetime.timedelta(minutes=1),
 
 
2794
                         frozenset((token_second, token_end)))
 
 
2795
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2796
                       datetime.timedelta(hours=1),
 
 
2797
                       frozenset((token_minute, token_end)))
 
 
2798
    token_time = Token(re.compile(r"T"),
 
 
2800
                       frozenset((token_hour, token_minute,
 
 
2802
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2803
                      datetime.timedelta(days=1),
 
 
2804
                      frozenset((token_time, token_end)))
 
 
2805
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2806
                        datetime.timedelta(weeks=4),
 
 
2807
                        frozenset((token_day, token_end)))
 
 
2808
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2809
                       datetime.timedelta(weeks=52),
 
 
2810
                       frozenset((token_month, token_end)))
 
 
2811
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2812
                       datetime.timedelta(weeks=1),
 
 
2813
                       frozenset((token_end, )))
 
 
2814
    token_duration = Token(re.compile(r"P"), None,
 
 
2815
                           frozenset((token_year, token_month,
 
 
2816
                                      token_day, token_time,
 
 
2818
    # Define starting values:
 
 
2820
    value = datetime.timedelta()
 
 
2822
    # Following valid tokens
 
 
2823
    followers = frozenset((token_duration, ))
 
 
2824
    # String left to parse
 
 
2826
    # Loop until end token is found
 
 
2827
    while found_token is not token_end:
 
 
2828
        # Search for any currently valid tokens
 
 
2829
        for token in followers:
 
 
2830
            match = token.regexp.match(s)
 
 
2831
            if match is not None:
 
 
2833
                if token.value is not None:
 
 
2834
                    # Value found, parse digits
 
 
2835
                    factor = int(match.group(1), 10)
 
 
2836
                    # Add to value so far
 
 
2837
                    value += factor * token.value
 
 
2838
                # Strip token from string
 
 
2839
                s = token.regexp.sub("", s, 1)
 
 
2842
                # Set valid next tokens
 
 
2843
                followers = found_token.followers
 
 
2846
            # No currently valid tokens were found
 
 
2847
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
1582
2853
def string_to_delta(interval):
 
1583
2854
    """Parse a string and return a datetime.timedelta
 
1585
 
    >>> string_to_delta(u'7d')
 
 
2856
    >>> string_to_delta('7d')
 
1586
2857
    datetime.timedelta(7)
 
1587
 
    >>> string_to_delta(u'60s')
 
 
2858
    >>> string_to_delta('60s')
 
1588
2859
    datetime.timedelta(0, 60)
 
1589
 
    >>> string_to_delta(u'60m')
 
 
2860
    >>> string_to_delta('60m')
 
1590
2861
    datetime.timedelta(0, 3600)
 
1591
 
    >>> string_to_delta(u'24h')
 
 
2862
    >>> string_to_delta('24h')
 
1592
2863
    datetime.timedelta(1)
 
1593
 
    >>> string_to_delta(u'1w')
 
 
2864
    >>> string_to_delta('1w')
 
1594
2865
    datetime.timedelta(7)
 
1595
 
    >>> string_to_delta(u'5m 30s')
 
 
2866
    >>> string_to_delta('5m 30s')
 
1596
2867
    datetime.timedelta(0, 330)
 
 
2871
        return rfc3339_duration_to_delta(interval)
 
1598
2875
    timevalue = datetime.timedelta(0)
 
1599
2876
    for s in interval.split():
 
1601
 
            suffix = unicode(s[-1])
 
1602
2879
            value = int(s[:-1])
 
1604
2881
                delta = datetime.timedelta(value)
 
1605
 
            elif suffix == u"s":
 
1606
2883
                delta = datetime.timedelta(0, value)
 
1607
 
            elif suffix == u"m":
 
1608
2885
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
1609
 
            elif suffix == u"h":
 
1610
2887
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
1611
 
            elif suffix == u"w":
 
1612
2889
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
1614
 
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1615
 
        except (ValueError, IndexError), e:
 
1616
 
            raise ValueError(e.message)
 
 
2891
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
 
2892
        except IndexError as e:
 
 
2893
            raise ValueError(*(e.args))
 
1617
2894
        timevalue += delta
 
1618
2895
    return timevalue
 
1621
 
def if_nametoindex(interface):
 
1622
 
    """Call the C function if_nametoindex(), or equivalent
 
1624
 
    Note: This function cannot accept a unicode string."""
 
1625
 
    global if_nametoindex
 
1627
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1628
 
                          (ctypes.util.find_library(u"c"))
 
1630
 
    except (OSError, AttributeError):
 
1631
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1632
 
        def if_nametoindex(interface):
 
1633
 
            "Get an interface index the hard way, i.e. using fcntl()"
 
1634
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1635
 
            with contextlib.closing(socket.socket()) as s:
 
1636
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1637
 
                                    struct.pack(str(u"16s16x"),
 
1639
 
            interface_index = struct.unpack(str(u"I"),
 
1641
 
            return interface_index
 
1642
 
    return if_nametoindex(interface)
 
1645
 
def daemon(nochdir = False, noclose = False):
 
 
2898
def daemon(nochdir=False, noclose=False):
 
1646
2899
    """See daemon(3).  Standard BSD Unix function.
 
1648
2901
    This should really exist as os.daemon, but it doesn't (yet)."""
 
1652
2905
    if not nochdir:
 
1656
2909
    if not noclose:
 
1657
2910
        # Close all standard open file descriptors
 
1658
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
2911
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1659
2912
        if not stat.S_ISCHR(os.fstat(null).st_mode):
 
1660
2913
            raise OSError(errno.ENODEV,
 
1661
 
                          u"%s not a character device"
 
 
2914
                          "{} not a character device"
 
 
2915
                          .format(os.devnull))
 
1663
2916
        os.dup2(null, sys.stdin.fileno())
 
1664
2917
        os.dup2(null, sys.stdout.fileno())
 
1665
2918
        os.dup2(null, sys.stderr.fileno())
 
 
1672
2925
    ##################################################################
 
1673
2926
    # Parsing of options, both command line and config file
 
1675
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1676
 
    parser.add_option("-i", u"--interface", type=u"string",
 
1677
 
                      metavar="IF", help=u"Bind to interface IF")
 
1678
 
    parser.add_option("-a", u"--address", type=u"string",
 
1679
 
                      help=u"Address to listen for requests on")
 
1680
 
    parser.add_option("-p", u"--port", type=u"int",
 
1681
 
                      help=u"Port number to receive requests on")
 
1682
 
    parser.add_option("--check", action=u"store_true",
 
1683
 
                      help=u"Run self-test")
 
1684
 
    parser.add_option("--debug", action=u"store_true",
 
1685
 
                      help=u"Debug mode; run in foreground and log to"
 
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
 
1688
 
                      help=u"Debug level for stdout output")
 
1689
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1690
 
                      u" priority string (see GnuTLS documentation)")
 
1691
 
    parser.add_option("--servicename", type=u"string",
 
1692
 
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1693
 
    parser.add_option("--configdir", type=u"string",
 
1694
 
                      default=u"/etc/mandos", metavar=u"DIR",
 
1695
 
                      help=u"Directory to search for configuration"
 
1697
 
    parser.add_option("--no-dbus", action=u"store_false",
 
1698
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1699
 
                      u" system bus interface")
 
1700
 
    parser.add_option("--no-ipv6", action=u"store_false",
 
1701
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1702
 
    options = parser.parse_args()[0]
 
 
2928
    parser = argparse.ArgumentParser()
 
 
2929
    parser.add_argument("-v", "--version", action="version",
 
 
2930
                        version="%(prog)s {}".format(version),
 
 
2931
                        help="show version number and exit")
 
 
2932
    parser.add_argument("-i", "--interface", metavar="IF",
 
 
2933
                        help="Bind to interface IF")
 
 
2934
    parser.add_argument("-a", "--address",
 
 
2935
                        help="Address to listen for requests on")
 
 
2936
    parser.add_argument("-p", "--port", type=int,
 
 
2937
                        help="Port number to receive requests on")
 
 
2938
    parser.add_argument("--check", action="store_true",
 
 
2939
                        help="Run self-test")
 
 
2940
    parser.add_argument("--debug", action="store_true",
 
 
2941
                        help="Debug mode; run in foreground and log"
 
 
2942
                        " to terminal", default=None)
 
 
2943
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
 
2944
                        help="Debug level for stdout output")
 
 
2945
    parser.add_argument("--priority", help="GnuTLS"
 
 
2946
                        " priority string (see GnuTLS documentation)")
 
 
2947
    parser.add_argument("--servicename",
 
 
2948
                        metavar="NAME", help="Zeroconf service name")
 
 
2949
    parser.add_argument("--configdir",
 
 
2950
                        default="/etc/mandos", metavar="DIR",
 
 
2951
                        help="Directory to search for configuration"
 
 
2953
    parser.add_argument("--no-dbus", action="store_false",
 
 
2954
                        dest="use_dbus", help="Do not provide D-Bus"
 
 
2955
                        " system bus interface", default=None)
 
 
2956
    parser.add_argument("--no-ipv6", action="store_false",
 
 
2957
                        dest="use_ipv6", help="Do not use IPv6",
 
 
2959
    parser.add_argument("--no-restore", action="store_false",
 
 
2960
                        dest="restore", help="Do not restore stored"
 
 
2961
                        " state", default=None)
 
 
2962
    parser.add_argument("--socket", type=int,
 
 
2963
                        help="Specify a file descriptor to a network"
 
 
2964
                        " socket to use instead of creating one")
 
 
2965
    parser.add_argument("--statedir", metavar="DIR",
 
 
2966
                        help="Directory to save/restore state in")
 
 
2967
    parser.add_argument("--foreground", action="store_true",
 
 
2968
                        help="Run in foreground", default=None)
 
 
2969
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2970
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
2973
    options = parser.parse_args()
 
1704
2975
    if options.check:
 
 
2977
        fail_count, test_count = doctest.testmod()
 
 
2978
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1709
2980
    # Default values for config file for server-global settings
 
1710
 
    server_defaults = { u"interface": u"",
 
1715
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1716
 
                        u"servicename": u"Mandos",
 
1717
 
                        u"use_dbus": u"True",
 
1718
 
                        u"use_ipv6": u"True",
 
 
2981
    if gnutls.has_rawpk:
 
 
2982
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2983
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2985
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2986
                    ":+SIGN-DSA-SHA256")
 
 
2987
    server_defaults = {"interface": "",
 
 
2991
                       "priority": priority,
 
 
2992
                       "servicename": "Mandos",
 
 
2998
                       "statedir": "/var/lib/mandos",
 
 
2999
                       "foreground": "False",
 
1722
3004
    # Parse config file for server-global settings
 
1723
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3005
    server_config = configparser.ConfigParser(server_defaults)
 
1724
3006
    del server_defaults
 
1725
 
    server_config.read(os.path.join(options.configdir,
 
1727
 
    # Convert the SafeConfigParser object to a dict
 
 
3007
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3008
    # Convert the ConfigParser object to a dict
 
1728
3009
    server_settings = server_config.defaults()
 
1729
3010
    # Use the appropriate methods on the non-string config options
 
1730
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1731
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
 
3011
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3012
                   "foreground", "zeroconf"):
 
 
3013
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1733
3015
    if server_settings["port"]:
 
1734
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
 
3016
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
3018
    if server_settings["socket"]:
 
 
3019
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
3021
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
3022
        # over with an opened os.devnull.  But we don't want this to
 
 
3023
        # happen with a supplied network socket.
 
 
3024
        if 0 <= server_settings["socket"] <= 2:
 
 
3025
            server_settings["socket"] = os.dup(server_settings
 
1736
3027
    del server_config
 
1738
3029
    # Override the settings from the config file with command line
 
1739
3030
    # options, if set.
 
1740
 
    for option in (u"interface", u"address", u"port", u"debug",
 
1741
 
                   u"priority", u"servicename", u"configdir",
 
1742
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
 
3031
    for option in ("interface", "address", "port", "debug",
 
 
3032
                   "priority", "servicename", "configdir", "use_dbus",
 
 
3033
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
3034
                   "socket", "foreground", "zeroconf"):
 
1743
3035
        value = getattr(options, option)
 
1744
3036
        if value is not None:
 
1745
3037
            server_settings[option] = value
 
1747
3039
    # Force all strings to be unicode
 
1748
3040
    for option in server_settings.keys():
 
1749
 
        if type(server_settings[option]) is str:
 
1750
 
            server_settings[option] = unicode(server_settings[option])
 
 
3041
        if isinstance(server_settings[option], bytes):
 
 
3042
            server_settings[option] = (server_settings[option]
 
 
3044
    # Force all boolean options to be boolean
 
 
3045
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3046
                   "foreground", "zeroconf"):
 
 
3047
        server_settings[option] = bool(server_settings[option])
 
 
3048
    # Debug implies foreground
 
 
3049
    if server_settings["debug"]:
 
 
3050
        server_settings["foreground"] = True
 
1751
3051
    # Now we have our good server settings in "server_settings"
 
1753
3053
    ##################################################################
 
 
3055
    if (not server_settings["zeroconf"]
 
 
3056
        and not (server_settings["port"]
 
 
3057
                 or server_settings["socket"] != "")):
 
 
3058
        parser.error("Needs port or socket to work without Zeroconf")
 
1755
3060
    # For convenience
 
1756
 
    debug = server_settings[u"debug"]
 
1757
 
    debuglevel = server_settings[u"debuglevel"]
 
1758
 
    use_dbus = server_settings[u"use_dbus"]
 
1759
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1761
 
    if server_settings[u"servicename"] != u"Mandos":
 
1762
 
        syslogger.setFormatter(logging.Formatter
 
1763
 
                               (u'Mandos (%s) [%%(process)d]:'
 
1764
 
                                u' %%(levelname)s: %%(message)s'
 
1765
 
                                % server_settings[u"servicename"]))
 
 
3061
    debug = server_settings["debug"]
 
 
3062
    debuglevel = server_settings["debuglevel"]
 
 
3063
    use_dbus = server_settings["use_dbus"]
 
 
3064
    use_ipv6 = server_settings["use_ipv6"]
 
 
3065
    stored_state_path = os.path.join(server_settings["statedir"],
 
 
3067
    foreground = server_settings["foreground"]
 
 
3068
    zeroconf = server_settings["zeroconf"]
 
 
3071
        initlogger(debug, logging.DEBUG)
 
 
3076
            level = getattr(logging, debuglevel.upper())
 
 
3077
            initlogger(debug, level)
 
 
3079
    if server_settings["servicename"] != "Mandos":
 
 
3080
        syslogger.setFormatter(
 
 
3081
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
3082
                              ' %(levelname)s: %(message)s'.format(
 
 
3083
                                  server_settings["servicename"])))
 
1767
3085
    # Parse config file with clients
 
1768
 
    client_defaults = { u"timeout": u"1h",
 
1770
 
                        u"checker": u"fping -q -- %%(host)s",
 
1772
 
                        u"approval_delay": u"0s",
 
1773
 
                        u"approval_duration": u"1s",
 
1775
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1776
 
    client_config.read(os.path.join(server_settings[u"configdir"],
 
 
3086
    client_config = configparser.ConfigParser(Client.client_defaults)
 
 
3087
    client_config.read(os.path.join(server_settings["configdir"],
 
1779
3090
    global mandos_dbus_service
 
1780
3091
    mandos_dbus_service = None
 
1782
 
    tcp_server = MandosServer((server_settings[u"address"],
 
1783
 
                               server_settings[u"port"]),
 
1785
 
                              interface=(server_settings[u"interface"]
 
1789
 
                              server_settings[u"priority"],
 
1792
 
        pidfilename = u"/var/run/mandos.pid"
 
1794
 
            pidfile = open(pidfilename, u"w")
 
1796
 
            logger.error(u"Could not open file %r", pidfilename)
 
1799
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1800
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1803
 
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1804
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
 
3094
    if server_settings["socket"] != "":
 
 
3095
        socketfd = server_settings["socket"]
 
 
3096
    tcp_server = MandosServer(
 
 
3097
        (server_settings["address"], server_settings["port"]),
 
 
3099
        interface=(server_settings["interface"] or None),
 
 
3101
        gnutls_priority=server_settings["priority"],
 
 
3105
        pidfilename = "/run/mandos.pid"
 
 
3106
        if not os.path.isdir("/run/."):
 
 
3107
            pidfilename = "/var/run/mandos.pid"
 
 
3110
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
3111
        except IOError as e:
 
 
3112
            logger.error("Could not open file %r", pidfilename,
 
 
3115
    for name, group in (("_mandos", "_mandos"),
 
 
3116
                        ("mandos", "mandos"),
 
 
3117
                        ("nobody", "nogroup")):
 
 
3119
            uid = pwd.getpwnam(name).pw_uid
 
 
3120
            gid = pwd.getpwnam(group).pw_gid
 
1805
3122
        except KeyError:
 
1807
 
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1808
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1815
 
    except OSError, error:
 
1816
 
        if error[0] != errno.EPERM:
 
1819
 
    if not debug and not debuglevel:
 
1820
 
        syslogger.setLevel(logging.WARNING)
 
1821
 
        console.setLevel(logging.WARNING)
 
1823
 
        level = getattr(logging, debuglevel.upper())
 
1824
 
        syslogger.setLevel(level)
 
1825
 
        console.setLevel(level)
 
 
3131
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
 
3133
    except OSError as error:
 
 
3134
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3135
                       .format(uid, gid, os.strerror(error.errno)))
 
 
3136
        if error.errno != errno.EPERM:
 
1828
3140
        # Enable all possible GnuTLS debugging
 
1830
3142
        # "Use a log level over 10 to enable all debugging options."
 
1831
3143
        # - GnuTLS manual
 
1832
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1834
 
        @gnutls.library.types.gnutls_log_func
 
 
3144
        gnutls.global_set_log_level(11)
 
1835
3147
        def debug_gnutls(level, string):
 
1836
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1838
 
        (gnutls.library.functions
 
1839
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3148
            logger.debug("GnuTLS: %s", string[:-1])
 
 
3150
        gnutls.global_set_log_function(debug_gnutls)
 
1841
3152
        # Redirect stdin so all checkers get /dev/null
 
1842
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
3153
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1843
3154
        os.dup2(null, sys.stdin.fileno())
 
1847
 
        # No console logging
 
1848
 
        logger.removeHandler(console)
 
1850
3158
    # Need to fork before connecting to D-Bus
 
1852
3160
        # Close all input and output, do double fork, etc.
 
 
3163
    if gi.version_info < (3, 10, 2):
 
 
3164
        # multiprocessing will use threads, so before we use GLib we
 
 
3165
        # need to inform GLib that threads will be used.
 
1855
3168
    global main_loop
 
1856
3169
    # From the Avahi example code
 
1857
 
    DBusGMainLoop(set_as_default=True )
 
1858
 
    main_loop = gobject.MainLoop()
 
 
3170
    DBusGMainLoop(set_as_default=True)
 
 
3171
    main_loop = GLib.MainLoop()
 
1859
3172
    bus = dbus.SystemBus()
 
1860
3173
    # End of Avahi example code
 
1863
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1864
 
                                            bus, do_not_queue=True)
 
1865
 
        except dbus.exceptions.NameExistsException, e:
 
1866
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
 
3176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
 
3179
            old_bus_name = dbus.service.BusName(
 
 
3180
                "se.bsnet.fukt.Mandos", bus,
 
 
3182
        except dbus.exceptions.DBusException as e:
 
 
3183
            logger.error("Disabling D-Bus:", exc_info=e)
 
1867
3184
            use_dbus = False
 
1868
 
            server_settings[u"use_dbus"] = False
 
 
3185
            server_settings["use_dbus"] = False
 
1869
3186
            tcp_server.use_dbus = False
 
1870
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1871
 
    service = AvahiService(name = server_settings[u"servicename"],
 
1872
 
                           servicetype = u"_mandos._tcp",
 
1873
 
                           protocol = protocol, bus = bus)
 
1874
 
    if server_settings["interface"]:
 
1875
 
        service.interface = (if_nametoindex
 
1876
 
                             (str(server_settings[u"interface"])))
 
 
3188
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3189
        service = AvahiServiceToSyslog(
 
 
3190
            name=server_settings["servicename"],
 
 
3191
            servicetype="_mandos._tcp",
 
 
3194
        if server_settings["interface"]:
 
 
3195
            service.interface = if_nametoindex(
 
 
3196
                server_settings["interface"].encode("utf-8"))
 
1878
3198
    global multiprocessing_manager
 
1879
3199
    multiprocessing_manager = multiprocessing.Manager()
 
1881
3201
    client_class = Client
 
1883
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
1884
 
    def client_config_items(config, section):
 
1885
 
        special_settings = {
 
1886
 
            "approved_by_default":
 
1887
 
                lambda: config.getboolean(section,
 
1888
 
                                          "approved_by_default"),
 
1890
 
        for name, value in config.items(section):
 
 
3203
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
3205
    client_settings = Client.config_parser(client_config)
 
 
3206
    old_client_settings = {}
 
 
3209
    # This is used to redirect stdout and stderr for checker processes
 
 
3211
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3212
    # Only used if server is running in foreground but not in debug
 
 
3214
    if debug or not foreground:
 
 
3217
    # Get client data and settings from last running state.
 
 
3218
    if server_settings["restore"]:
 
 
3220
            with open(stored_state_path, "rb") as stored_state:
 
 
3221
                if sys.version_info.major == 2:
 
 
3222
                    clients_data, old_client_settings = pickle.load(
 
 
3225
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3226
                        pickle.load(stored_state, encoding="bytes"))
 
 
3227
                    #   Fix bytes to strings
 
 
3230
                    clients_data = {(key.decode("utf-8")
 
 
3231
                                     if isinstance(key, bytes)
 
 
3234
                                    bytes_clients_data.items()}
 
 
3235
                    del bytes_clients_data
 
 
3236
                    for key in clients_data:
 
 
3237
                        value = {(k.decode("utf-8")
 
 
3238
                                  if isinstance(k, bytes) else k): v
 
 
3240
                                 clients_data[key].items()}
 
 
3241
                        clients_data[key] = value
 
 
3243
                        value["client_structure"] = [
 
 
3245
                             if isinstance(s, bytes)
 
 
3247
                            value["client_structure"]]
 
 
3249
                        for k in ("name", "host"):
 
 
3250
                            if isinstance(value[k], bytes):
 
 
3251
                                value[k] = value[k].decode("utf-8")
 
 
3252
                        if "key_id" not in value:
 
 
3253
                            value["key_id"] = ""
 
 
3254
                        elif "fingerprint" not in value:
 
 
3255
                            value["fingerprint"] = ""
 
 
3256
                    #  old_client_settings
 
 
3258
                    old_client_settings = {
 
 
3259
                        (key.decode("utf-8")
 
 
3260
                         if isinstance(key, bytes)
 
 
3263
                        bytes_old_client_settings.items()}
 
 
3264
                    del bytes_old_client_settings
 
 
3266
                    for value in old_client_settings.values():
 
 
3267
                        if isinstance(value["host"], bytes):
 
 
3268
                            value["host"] = (value["host"]
 
 
3270
            os.remove(stored_state_path)
 
 
3271
        except IOError as e:
 
 
3272
            if e.errno == errno.ENOENT:
 
 
3273
                logger.warning("Could not load persistent state:"
 
 
3274
                               " {}".format(os.strerror(e.errno)))
 
 
3276
                logger.critical("Could not load persistent state:",
 
 
3279
        except EOFError as e:
 
 
3280
            logger.warning("Could not load persistent state: "
 
 
3284
    with PGPEngine() as pgp:
 
 
3285
        for client_name, client in clients_data.items():
 
 
3286
            # Skip removed clients
 
 
3287
            if client_name not in client_settings:
 
 
3290
            # Decide which value to use after restoring saved state.
 
 
3291
            # We have three different values: Old config file,
 
 
3292
            # new config file, and saved state.
 
 
3293
            # New config value takes precedence if it differs from old
 
 
3294
            # config value, otherwise use saved state.
 
 
3295
            for name, value in client_settings[client_name].items():
 
 
3297
                    # For each value in new config, check if it
 
 
3298
                    # differs from the old config value (Except for
 
 
3299
                    # the "secret" attribute)
 
 
3300
                    if (name != "secret"
 
 
3302
                             old_client_settings[client_name][name])):
 
 
3303
                        client[name] = value
 
 
3307
            # Clients who has passed its expire date can still be
 
 
3308
            # enabled if its last checker was successful.  A Client
 
 
3309
            # whose checker succeeded before we stored its state is
 
 
3310
            # assumed to have successfully run all checkers during
 
 
3312
            if client["enabled"]:
 
 
3313
                if datetime.datetime.utcnow() >= client["expires"]:
 
 
3314
                    if not client["last_checked_ok"]:
 
 
3316
                            "disabling client {} - Client never "
 
 
3317
                            "performed a successful checker".format(
 
 
3319
                        client["enabled"] = False
 
 
3320
                    elif client["last_checker_status"] != 0:
 
 
3322
                            "disabling client {} - Client last"
 
 
3323
                            " checker failed with error code"
 
 
3326
                                client["last_checker_status"]))
 
 
3327
                        client["enabled"] = False
 
 
3329
                        client["expires"] = (
 
 
3330
                            datetime.datetime.utcnow()
 
 
3331
                            + client["timeout"])
 
 
3332
                        logger.debug("Last checker succeeded,"
 
 
3333
                                     " keeping {} enabled".format(
 
1892
 
                yield (name, special_settings[name]())
 
1896
 
    tcp_server.clients.update(set(
 
1897
 
            client_class(name = section,
 
1898
 
                         config= dict(client_config_items(
 
1899
 
                        client_config, section)))
 
1900
 
            for section in client_config.sections()))
 
 
3336
                client["secret"] = pgp.decrypt(
 
 
3337
                    client["encrypted_secret"],
 
 
3338
                    client_settings[client_name]["secret"])
 
 
3340
                # If decryption fails, we use secret from new settings
 
 
3341
                logger.debug("Failed to decrypt {} old secret".format(
 
 
3343
                client["secret"] = (client_settings[client_name]
 
 
3346
    # Add/remove clients based on new changes made to config
 
 
3347
    for client_name in (set(old_client_settings)
 
 
3348
                        - set(client_settings)):
 
 
3349
        del clients_data[client_name]
 
 
3350
    for client_name in (set(client_settings)
 
 
3351
                        - set(old_client_settings)):
 
 
3352
        clients_data[client_name] = client_settings[client_name]
 
 
3354
    # Create all client objects
 
 
3355
    for client_name, client in clients_data.items():
 
 
3356
        tcp_server.clients[client_name] = client_class(
 
 
3359
            server_settings=server_settings)
 
1901
3361
    if not tcp_server.clients:
 
1902
 
        logger.warning(u"No clients defined")
 
1908
 
                pidfile.write(str(pid) + "\n")
 
1911
 
            logger.error(u"Could not write to file %r with PID %d",
 
1914
 
            # "pidfile" was never created
 
 
3362
        logger.warning("No clients defined")
 
 
3365
        if pidfile is not None:
 
 
3369
                    print(pid, file=pidfile)
 
 
3371
                logger.error("Could not write to file %r with PID %d",
 
1916
3374
        del pidfilename
 
1918
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1920
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
1921
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3376
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3377
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3378
                             lambda: main_loop.quit() and False)
 
1924
 
        class MandosDBusService(dbus.service.Object):
 
 
3382
        @alternate_dbus_interfaces(
 
 
3383
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3384
        class MandosDBusService(DBusObjectWithObjectManager):
 
1925
3385
            """A D-Bus proxy object"""
 
1926
3387
            def __init__(self):
 
1927
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1928
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1930
 
            @dbus.service.signal(_interface, signature=u"o")
 
 
3388
                dbus.service.Object.__init__(self, bus, "/")
 
 
3390
            _interface = "se.recompile.Mandos"
 
 
3392
            @dbus.service.signal(_interface, signature="o")
 
1931
3393
            def ClientAdded(self, objpath):
 
1935
 
            @dbus.service.signal(_interface, signature=u"ss")
 
1936
 
            def ClientNotFound(self, fingerprint, address):
 
 
3397
            @dbus.service.signal(_interface, signature="ss")
 
 
3398
            def ClientNotFound(self, key_id, address):
 
1940
 
            @dbus.service.signal(_interface, signature=u"os")
 
 
3402
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3404
            @dbus.service.signal(_interface, signature="os")
 
1941
3405
            def ClientRemoved(self, objpath, name):
 
1945
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
 
3409
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
3411
            @dbus.service.method(_interface, out_signature="ao")
 
1946
3412
            def GetAllClients(self):
 
1948
 
                return dbus.Array(c.dbus_object_path
 
1949
 
                                  for c in tcp_server.clients)
 
 
3414
                return dbus.Array(c.dbus_object_path for c in
 
 
3415
                                  tcp_server.clients.values())
 
 
3417
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
1951
3419
            @dbus.service.method(_interface,
 
1952
 
                                 out_signature=u"a{oa{sv}}")
 
 
3420
                                 out_signature="a{oa{sv}}")
 
1953
3421
            def GetAllClientsWithProperties(self):
 
1955
3423
                return dbus.Dictionary(
 
1956
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1957
 
                     for c in tcp_server.clients),
 
1958
 
                    signature=u"oa{sv}")
 
1960
 
            @dbus.service.method(_interface, in_signature=u"o")
 
 
3424
                    {c.dbus_object_path: c.GetAll(
 
 
3425
                        "se.recompile.Mandos.Client")
 
 
3426
                     for c in tcp_server.clients.values()},
 
 
3429
            @dbus.service.method(_interface, in_signature="o")
 
1961
3430
            def RemoveClient(self, object_path):
 
1963
 
                for c in tcp_server.clients:
 
 
3432
                for c in tcp_server.clients.values():
 
1964
3433
                    if c.dbus_object_path == object_path:
 
1965
 
                        tcp_server.clients.remove(c)
 
 
3434
                        del tcp_server.clients[c.name]
 
1966
3435
                        c.remove_from_connection()
 
1967
 
                        # Don't signal anything except ClientRemoved
 
 
3436
                        # Don't signal the disabling
 
1968
3437
                        c.disable(quiet=True)
 
1970
 
                        self.ClientRemoved(object_path, c.name)
 
 
3438
                        # Emit D-Bus signal for removal
 
 
3439
                        self.client_removed_signal(c)
 
1972
3441
                raise KeyError(object_path)
 
 
3445
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3446
                                 out_signature="a{oa{sa{sv}}}")
 
 
3447
            def GetManagedObjects(self):
 
 
3449
                return dbus.Dictionary(
 
 
3450
                    {client.dbus_object_path:
 
 
3452
                         {interface: client.GetAll(interface)
 
 
3454
                          client._get_all_interface_names()})
 
 
3455
                     for client in tcp_server.clients.values()})
 
 
3457
            def client_added_signal(self, client):
 
 
3458
                """Send the new standard signal and the old signal"""
 
 
3460
                    # New standard signal
 
 
3461
                    self.InterfacesAdded(
 
 
3462
                        client.dbus_object_path,
 
 
3464
                            {interface: client.GetAll(interface)
 
 
3466
                             client._get_all_interface_names()}))
 
 
3468
                    self.ClientAdded(client.dbus_object_path)
 
 
3470
            def client_removed_signal(self, client):
 
 
3471
                """Send the new standard signal and the old signal"""
 
 
3473
                    # New standard signal
 
 
3474
                    self.InterfacesRemoved(
 
 
3475
                        client.dbus_object_path,
 
 
3476
                        client._get_all_interface_names())
 
 
3478
                    self.ClientRemoved(client.dbus_object_path,
 
1976
3481
        mandos_dbus_service = MandosDBusService()
 
 
3483
    # Save modules to variables to exempt the modules from being
 
 
3484
    # unloaded before the function registered with atexit() is run.
 
 
3485
    mp = multiprocessing
 
1979
3489
        "Cleanup function; run on exit"
 
 
3493
        mp.active_children()
 
 
3495
        if not (tcp_server.clients or client_settings):
 
 
3498
        # Store client before exiting. Secrets are encrypted with key
 
 
3499
        # based on what config file has. If config file is
 
 
3500
        # removed/edited, old secret will thus be unrecovable.
 
 
3502
        with PGPEngine() as pgp:
 
 
3503
            for client in tcp_server.clients.values():
 
 
3504
                key = client_settings[client.name]["secret"]
 
 
3505
                client.encrypted_secret = pgp.encrypt(client.secret,
 
 
3509
                # A list of attributes that can not be pickled
 
 
3511
                exclude = {"bus", "changedstate", "secret",
 
 
3512
                           "checker", "server_settings"}
 
 
3513
                for name, typ in inspect.getmembers(dbus.service
 
 
3517
                client_dict["encrypted_secret"] = (client
 
 
3519
                for attr in client.client_structure:
 
 
3520
                    if attr not in exclude:
 
 
3521
                        client_dict[attr] = getattr(client, attr)
 
 
3523
                clients[client.name] = client_dict
 
 
3524
                del client_settings[client.name]["secret"]
 
 
3527
            with tempfile.NamedTemporaryFile(
 
 
3531
                    dir=os.path.dirname(stored_state_path),
 
 
3532
                    delete=False) as stored_state:
 
 
3533
                pickle.dump((clients, client_settings), stored_state,
 
 
3535
                tempname = stored_state.name
 
 
3536
            os.rename(tempname, stored_state_path)
 
 
3537
        except (IOError, OSError) as e:
 
 
3543
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3544
                logger.warning("Could not save persistent state: {}"
 
 
3545
                               .format(os.strerror(e.errno)))
 
 
3547
                logger.warning("Could not save persistent state:",
 
 
3551
        # Delete all clients, and settings from config
 
1982
3552
        while tcp_server.clients:
 
1983
 
            client = tcp_server.clients.pop()
 
 
3553
            name, client = tcp_server.clients.popitem()
 
1985
3555
                client.remove_from_connection()
 
1986
 
            client.disable_hook = None
 
1987
 
            # Don't signal anything except ClientRemoved
 
 
3556
            # Don't signal the disabling
 
1988
3557
            client.disable(quiet=True)
 
 
3558
            # Emit D-Bus signal for removal
 
1991
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
 
3560
                mandos_dbus_service.client_removed_signal(client)
 
 
3561
        client_settings.clear()
 
1994
3563
    atexit.register(cleanup)
 
1996
 
    for client in tcp_server.clients:
 
 
3565
    for client in tcp_server.clients.values():
 
1999
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3567
            # Emit D-Bus signal for adding
 
 
3568
            mandos_dbus_service.client_added_signal(client)
 
 
3569
        # Need to initiate checking of clients
 
 
3571
            client.init_checker()
 
2002
3573
    tcp_server.enable()
 
2003
3574
    tcp_server.server_activate()
 
2005
3576
    # Find out what port we got
 
2006
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3578
        service.port = tcp_server.socket.getsockname()[1]
 
2008
 
        logger.info(u"Now listening on address %r, port %d,"
 
2009
 
                    " flowinfo %d, scope_id %d"
 
2010
 
                    % tcp_server.socket.getsockname())
 
 
3580
        logger.info("Now listening on address %r, port %d,"
 
 
3581
                    " flowinfo %d, scope_id %d",
 
 
3582
                    *tcp_server.socket.getsockname())
 
2012
 
        logger.info(u"Now listening on address %r, port %d"
 
2013
 
                    % tcp_server.socket.getsockname())
 
2015
 
    #service.interface = tcp_server.socket.getsockname()[3]
 
 
3584
        logger.info("Now listening on address %r, port %d",
 
 
3585
                    *tcp_server.socket.getsockname())
 
 
3587
    # service.interface = tcp_server.socket.getsockname()[3]
 
2018
 
        # From the Avahi example code
 
2021
 
        except dbus.exceptions.DBusException, error:
 
2022
 
            logger.critical(u"DBusException: %s", error)
 
2025
 
        # End of Avahi example code
 
2027
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2028
 
                             lambda *args, **kwargs:
 
2029
 
                             (tcp_server.handle_request
 
2030
 
                              (*args[2:], **kwargs) or True))
 
2032
 
        logger.debug(u"Starting main loop")
 
 
3591
            # From the Avahi example code
 
 
3594
            except dbus.exceptions.DBusException as error:
 
 
3595
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3598
            # End of Avahi example code
 
 
3600
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
 
3601
                          lambda *args, **kwargs:
 
 
3602
                          (tcp_server.handle_request
 
 
3603
                           (*args[2:], **kwargs) or True))
 
 
3605
        logger.debug("Starting main loop")
 
2033
3606
        main_loop.run()
 
2034
 
    except AvahiError, error:
 
2035
 
        logger.critical(u"AvahiError: %s", error)
 
 
3607
    except AvahiError as error:
 
 
3608
        logger.critical("Avahi Error", exc_info=error)
 
2038
3611
    except KeyboardInterrupt:
 
2041
 
        logger.debug(u"Server received KeyboardInterrupt")
 
2042
 
    logger.debug(u"Server exiting")
 
 
3613
            print("", file=sys.stderr)
 
 
3614
        logger.debug("Server received KeyboardInterrupt")
 
 
3615
    logger.debug("Server exiting")
 
2043
3616
    # Must run before the D-Bus bus name gets deregistered
 
2046
3620
if __name__ == '__main__':