2
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-2012 Teddy Hogeborn
 
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
17
 
# This program is free software: you can redistribute it and/or modify
 
18
 
# it under the terms of the GNU General Public License as published by
 
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
 
15
# Copyright © 2008-2019 Björn Påhlsson
 
 
17
# This file is part of Mandos.
 
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
 
20
# under the terms of the GNU General Public License as published by
 
19
21
# the Free Software Foundation, either version 3 of the License, or
 
20
22
# (at your option) any later version.
 
22
 
#     This program is distributed in the hope that it will be useful,
 
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
25
27
#     GNU General Public License for more details.
 
27
29
# You should have received a copy of the GNU General Public License
 
28
 
# along with this program.  If not, see
 
29
 
# <http://www.gnu.org/licenses/>.
 
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
31
32
# Contact the authors at <mandos@recompile.se>.
 
34
35
from __future__ import (division, absolute_import, print_function,
 
37
 
import SocketServer as socketserver
 
 
39
    from future_builtins import *
 
 
44
    import SocketServer as socketserver
 
43
 
import gnutls.connection
 
45
 
import gnutls.library.functions
 
46
 
import gnutls.library.constants
 
47
 
import gnutls.library.types
 
48
 
import ConfigParser as configparser
 
 
52
    import ConfigParser as configparser
 
 
63
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
64
73
import multiprocessing
 
71
82
import dbus.service
 
 
83
from gi.repository import GLib
 
74
84
from dbus.mainloop.glib import DBusGMainLoop
 
77
87
import xml.dom.minidom
 
 
90
# Try to find the value of SO_BINDTODEVICE:
 
 
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
93
    # newer, and it is also the most natural place for it:
 
82
94
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
83
95
except AttributeError:
 
 
97
        # This is where SO_BINDTODEVICE was up to and including Python
 
85
99
        from IN import SO_BINDTODEVICE
 
86
100
    except ImportError:
 
87
 
        SO_BINDTODEVICE = None
 
 
101
        # In Python 2.7 it seems to have been removed entirely.
 
 
102
        # Try running the C preprocessor:
 
 
104
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
106
                                  stdin=subprocess.PIPE,
 
 
107
                                  stdout=subprocess.PIPE)
 
 
108
            stdout = cc.communicate(
 
 
109
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
110
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
111
        except (OSError, ValueError, IndexError):
 
 
113
            SO_BINDTODEVICE = None
 
 
115
if sys.version_info.major == 2:
 
90
119
stored_state_file = "clients.pickle"
 
92
121
logger = logging.getLogger()
 
93
 
syslogger = (logging.handlers.SysLogHandler
 
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
95
 
              address = str("/dev/log")))
 
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
 
                      (ctypes.util.find_library("c"))
 
 
125
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
126
        ctypes.util.find_library("c")).if_nametoindex
 
101
127
except (OSError, AttributeError):
 
102
129
    def if_nametoindex(interface):
 
103
130
        "Get an interface index the hard way, i.e. using fcntl()"
 
104
131
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
132
        with contextlib.closing(socket.socket()) as s:
 
106
133
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
 
                                struct.pack(str("16s16x"),
 
109
 
        interface_index = struct.unpack(str("I"),
 
 
134
                                struct.pack(b"16s16x", interface))
 
 
135
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
111
136
        return interface_index
 
 
139
def copy_function(func):
 
 
140
    """Make a copy of a function"""
 
 
141
    if sys.version_info.major == 2:
 
 
142
        return types.FunctionType(func.func_code,
 
 
148
        return types.FunctionType(func.__code__,
 
114
155
def initlogger(debug, level=logging.WARNING):
 
115
156
    """init logger and add loglevel"""
 
 
159
    syslogger = (logging.handlers.SysLogHandler(
 
 
160
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
117
162
    syslogger.setFormatter(logging.Formatter
 
118
163
                           ('Mandos [%(process)d]: %(levelname)s:'
 
120
165
    logger.addHandler(syslogger)
 
123
168
        console = logging.StreamHandler()
 
124
169
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
169
226
            os.rmdir(self.tempdir)
 
170
227
            self.tempdir = None
 
172
229
    def password_encode(self, password):
 
173
230
        # Passphrase can not be empty and can not contain newlines or
 
174
231
        # NUL bytes.  So we prefix it and hex encode it.
 
175
 
        return b"mandos" + binascii.hexlify(password)
 
 
232
        encoded = b"mandos" + binascii.hexlify(password)
 
 
233
        if len(encoded) > 2048:
 
 
234
            # GnuPG can't handle long passwords, so encode differently
 
 
235
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
236
                       .replace(b"\n", b"\\n")
 
 
237
                       .replace(b"\0", b"\\x00"))
 
177
240
    def encrypt(self, data, password):
 
178
 
        self.gnupg.passphrase = self.password_encode(password)
 
179
 
        with open(os.devnull, "w") as devnull:
 
181
 
                proc = self.gnupg.run(['--symmetric'],
 
182
 
                                      create_fhs=['stdin', 'stdout'],
 
183
 
                                      attach_fhs={'stderr': devnull})
 
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
187
 
                    ciphertext = f.read()
 
191
 
        self.gnupg.passphrase = None
 
 
241
        passphrase = self.password_encode(password)
 
 
242
        with tempfile.NamedTemporaryFile(
 
 
243
                dir=self.tempdir) as passfile:
 
 
244
            passfile.write(passphrase)
 
 
246
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
250
                                    stdin=subprocess.PIPE,
 
 
251
                                    stdout=subprocess.PIPE,
 
 
252
                                    stderr=subprocess.PIPE)
 
 
253
            ciphertext, err = proc.communicate(input=data)
 
 
254
        if proc.returncode != 0:
 
192
256
        return ciphertext
 
194
258
    def decrypt(self, data, password):
 
195
 
        self.gnupg.passphrase = self.password_encode(password)
 
196
 
        with open(os.devnull, "w") as devnull:
 
198
 
                proc = self.gnupg.run(['--decrypt'],
 
199
 
                                      create_fhs=['stdin', 'stdout'],
 
200
 
                                      attach_fhs={'stderr': devnull})
 
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
204
 
                    decrypted_plaintext = f.read()
 
208
 
        self.gnupg.passphrase = None
 
 
259
        passphrase = self.password_encode(password)
 
 
260
        with tempfile.NamedTemporaryFile(
 
 
261
                dir=self.tempdir) as passfile:
 
 
262
            passfile.write(passphrase)
 
 
264
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
268
                                    stdin=subprocess.PIPE,
 
 
269
                                    stdout=subprocess.PIPE,
 
 
270
                                    stderr=subprocess.PIPE)
 
 
271
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
272
        if proc.returncode != 0:
 
209
274
        return decrypted_plaintext
 
 
277
# Pretend that we have an Avahi module
 
 
279
    """This isn't so much a class as it is a module-like namespace."""
 
 
280
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
282
    PROTO_INET = 0               # avahi-common/address.h
 
 
283
    PROTO_INET6 = 1              # avahi-common/address.h
 
 
284
    DBUS_NAME = "org.freedesktop.Avahi"
 
 
285
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
 
286
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
 
287
    DBUS_PATH_SERVER = "/"
 
 
290
    def string_array_to_txt_array(t):
 
 
291
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
 
292
                           for s in t), signature="ay")
 
 
293
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
294
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
295
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
296
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
297
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
298
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
299
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
300
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
213
303
class AvahiError(Exception):
 
214
304
    def __init__(self, value, *args, **kwargs):
 
215
305
        self.value = value
 
216
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
217
 
    def __unicode__(self):
 
218
 
        return unicode(repr(self.value))
 
 
306
        return super(AvahiError, self).__init__(value, *args,
 
220
310
class AvahiServiceError(AvahiError):
 
223
314
class AvahiGroupError(AvahiError):
 
227
318
class AvahiService(object):
 
228
319
    """An Avahi (Zeroconf) service.
 
231
322
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
232
323
               Used to optionally bind to the specified interface.
 
233
324
    name: string; Example: 'Mandos'
 
234
325
    type: string; Example: '_mandos._tcp'.
 
235
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
326
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
327
    port: integer; what port to announce
 
237
328
    TXT: list of strings; TXT record for the service
 
238
329
    domain: string; Domain to publish on, default to .local if empty.
 
 
367
488
                                    follow_name_owner_changes=True),
 
368
489
                avahi.DBUS_INTERFACE_SERVER)
 
369
490
        self.server.connect_to_signal("StateChanged",
 
370
 
                                 self.server_state_changed)
 
 
491
                                      self.server_state_changed)
 
371
492
        self.server_state_changed(self.server.GetState())
 
373
495
class AvahiServiceToSyslog(AvahiService):
 
 
496
    def rename(self, *args, **kwargs):
 
375
497
        """Add the new name to the syslog messages"""
 
376
 
        ret = AvahiService.rename(self)
 
377
 
        syslogger.setFormatter(logging.Formatter
 
378
 
                               ('Mandos (%s) [%%(process)d]:'
 
379
 
                                ' %%(levelname)s: %%(message)s'
 
 
498
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
499
        syslogger.setFormatter(logging.Formatter(
 
 
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
383
 
def timedelta_to_milliseconds(td):
 
384
 
    "Convert a datetime.timedelta() to milliseconds"
 
385
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
386
 
            + (td.seconds * 1000)
 
387
 
            + (td.microseconds // 1000))
 
 
505
# Pretend that we have a GnuTLS module
 
 
506
class gnutls(object):
 
 
507
    """This isn't so much a class as it is a module-like namespace."""
 
 
509
    library = ctypes.util.find_library("gnutls")
 
 
511
        library = ctypes.util.find_library("gnutls-deb0")
 
 
512
    _library = ctypes.cdll.LoadLibrary(library)
 
 
515
    # Unless otherwise indicated, the constants and types below are
 
 
516
    # all from the gnutls/gnutls.h C header file.
 
 
527
    E_NO_CERTIFICATE_FOUND = -49
 
 
532
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
 
533
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
536
    class session_int(ctypes.Structure):
 
 
538
    session_t = ctypes.POINTER(session_int)
 
 
540
    class certificate_credentials_st(ctypes.Structure):
 
 
542
    certificate_credentials_t = ctypes.POINTER(
 
 
543
        certificate_credentials_st)
 
 
544
    certificate_type_t = ctypes.c_int
 
 
546
    class datum_t(ctypes.Structure):
 
 
547
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
548
                    ('size', ctypes.c_uint)]
 
 
550
    class openpgp_crt_int(ctypes.Structure):
 
 
552
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
553
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
 
554
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
555
    credentials_type_t = ctypes.c_int
 
 
556
    transport_ptr_t = ctypes.c_void_p
 
 
557
    close_request_t = ctypes.c_int
 
 
560
    class Error(Exception):
 
 
561
        def __init__(self, message=None, code=None, args=()):
 
 
562
            # Default usage is by a message string, but if a return
 
 
563
            # code is passed, convert it to a string with
 
 
566
            if message is None and code is not None:
 
 
567
                message = gnutls.strerror(code)
 
 
568
            return super(gnutls.Error, self).__init__(
 
 
571
    class CertificateSecurityError(Error):
 
 
575
    class Credentials(object):
 
 
577
            self._c_object = gnutls.certificate_credentials_t()
 
 
578
            gnutls.certificate_allocate_credentials(
 
 
579
                ctypes.byref(self._c_object))
 
 
580
            self.type = gnutls.CRD_CERTIFICATE
 
 
583
            gnutls.certificate_free_credentials(self._c_object)
 
 
585
    class ClientSession(object):
 
 
586
        def __init__(self, socket, credentials=None):
 
 
587
            self._c_object = gnutls.session_t()
 
 
588
            gnutls_flags = gnutls.CLIENT
 
 
589
            if gnutls.check_version("3.5.6"):
 
 
590
                gnutls_flags |= gnutls.NO_TICKETS
 
 
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
593
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
595
            gnutls.set_default_priority(self._c_object)
 
 
596
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
597
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
600
            if credentials is None:
 
 
601
                credentials = gnutls.Credentials()
 
 
602
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
603
                                   ctypes.cast(credentials._c_object,
 
 
605
            self.credentials = credentials
 
 
608
            gnutls.deinit(self._c_object)
 
 
611
            return gnutls.handshake(self._c_object)
 
 
613
        def send(self, data):
 
 
617
                data_len -= gnutls.record_send(self._c_object,
 
 
622
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
624
    # Error handling functions
 
 
625
    def _error_code(result):
 
 
626
        """A function to raise exceptions on errors, suitable
 
 
627
        for the 'restype' attribute on ctypes functions"""
 
 
630
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
631
            raise gnutls.CertificateSecurityError(code=result)
 
 
632
        raise gnutls.Error(code=result)
 
 
634
    def _retry_on_error(result, func, arguments):
 
 
635
        """A function to retry on some errors, suitable
 
 
636
        for the 'errcheck' attribute on ctypes functions"""
 
 
638
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
639
                return _error_code(result)
 
 
640
            result = func(*arguments)
 
 
643
    # Unless otherwise indicated, the function declarations below are
 
 
644
    # all from the gnutls/gnutls.h C header file.
 
 
647
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
648
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
649
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
650
    priority_set_direct.restype = _error_code
 
 
652
    init = _library.gnutls_init
 
 
653
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
654
    init.restype = _error_code
 
 
656
    set_default_priority = _library.gnutls_set_default_priority
 
 
657
    set_default_priority.argtypes = [session_t]
 
 
658
    set_default_priority.restype = _error_code
 
 
660
    record_send = _library.gnutls_record_send
 
 
661
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
663
    record_send.restype = ctypes.c_ssize_t
 
 
664
    record_send.errcheck = _retry_on_error
 
 
666
    certificate_allocate_credentials = (
 
 
667
        _library.gnutls_certificate_allocate_credentials)
 
 
668
    certificate_allocate_credentials.argtypes = [
 
 
669
        ctypes.POINTER(certificate_credentials_t)]
 
 
670
    certificate_allocate_credentials.restype = _error_code
 
 
672
    certificate_free_credentials = (
 
 
673
        _library.gnutls_certificate_free_credentials)
 
 
674
    certificate_free_credentials.argtypes = [
 
 
675
        certificate_credentials_t]
 
 
676
    certificate_free_credentials.restype = None
 
 
678
    handshake_set_private_extensions = (
 
 
679
        _library.gnutls_handshake_set_private_extensions)
 
 
680
    handshake_set_private_extensions.argtypes = [session_t,
 
 
682
    handshake_set_private_extensions.restype = None
 
 
684
    credentials_set = _library.gnutls_credentials_set
 
 
685
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
687
    credentials_set.restype = _error_code
 
 
689
    strerror = _library.gnutls_strerror
 
 
690
    strerror.argtypes = [ctypes.c_int]
 
 
691
    strerror.restype = ctypes.c_char_p
 
 
693
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
694
    certificate_type_get.argtypes = [session_t]
 
 
695
    certificate_type_get.restype = _error_code
 
 
697
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
698
    certificate_get_peers.argtypes = [session_t,
 
 
699
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
700
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
702
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
703
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
704
    global_set_log_level.restype = None
 
 
706
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
707
    global_set_log_function.argtypes = [log_func]
 
 
708
    global_set_log_function.restype = None
 
 
710
    deinit = _library.gnutls_deinit
 
 
711
    deinit.argtypes = [session_t]
 
 
712
    deinit.restype = None
 
 
714
    handshake = _library.gnutls_handshake
 
 
715
    handshake.argtypes = [session_t]
 
 
716
    handshake.restype = _error_code
 
 
717
    handshake.errcheck = _retry_on_error
 
 
719
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
720
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
721
    transport_set_ptr.restype = None
 
 
723
    bye = _library.gnutls_bye
 
 
724
    bye.argtypes = [session_t, close_request_t]
 
 
725
    bye.restype = _error_code
 
 
726
    bye.errcheck = _retry_on_error
 
 
728
    check_version = _library.gnutls_check_version
 
 
729
    check_version.argtypes = [ctypes.c_char_p]
 
 
730
    check_version.restype = ctypes.c_char_p
 
 
732
    _need_version = b"3.3.0"
 
 
733
    if check_version(_need_version) is None:
 
 
734
        raise self.Error("Needs GnuTLS {} or later"
 
 
735
                         .format(_need_version))
 
 
737
    _tls_rawpk_version = b"3.6.6"
 
 
738
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
742
        class pubkey_st(ctypes.Structure):
 
 
744
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
746
        x509_crt_fmt_t = ctypes.c_int
 
 
748
        # All the function declarations below are from gnutls/abstract.h
 
 
749
        pubkey_init = _library.gnutls_pubkey_init
 
 
750
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
751
        pubkey_init.restype = _error_code
 
 
753
        pubkey_import = _library.gnutls_pubkey_import
 
 
754
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
756
        pubkey_import.restype = _error_code
 
 
758
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
759
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
760
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
761
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
762
        pubkey_get_key_id.restype = _error_code
 
 
764
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
765
        pubkey_deinit.argtypes = [pubkey_t]
 
 
766
        pubkey_deinit.restype = None
 
 
768
        # All the function declarations below are from gnutls/openpgp.h
 
 
770
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
771
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
772
        openpgp_crt_init.restype = _error_code
 
 
774
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
775
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
776
                                       ctypes.POINTER(datum_t),
 
 
778
        openpgp_crt_import.restype = _error_code
 
 
780
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
781
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
782
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
783
        openpgp_crt_verify_self.restype = _error_code
 
 
785
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
786
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
787
        openpgp_crt_deinit.restype = None
 
 
789
        openpgp_crt_get_fingerprint = (
 
 
790
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
791
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
795
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
797
    if check_version("3.6.4"):
 
 
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
800
        certificate_type_get2.restype = _error_code
 
 
802
    # Remove non-public functions
 
 
803
    del _error_code, _retry_on_error
 
 
806
def call_pipe(connection,       # : multiprocessing.Connection
 
 
807
              func, *args, **kwargs):
 
 
808
    """This function is meant to be called by multiprocessing.Process
 
 
810
    This function runs func(*args, **kwargs), and writes the resulting
 
 
811
    return value on the provided multiprocessing.Connection.
 
 
813
    connection.send(func(*args, **kwargs))
 
389
817
class Client(object):
 
390
818
    """A representation of a client host served by this server.
 
393
821
    approved:   bool(); 'None' if not yet approved/disapproved
 
394
822
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
427
859
    runtime_expansions: Allowed attributes for runtime expansion.
 
428
860
    expires:    datetime.datetime(); time (UTC) when a client will be
 
429
861
                disabled, or None
 
 
862
    server_settings: The server_settings dict from main()
 
432
865
    runtime_expansions = ("approval_delay", "approval_duration",
 
433
 
                          "created", "enabled", "fingerprint",
 
434
 
                          "host", "interval", "last_checked_ok",
 
 
866
                          "created", "enabled", "expires", "key_id",
 
 
867
                          "fingerprint", "host", "interval",
 
 
868
                          "last_approval_request", "last_checked_ok",
 
435
869
                          "last_enabled", "name", "timeout")
 
436
 
    client_defaults = { "timeout": "5m",
 
437
 
                        "extended_timeout": "15m",
 
439
 
                        "checker": "fping -q -- %%(host)s",
 
441
 
                        "approval_delay": "0s",
 
442
 
                        "approval_duration": "1s",
 
443
 
                        "approved_by_default": "True",
 
447
 
    def timeout_milliseconds(self):
 
448
 
        "Return the 'timeout' attribute in milliseconds"
 
449
 
        return timedelta_to_milliseconds(self.timeout)
 
451
 
    def extended_timeout_milliseconds(self):
 
452
 
        "Return the 'extended_timeout' attribute in milliseconds"
 
453
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
455
 
    def interval_milliseconds(self):
 
456
 
        "Return the 'interval' attribute in milliseconds"
 
457
 
        return timedelta_to_milliseconds(self.interval)
 
459
 
    def approval_delay_milliseconds(self):
 
460
 
        return timedelta_to_milliseconds(self.approval_delay)
 
 
872
        "extended_timeout": "PT15M",
 
 
874
        "checker": "fping -q -- %%(host)s",
 
 
876
        "approval_delay": "PT0S",
 
 
877
        "approval_duration": "PT1S",
 
 
878
        "approved_by_default": "True",
 
463
883
    def config_parser(config):
 
 
542
966
        self.current_checker_command = None
 
543
967
        self.approved = None
 
544
968
        self.approvals_pending = 0
 
545
 
        self.changedstate = (multiprocessing_manager
 
546
 
                             .Condition(multiprocessing_manager
 
548
 
        self.client_structure = [attr for attr in
 
549
 
                                 self.__dict__.iterkeys()
 
 
969
        self.changedstate = multiprocessing_manager.Condition(
 
 
970
            multiprocessing_manager.Lock())
 
 
971
        self.client_structure = [attr
 
 
972
                                 for attr in self.__dict__.keys()
 
550
973
                                 if not attr.startswith("_")]
 
551
974
        self.client_structure.append("client_structure")
 
553
 
        for name, t in inspect.getmembers(type(self),
 
 
976
        for name, t in inspect.getmembers(
 
 
977
                type(self), lambda obj: isinstance(obj, property)):
 
557
978
            if not name.startswith("_"):
 
558
979
                self.client_structure.append(name)
 
560
981
    # Send notice to process children that client state has changed
 
561
982
    def send_changedstate(self):
 
562
983
        with self.changedstate:
 
563
984
            self.changedstate.notify_all()
 
565
986
    def enable(self):
 
566
987
        """Start this client's checker and timeout hooks"""
 
567
988
        if getattr(self, "enabled", False):
 
568
989
            # Already enabled
 
570
 
        self.send_changedstate()
 
571
991
        self.expires = datetime.datetime.utcnow() + self.timeout
 
572
992
        self.enabled = True
 
573
993
        self.last_enabled = datetime.datetime.utcnow()
 
574
994
        self.init_checker()
 
 
995
        self.send_changedstate()
 
576
997
    def disable(self, quiet=True):
 
577
998
        """Disable this client."""
 
578
999
        if not getattr(self, "enabled", False):
 
581
 
            self.send_changedstate()
 
583
1002
            logger.info("Disabling client %s", self.name)
 
584
 
        if getattr(self, "disable_initiator_tag", False):
 
585
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1003
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
1004
            GLib.source_remove(self.disable_initiator_tag)
 
586
1005
            self.disable_initiator_tag = None
 
587
1006
        self.expires = None
 
588
 
        if getattr(self, "checker_initiator_tag", False):
 
589
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1007
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
1008
            GLib.source_remove(self.checker_initiator_tag)
 
590
1009
            self.checker_initiator_tag = None
 
591
1010
        self.stop_checker()
 
592
1011
        self.enabled = False
 
593
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1013
            self.send_changedstate()
 
 
1014
        # Do not run this again if called by a GLib.timeout_add
 
596
1017
    def __del__(self):
 
599
1020
    def init_checker(self):
 
600
1021
        # Schedule a new checker to be started an 'interval' from now,
 
601
1022
        # and every interval from then on.
 
602
 
        self.checker_initiator_tag = (gobject.timeout_add
 
603
 
                                      (self.interval_milliseconds(),
 
 
1023
        if self.checker_initiator_tag is not None:
 
 
1024
            GLib.source_remove(self.checker_initiator_tag)
 
 
1025
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1026
            int(self.interval.total_seconds() * 1000),
 
605
1028
        # Schedule a disable() when 'timeout' has passed
 
606
 
        self.disable_initiator_tag = (gobject.timeout_add
 
607
 
                                   (self.timeout_milliseconds(),
 
 
1029
        if self.disable_initiator_tag is not None:
 
 
1030
            GLib.source_remove(self.disable_initiator_tag)
 
 
1031
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1032
            int(self.timeout.total_seconds() * 1000), self.disable)
 
609
1033
        # Also start a new checker *right now*.
 
610
1034
        self.start_checker()
 
612
 
    def checker_callback(self, pid, condition, command):
 
 
1036
    def checker_callback(self, source, condition, connection,
 
613
1038
        """The checker has completed, so take appropriate actions."""
 
614
1039
        self.checker_callback_tag = None
 
615
1040
        self.checker = None
 
616
 
        if os.WIFEXITED(condition):
 
617
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1041
        # Read return code from connection (see call_pipe)
 
 
1042
        returncode = connection.recv()
 
 
1046
            self.last_checker_status = returncode
 
 
1047
            self.last_checker_signal = None
 
618
1048
            if self.last_checker_status == 0:
 
619
1049
                logger.info("Checker for %(name)s succeeded",
 
621
1051
                self.checked_ok()
 
623
 
                logger.info("Checker for %(name)s failed",
 
 
1053
                logger.info("Checker for %(name)s failed", vars(self))
 
626
1055
            self.last_checker_status = -1
 
 
1056
            self.last_checker_signal = -returncode
 
627
1057
            logger.warning("Checker for %(name)s crashed?",
 
630
1061
    def checked_ok(self):
 
631
1062
        """Assert that the client has been seen, alive and well."""
 
632
1063
        self.last_checked_ok = datetime.datetime.utcnow()
 
633
1064
        self.last_checker_status = 0
 
 
1065
        self.last_checker_signal = None
 
634
1066
        self.bump_timeout()
 
636
1068
    def bump_timeout(self, timeout=None):
 
637
1069
        """Bump up the timeout for this client."""
 
638
1070
        if timeout is None:
 
639
1071
            timeout = self.timeout
 
640
1072
        if self.disable_initiator_tag is not None:
 
641
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1073
            GLib.source_remove(self.disable_initiator_tag)
 
 
1074
            self.disable_initiator_tag = None
 
642
1075
        if getattr(self, "enabled", False):
 
643
 
            self.disable_initiator_tag = (gobject.timeout_add
 
644
 
                                          (timedelta_to_milliseconds
 
645
 
                                           (timeout), self.disable))
 
 
1076
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1077
                int(timeout.total_seconds() * 1000), self.disable)
 
646
1078
            self.expires = datetime.datetime.utcnow() + timeout
 
648
1080
    def need_approval(self):
 
649
1081
        self.last_approval_request = datetime.datetime.utcnow()
 
651
1083
    def start_checker(self):
 
652
1084
        """Start a new checker subprocess if one is not running.
 
654
1086
        If a checker already exists, leave it running and do
 
656
1088
        # The reason for not killing a running checker is that if we
 
657
 
        # did that, then if a checker (for some reason) started
 
658
 
        # running slowly and taking more than 'interval' time, the
 
659
 
        # client would inevitably timeout, since no checker would get
 
660
 
        # a chance to run to completion.  If we instead leave running
 
 
1089
        # did that, and if a checker (for some reason) started running
 
 
1090
        # slowly and taking more than 'interval' time, then the client
 
 
1091
        # would inevitably timeout, since no checker would get a
 
 
1092
        # chance to run to completion.  If we instead leave running
 
661
1093
        # checkers alone, the checker would have to take more time
 
662
1094
        # than 'timeout' for the client to be disabled, which is as it
 
665
 
        # If a checker exists, make sure it is not a zombie
 
667
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
668
 
        except (AttributeError, OSError) as error:
 
669
 
            if (isinstance(error, OSError)
 
670
 
                and error.errno != errno.ECHILD):
 
674
 
                logger.warning("Checker was a zombie")
 
675
 
                gobject.source_remove(self.checker_callback_tag)
 
676
 
                self.checker_callback(pid, status,
 
677
 
                                      self.current_checker_command)
 
 
1097
        if self.checker is not None and not self.checker.is_alive():
 
 
1098
            logger.warning("Checker was not alive; joining")
 
678
1101
        # Start a new checker if needed
 
679
1102
        if self.checker is None:
 
 
1103
            # Escape attributes for the shell
 
 
1105
                attr: re.escape(str(getattr(self, attr)))
 
 
1106
                for attr in self.runtime_expansions}
 
681
 
                # In case checker_command has exactly one % operator
 
682
 
                command = self.checker_command % self.host
 
684
 
                # Escape attributes for the shell
 
685
 
                escaped_attrs = dict(
 
687
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
691
 
                    self.runtime_expansions)
 
694
 
                    command = self.checker_command % escaped_attrs
 
695
 
                except TypeError as error:
 
696
 
                    logger.error('Could not format string "%s"',
 
697
 
                                 self.checker_command, exc_info=error)
 
698
 
                    return True # Try again later
 
 
1108
                command = self.checker_command % escaped_attrs
 
 
1109
            except TypeError as error:
 
 
1110
                logger.error('Could not format string "%s"',
 
 
1111
                             self.checker_command,
 
 
1113
                return True     # Try again later
 
699
1114
            self.current_checker_command = command
 
701
 
                logger.info("Starting checker %r for %s",
 
703
 
                # We don't need to redirect stdout and stderr, since
 
704
 
                # in normal mode, that is already done by daemon(),
 
705
 
                # and in debug mode we don't want to.  (Stdin is
 
706
 
                # always replaced by /dev/null.)
 
707
 
                self.checker = subprocess.Popen(command,
 
710
 
                self.checker_callback_tag = (gobject.child_watch_add
 
712
 
                                              self.checker_callback,
 
714
 
                # The checker may have completed before the gobject
 
715
 
                # watch was added.  Check for this.
 
716
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
718
 
                    gobject.source_remove(self.checker_callback_tag)
 
719
 
                    self.checker_callback(pid, status, command)
 
720
 
            except OSError as error:
 
721
 
                logger.error("Failed to start subprocess",
 
723
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
1115
            logger.info("Starting checker %r for %s", command,
 
 
1117
            # We don't need to redirect stdout and stderr, since
 
 
1118
            # in normal mode, that is already done by daemon(),
 
 
1119
            # and in debug mode we don't want to.  (Stdin is
 
 
1120
            # always replaced by /dev/null.)
 
 
1121
            # The exception is when not debugging but nevertheless
 
 
1122
            # running in the foreground; use the previously
 
 
1124
            popen_args = {"close_fds": True,
 
 
1127
            if (not self.server_settings["debug"]
 
 
1128
                and self.server_settings["foreground"]):
 
 
1129
                popen_args.update({"stdout": wnull,
 
 
1131
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1132
            self.checker = multiprocessing.Process(
 
 
1134
                args=(pipe[1], subprocess.call, command),
 
 
1136
            self.checker.start()
 
 
1137
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1138
                pipe[0].fileno(), GLib.IO_IN,
 
 
1139
                self.checker_callback, pipe[0], command)
 
 
1140
        # Re-run this periodically if run by GLib.timeout_add
 
726
1143
    def stop_checker(self):
 
727
1144
        """Force the checker process, if any, to stop."""
 
728
1145
        if self.checker_callback_tag:
 
729
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1146
            GLib.source_remove(self.checker_callback_tag)
 
730
1147
            self.checker_callback_tag = None
 
731
1148
        if getattr(self, "checker", None) is None:
 
733
1150
        logger.debug("Stopping checker for %(name)s", vars(self))
 
735
 
            self.checker.terminate()
 
737
 
            #if self.checker.poll() is None:
 
738
 
            #    self.checker.kill()
 
739
 
        except OSError as error:
 
740
 
            if error.errno != errno.ESRCH: # No such process
 
 
1151
        self.checker.terminate()
 
742
1152
        self.checker = None
 
745
 
def dbus_service_property(dbus_interface, signature="v",
 
746
 
                          access="readwrite", byte_arrays=False):
 
 
1155
def dbus_service_property(dbus_interface,
 
747
1159
    """Decorators for marking methods of a DBusObjectWithProperties to
 
748
1160
    become properties on the D-Bus.
 
750
1162
    The decorated method will be called with no arguments by "Get"
 
751
1163
    and with one argument by "Set".
 
753
1165
    The parameters, where they are supported, are the same as
 
754
1166
    dbus.service.method, except there is only "signature", since the
 
755
1167
    type from Get() and the type sent to Set() is the same.
 
 
831
 
class DBusObjectWithProperties(dbus.service.Object):
 
832
 
    """A D-Bus object with properties.
 
834
 
    Classes inheriting from this can use the dbus_service_property
 
835
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
836
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
1250
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1251
    """A D-Bus object with annotations.
 
 
1253
    Classes inheriting from this can use the dbus_annotations
 
 
1254
    decorator to add annotations to methods or signals.
 
840
1258
    def _is_dbus_thing(thing):
 
841
1259
        """Returns a function testing if an attribute is a D-Bus thing
 
843
1261
        If called like _is_dbus_thing("method") it returns a function
 
844
1262
        suitable for use as predicate to inspect.getmembers().
 
846
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1264
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
849
1267
    def _get_all_dbus_things(self, thing):
 
850
1268
        """Returns a generator of (name, attribute) pairs
 
852
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1270
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
854
1271
                 athing.__get__(self))
 
855
1272
                for cls in self.__class__.__mro__
 
856
1273
                for name, athing in
 
857
 
                inspect.getmembers(cls,
 
858
 
                                   self._is_dbus_thing(thing)))
 
 
1274
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1276
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1278
                         path_keyword='object_path',
 
 
1279
                         connection_keyword='connection')
 
 
1280
    def Introspect(self, object_path, connection):
 
 
1281
        """Overloading of standard D-Bus method.
 
 
1283
        Inserts annotation tags on methods and signals.
 
 
1285
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1288
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1290
            for if_tag in document.getElementsByTagName("interface"):
 
 
1291
                # Add annotation tags
 
 
1292
                for typ in ("method", "signal"):
 
 
1293
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1295
                        for name, prop in (self.
 
 
1296
                                           _get_all_dbus_things(typ)):
 
 
1297
                            if (name == tag.getAttribute("name")
 
 
1298
                                and prop._dbus_interface
 
 
1299
                                == if_tag.getAttribute("name")):
 
 
1300
                                annots.update(getattr(
 
 
1301
                                    prop, "_dbus_annotations", {}))
 
 
1302
                        for name, value in annots.items():
 
 
1303
                            ann_tag = document.createElement(
 
 
1305
                            ann_tag.setAttribute("name", name)
 
 
1306
                            ann_tag.setAttribute("value", value)
 
 
1307
                            tag.appendChild(ann_tag)
 
 
1308
                # Add interface annotation tags
 
 
1309
                for annotation, value in dict(
 
 
1310
                    itertools.chain.from_iterable(
 
 
1311
                        annotations().items()
 
 
1312
                        for name, annotations
 
 
1313
                        in self._get_all_dbus_things("interface")
 
 
1314
                        if name == if_tag.getAttribute("name")
 
 
1316
                    ann_tag = document.createElement("annotation")
 
 
1317
                    ann_tag.setAttribute("name", annotation)
 
 
1318
                    ann_tag.setAttribute("value", value)
 
 
1319
                    if_tag.appendChild(ann_tag)
 
 
1320
                # Fix argument name for the Introspect method itself
 
 
1321
                if (if_tag.getAttribute("name")
 
 
1322
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1323
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1324
                        if cn.getAttribute("name") == "Introspect":
 
 
1325
                            for arg in cn.getElementsByTagName("arg"):
 
 
1326
                                if (arg.getAttribute("direction")
 
 
1328
                                    arg.setAttribute("name",
 
 
1330
            xmlstring = document.toxml("utf-8")
 
 
1332
        except (AttributeError, xml.dom.DOMException,
 
 
1333
                xml.parsers.expat.ExpatError) as error:
 
 
1334
            logger.error("Failed to override Introspection method",
 
 
1339
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1340
    """A D-Bus object with properties.
 
 
1342
    Classes inheriting from this can use the dbus_service_property
 
 
1343
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1344
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
860
1347
    def _get_dbus_property(self, interface_name, property_name):
 
861
1348
        """Returns a bound method if one exists which is a D-Bus
 
862
1349
        property with the specified name and interface.
 
864
 
        for cls in  self.__class__.__mro__:
 
865
 
            for name, value in (inspect.getmembers
 
867
 
                                 self._is_dbus_thing("property"))):
 
 
1351
        for cls in self.__class__.__mro__:
 
 
1352
            for name, value in inspect.getmembers(
 
 
1353
                    cls, self._is_dbus_thing("property")):
 
868
1354
                if (value._dbus_name == property_name
 
869
1355
                    and value._dbus_interface == interface_name):
 
870
1356
                    return value.__get__(self)
 
872
1358
        # No such property
 
873
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
874
 
                                   + interface_name + "."
 
877
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1359
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1360
            self.dbus_object_path, interface_name, property_name))
 
 
1363
    def _get_all_interface_names(cls):
 
 
1364
        """Get a sequence of all interfaces supported by an object"""
 
 
1365
        return (name for name in set(getattr(getattr(x, attr),
 
 
1366
                                             "_dbus_interface", None)
 
 
1367
                                     for x in (inspect.getmro(cls))
 
 
1369
                if name is not None)
 
 
1371
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
878
1373
                         out_signature="v")
 
879
1374
    def Get(self, interface_name, property_name):
 
880
1375
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1010
1504
        return xmlstring
 
1013
 
def datetime_to_dbus (dt, variant_level=0):
 
 
1508
    dbus.OBJECT_MANAGER_IFACE
 
 
1509
except AttributeError:
 
 
1510
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1513
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1514
    """A D-Bus object with an ObjectManager.
 
 
1516
    Classes inheriting from this exposes the standard
 
 
1517
    GetManagedObjects call and the InterfacesAdded and
 
 
1518
    InterfacesRemoved signals on the standard
 
 
1519
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1521
    Note: No signals are sent automatically; they must be sent
 
 
1524
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1525
                         out_signature="a{oa{sa{sv}}}")
 
 
1526
    def GetManagedObjects(self):
 
 
1527
        """This function must be overridden"""
 
 
1528
        raise NotImplementedError()
 
 
1530
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1531
                         signature="oa{sa{sv}}")
 
 
1532
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1535
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1536
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1539
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1541
                         path_keyword='object_path',
 
 
1542
                         connection_keyword='connection')
 
 
1543
    def Introspect(self, object_path, connection):
 
 
1544
        """Overloading of standard D-Bus method.
 
 
1546
        Override return argument name of GetManagedObjects to be
 
 
1547
        "objpath_interfaces_and_properties"
 
 
1549
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1553
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1555
            for if_tag in document.getElementsByTagName("interface"):
 
 
1556
                # Fix argument name for the GetManagedObjects method
 
 
1557
                if (if_tag.getAttribute("name")
 
 
1558
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1559
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1560
                        if (cn.getAttribute("name")
 
 
1561
                            == "GetManagedObjects"):
 
 
1562
                            for arg in cn.getElementsByTagName("arg"):
 
 
1563
                                if (arg.getAttribute("direction")
 
 
1567
                                        "objpath_interfaces"
 
 
1569
            xmlstring = document.toxml("utf-8")
 
 
1571
        except (AttributeError, xml.dom.DOMException,
 
 
1572
                xml.parsers.expat.ExpatError) as error:
 
 
1573
            logger.error("Failed to override Introspection method",
 
 
1578
def datetime_to_dbus(dt, variant_level=0):
 
1014
1579
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1016
 
        return dbus.String("", variant_level = variant_level)
 
1017
 
    return dbus.String(dt.isoformat(),
 
1018
 
                       variant_level=variant_level)
 
1021
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
1023
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
1024
 
    will add additional D-Bus attributes matching a certain pattern.
 
 
1581
        return dbus.String("", variant_level=variant_level)
 
 
1582
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1585
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1586
    """A class decorator; applied to a subclass of
 
 
1587
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1588
    interface names according to the "alt_interface_names" mapping.
 
 
1591
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1592
                                    "net.example.AlternateInterface"})
 
 
1593
    class SampleDBusObject(dbus.service.Object):
 
 
1594
        @dbus.service.method("org.example.Interface")
 
 
1595
        def SampleDBusMethod():
 
 
1598
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1599
    reachable via two interfaces: "org.example.Interface" and
 
 
1600
    "net.example.AlternateInterface", the latter of which will have
 
 
1601
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1602
    "true", unless "deprecate" is passed with a False value.
 
 
1604
    This works for methods and signals, and also for D-Bus properties
 
 
1605
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1606
    dbus_interface_annotations decorator).
 
1026
 
    def __new__(mcs, name, bases, attr):
 
1027
 
        # Go through all the base classes which could have D-Bus
 
1028
 
        # methods, signals, or properties in them
 
1029
 
        old_interface_names = []
 
1030
 
        for base in (b for b in bases
 
1031
 
                     if issubclass(b, dbus.service.Object)):
 
1032
 
            # Go though all attributes of the base class
 
1033
 
            for attrname, attribute in inspect.getmembers(base):
 
 
1610
        for orig_interface_name, alt_interface_name in (
 
 
1611
                alt_interface_names.items()):
 
 
1613
            interface_names = set()
 
 
1614
            # Go though all attributes of the class
 
 
1615
            for attrname, attribute in inspect.getmembers(cls):
 
1034
1616
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1035
1617
                # with the wrong interface name
 
1036
1618
                if (not hasattr(attribute, "_dbus_interface")
 
1037
 
                    or not attribute._dbus_interface
 
1038
 
                    .startswith("se.recompile.Mandos")):
 
 
1619
                    or not attribute._dbus_interface.startswith(
 
 
1620
                        orig_interface_name)):
 
1040
1622
                # Create an alternate D-Bus interface name based on
 
1041
1623
                # the current name
 
1042
 
                alt_interface = (attribute._dbus_interface
 
1043
 
                                 .replace("se.recompile.Mandos",
 
1044
 
                                          "se.bsnet.fukt.Mandos"))
 
1045
 
                if alt_interface != attribute._dbus_interface:
 
1046
 
                    old_interface_names.append(alt_interface)
 
 
1624
                alt_interface = attribute._dbus_interface.replace(
 
 
1625
                    orig_interface_name, alt_interface_name)
 
 
1626
                interface_names.add(alt_interface)
 
1047
1627
                # Is this a D-Bus signal?
 
1048
1628
                if getattr(attribute, "_dbus_is_signal", False):
 
1049
 
                    # Extract the original non-method function by
 
1051
 
                    nonmethod_func = (dict(
 
 
1629
                    # Extract the original non-method undecorated
 
 
1630
                    # function by black magic
 
 
1631
                    if sys.version_info.major == 2:
 
 
1632
                        nonmethod_func = (dict(
 
1052
1633
                            zip(attribute.func_code.co_freevars,
 
1053
 
                                attribute.__closure__))["func"]
 
 
1634
                                attribute.__closure__))
 
 
1635
                                          ["func"].cell_contents)
 
 
1637
                        nonmethod_func = (dict(
 
 
1638
                            zip(attribute.__code__.co_freevars,
 
 
1639
                                attribute.__closure__))
 
 
1640
                                          ["func"].cell_contents)
 
1055
1641
                    # Create a new, but exactly alike, function
 
1056
1642
                    # object, and decorate it to be a new D-Bus signal
 
1057
1643
                    # with the alternate D-Bus interface name
 
1058
 
                    new_function = (dbus.service.signal
 
1060
 
                                     attribute._dbus_signature)
 
1061
 
                                    (types.FunctionType(
 
1062
 
                                nonmethod_func.func_code,
 
1063
 
                                nonmethod_func.func_globals,
 
1064
 
                                nonmethod_func.func_name,
 
1065
 
                                nonmethod_func.func_defaults,
 
1066
 
                                nonmethod_func.func_closure)))
 
 
1644
                    new_function = copy_function(nonmethod_func)
 
 
1645
                    new_function = (dbus.service.signal(
 
 
1647
                        attribute._dbus_signature)(new_function))
 
1067
1648
                    # Copy annotations, if any
 
1069
 
                        new_function._dbus_annotations = (
 
1070
 
                            dict(attribute._dbus_annotations))
 
 
1650
                        new_function._dbus_annotations = dict(
 
 
1651
                            attribute._dbus_annotations)
 
1071
1652
                    except AttributeError:
 
1073
1655
                    # Define a creator of a function to call both the
 
1074
 
                    # old and new functions, so both the old and new
 
1075
 
                    # signals gets sent when the function is called
 
 
1656
                    # original and alternate functions, so both the
 
 
1657
                    # original and alternate signals gets sent when
 
 
1658
                    # the function is called
 
1076
1659
                    def fixscope(func1, func2):
 
1077
1660
                        """This function is a scope container to pass
 
1078
1661
                        func1 and func2 to the "call_both" function
 
1079
1662
                        outside of its arguments"""
 
 
1664
                        @functools.wraps(func2)
 
1080
1665
                        def call_both(*args, **kwargs):
 
1081
1666
                            """This function will emit two D-Bus
 
1082
1667
                            signals by calling func1 and func2"""
 
1083
1668
                            func1(*args, **kwargs)
 
1084
1669
                            func2(*args, **kwargs)
 
 
1670
                        # Make wrapper function look like a D-Bus
 
 
1672
                        for name, attr in inspect.getmembers(func2):
 
 
1673
                            if name.startswith("_dbus_"):
 
 
1674
                                setattr(call_both, name, attr)
 
1085
1676
                        return call_both
 
1086
1677
                    # Create the "call_both" function and add it to
 
1088
 
                    attr[attrname] = fixscope(attribute,
 
 
1679
                    attr[attrname] = fixscope(attribute, new_function)
 
1090
1680
                # Is this a D-Bus method?
 
1091
1681
                elif getattr(attribute, "_dbus_is_method", False):
 
1092
1682
                    # Create a new, but exactly alike, function
 
1093
1683
                    # object.  Decorate it to be a new D-Bus method
 
1094
1684
                    # with the alternate D-Bus interface name.  Add it
 
1095
1685
                    # to the class.
 
1096
 
                    attr[attrname] = (dbus.service.method
 
1098
 
                                       attribute._dbus_in_signature,
 
1099
 
                                       attribute._dbus_out_signature)
 
1101
 
                                       (attribute.func_code,
 
1102
 
                                        attribute.func_globals,
 
1103
 
                                        attribute.func_name,
 
1104
 
                                        attribute.func_defaults,
 
1105
 
                                        attribute.func_closure)))
 
 
1687
                        dbus.service.method(
 
 
1689
                            attribute._dbus_in_signature,
 
 
1690
                            attribute._dbus_out_signature)
 
 
1691
                        (copy_function(attribute)))
 
1106
1692
                    # Copy annotations, if any
 
1108
 
                        attr[attrname]._dbus_annotations = (
 
1109
 
                            dict(attribute._dbus_annotations))
 
 
1694
                        attr[attrname]._dbus_annotations = dict(
 
 
1695
                            attribute._dbus_annotations)
 
1110
1696
                    except AttributeError:
 
1112
1698
                # Is this a D-Bus property?
 
 
1140
1719
                    # object.  Decorate it to be a new D-Bus interface
 
1141
1720
                    # with the alternate D-Bus interface name.  Add it
 
1142
1721
                    # to the class.
 
1143
 
                    attr[attrname] = (dbus_interface_annotations
 
1146
 
                                       (attribute.func_code,
 
1147
 
                                        attribute.func_globals,
 
1148
 
                                        attribute.func_name,
 
1149
 
                                        attribute.func_defaults,
 
1150
 
                                        attribute.func_closure)))
 
1151
 
        # Deprecate all old interfaces
 
1152
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
 
1153
 
        for old_interface_name in old_interface_names:
 
1154
 
            @dbus_interface_annotations(old_interface_name)
 
1156
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
 
1157
 
            # Find an unused name
 
1158
 
            for aname in (basename.format(i) for i in
 
1160
 
                if aname not in attr:
 
1163
 
        return type.__new__(mcs, name, bases, attr)
 
 
1723
                        dbus_interface_annotations(alt_interface)
 
 
1724
                        (copy_function(attribute)))
 
 
1726
                # Deprecate all alternate interfaces
 
 
1727
                iname = "_AlternateDBusNames_interface_annotation{}"
 
 
1728
                for interface_name in interface_names:
 
 
1730
                    @dbus_interface_annotations(interface_name)
 
 
1732
                        return {"org.freedesktop.DBus.Deprecated":
 
 
1734
                    # Find an unused name
 
 
1735
                    for aname in (iname.format(i)
 
 
1736
                                  for i in itertools.count()):
 
 
1737
                        if aname not in attr:
 
 
1741
                # Replace the class with a new subclass of it with
 
 
1742
                # methods, signals, etc. as created above.
 
 
1743
                if sys.version_info.major == 2:
 
 
1744
                    cls = type(b"{}Alternate".format(cls.__name__),
 
 
1747
                    cls = type("{}Alternate".format(cls.__name__),
 
 
1754
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1755
                            "se.bsnet.fukt.Mandos"})
 
1166
1756
class ClientDBus(Client, DBusObjectWithProperties):
 
1167
1757
    """A Client class using D-Bus
 
1170
1760
    dbus_object_path: dbus.ObjectPath
 
1171
1761
    bus: dbus.SystemBus()
 
1174
1764
    runtime_expansions = (Client.runtime_expansions
 
1175
 
                          + ("dbus_object_path",))
 
 
1765
                          + ("dbus_object_path", ))
 
 
1767
    _interface = "se.recompile.Mandos.Client"
 
1177
1769
    # dbus.service.Object doesn't use super(), so we can't either.
 
1179
 
    def __init__(self, bus = None, *args, **kwargs):
 
 
1771
    def __init__(self, bus=None, *args, **kwargs):
 
1181
1773
        Client.__init__(self, *args, **kwargs)
 
1182
1774
        # Only now, when this client is initialized, can it show up on
 
1184
 
        client_object_name = unicode(self.name).translate(
 
 
1776
        client_object_name = str(self.name).translate(
 
1185
1777
            {ord("."): ord("_"),
 
1186
1778
             ord("-"): ord("_")})
 
1187
 
        self.dbus_object_path = (dbus.ObjectPath
 
1188
 
                                 ("/clients/" + client_object_name))
 
 
1779
        self.dbus_object_path = dbus.ObjectPath(
 
 
1780
            "/clients/" + client_object_name)
 
1189
1781
        DBusObjectWithProperties.__init__(self, self.bus,
 
1190
1782
                                          self.dbus_object_path)
 
1192
 
    def notifychangeproperty(transform_func,
 
1193
 
                             dbus_name, type_func=lambda x: x,
 
 
1784
    def notifychangeproperty(transform_func, dbus_name,
 
 
1785
                             type_func=lambda x: x,
 
 
1787
                             invalidate_only=False,
 
 
1788
                             _interface=_interface):
 
1195
1789
        """ Modify a variable so that it's a property which announces
 
1196
1790
        its changes to DBus.
 
1198
1792
        transform_fun: Function that takes a value and a variant_level
 
1199
1793
                       and transforms it to a D-Bus type.
 
1200
1794
        dbus_name: D-Bus name of the variable
 
 
1350
1946
        server to mandos-client
 
1354
1950
    # Rejected - signal
 
1355
1951
    @dbus.service.signal(_interface, signature="s")
 
1356
1952
    def Rejected(self, reason):
 
1360
1956
    # NeedApproval - signal
 
1361
1957
    @dbus.service.signal(_interface, signature="tb")
 
1362
1958
    def NeedApproval(self, timeout, default):
 
1364
1960
        return self.need_approval()
 
1368
1964
    # Approve - method
 
1369
1965
    @dbus.service.method(_interface, in_signature="b")
 
1370
1966
    def Approve(self, value):
 
1371
1967
        self.approve(value)
 
1373
1969
    # CheckedOK - method
 
1374
1970
    @dbus.service.method(_interface)
 
1375
1971
    def CheckedOK(self):
 
1376
1972
        self.checked_ok()
 
1378
1974
    # Enable - method
 
 
1975
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1379
1976
    @dbus.service.method(_interface)
 
1380
1977
    def Enable(self):
 
1384
1981
    # StartChecker - method
 
 
1982
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1385
1983
    @dbus.service.method(_interface)
 
1386
1984
    def StartChecker(self):
 
1388
1986
        self.start_checker()
 
1390
1988
    # Disable - method
 
 
1989
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1391
1990
    @dbus.service.method(_interface)
 
1392
1991
    def Disable(self):
 
1396
1995
    # StopChecker - method
 
 
1996
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1397
1997
    @dbus.service.method(_interface)
 
1398
1998
    def StopChecker(self):
 
1399
1999
        self.stop_checker()
 
1403
2003
    # ApprovalPending - property
 
1404
2004
    @dbus_service_property(_interface, signature="b", access="read")
 
1405
2005
    def ApprovalPending_dbus_property(self):
 
1406
2006
        return dbus.Boolean(bool(self.approvals_pending))
 
1408
2008
    # ApprovedByDefault - property
 
1409
 
    @dbus_service_property(_interface, signature="b",
 
 
2009
    @dbus_service_property(_interface,
 
1410
2011
                           access="readwrite")
 
1411
2012
    def ApprovedByDefault_dbus_property(self, value=None):
 
1412
2013
        if value is None:       # get
 
1413
2014
            return dbus.Boolean(self.approved_by_default)
 
1414
2015
        self.approved_by_default = bool(value)
 
1416
2017
    # ApprovalDelay - property
 
1417
 
    @dbus_service_property(_interface, signature="t",
 
 
2018
    @dbus_service_property(_interface,
 
1418
2020
                           access="readwrite")
 
1419
2021
    def ApprovalDelay_dbus_property(self, value=None):
 
1420
2022
        if value is None:       # get
 
1421
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2023
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1422
2025
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1424
2027
    # ApprovalDuration - property
 
1425
 
    @dbus_service_property(_interface, signature="t",
 
 
2028
    @dbus_service_property(_interface,
 
1426
2030
                           access="readwrite")
 
1427
2031
    def ApprovalDuration_dbus_property(self, value=None):
 
1428
2032
        if value is None:       # get
 
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1430
 
                    self.approval_duration))
 
 
2033
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1431
2035
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1433
2037
    # Name - property
 
 
2039
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1434
2040
    @dbus_service_property(_interface, signature="s", access="read")
 
1435
2041
    def Name_dbus_property(self):
 
1436
2042
        return dbus.String(self.name)
 
 
2046
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2047
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2048
    def KeyID_dbus_property(self):
 
 
2049
        return dbus.String(self.key_id)
 
1438
2051
    # Fingerprint - property
 
 
2053
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1439
2054
    @dbus_service_property(_interface, signature="s", access="read")
 
1440
2055
    def Fingerprint_dbus_property(self):
 
1441
2056
        return dbus.String(self.fingerprint)
 
1443
2058
    # Host - property
 
1444
 
    @dbus_service_property(_interface, signature="s",
 
 
2059
    @dbus_service_property(_interface,
 
1445
2061
                           access="readwrite")
 
1446
2062
    def Host_dbus_property(self, value=None):
 
1447
2063
        if value is None:       # get
 
1448
2064
            return dbus.String(self.host)
 
1449
 
        self.host = unicode(value)
 
 
2065
        self.host = str(value)
 
1451
2067
    # Created - property
 
 
2069
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1452
2070
    @dbus_service_property(_interface, signature="s", access="read")
 
1453
2071
    def Created_dbus_property(self):
 
1454
2072
        return datetime_to_dbus(self.created)
 
1456
2074
    # LastEnabled - property
 
1457
2075
    @dbus_service_property(_interface, signature="s", access="read")
 
1458
2076
    def LastEnabled_dbus_property(self):
 
1459
2077
        return datetime_to_dbus(self.last_enabled)
 
1461
2079
    # Enabled - property
 
1462
 
    @dbus_service_property(_interface, signature="b",
 
 
2080
    @dbus_service_property(_interface,
 
1463
2082
                           access="readwrite")
 
1464
2083
    def Enabled_dbus_property(self, value=None):
 
1465
2084
        if value is None:       # get
 
 
1472
2091
    # LastCheckedOK - property
 
1473
 
    @dbus_service_property(_interface, signature="s",
 
 
2092
    @dbus_service_property(_interface,
 
1474
2094
                           access="readwrite")
 
1475
2095
    def LastCheckedOK_dbus_property(self, value=None):
 
1476
2096
        if value is not None:
 
1477
2097
            self.checked_ok()
 
1479
2099
        return datetime_to_dbus(self.last_checked_ok)
 
1481
2101
    # LastCheckerStatus - property
 
1482
 
    @dbus_service_property(_interface, signature="n",
 
 
2102
    @dbus_service_property(_interface, signature="n", access="read")
 
1484
2103
    def LastCheckerStatus_dbus_property(self):
 
1485
2104
        return dbus.Int16(self.last_checker_status)
 
1487
2106
    # Expires - property
 
1488
2107
    @dbus_service_property(_interface, signature="s", access="read")
 
1489
2108
    def Expires_dbus_property(self):
 
1490
2109
        return datetime_to_dbus(self.expires)
 
1492
2111
    # LastApprovalRequest - property
 
1493
2112
    @dbus_service_property(_interface, signature="s", access="read")
 
1494
2113
    def LastApprovalRequest_dbus_property(self):
 
1495
2114
        return datetime_to_dbus(self.last_approval_request)
 
1497
2116
    # Timeout - property
 
1498
 
    @dbus_service_property(_interface, signature="t",
 
 
2117
    @dbus_service_property(_interface,
 
1499
2119
                           access="readwrite")
 
1500
2120
    def Timeout_dbus_property(self, value=None):
 
1501
2121
        if value is None:       # get
 
1502
 
            return dbus.UInt64(self.timeout_milliseconds())
 
 
2122
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
 
2123
        old_timeout = self.timeout
 
1503
2124
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1504
 
        # Reschedule timeout
 
 
2125
        # Reschedule disabling
 
1505
2126
        if self.enabled:
 
1506
2127
            now = datetime.datetime.utcnow()
 
1507
 
            time_to_die = timedelta_to_milliseconds(
 
1508
 
                (self.last_checked_ok + self.timeout) - now)
 
1509
 
            if time_to_die <= 0:
 
 
2128
            self.expires += self.timeout - old_timeout
 
 
2129
            if self.expires <= now:
 
1510
2130
                # The timeout has passed
 
1513
 
                self.expires = (now +
 
1514
 
                                datetime.timedelta(milliseconds =
 
1516
2133
                if (getattr(self, "disable_initiator_tag", None)
 
1519
 
                gobject.source_remove(self.disable_initiator_tag)
 
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
 
 
2136
                GLib.source_remove(self.disable_initiator_tag)
 
 
2137
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2138
                    int((self.expires - now).total_seconds() * 1000),
 
1524
2141
    # ExtendedTimeout - property
 
1525
 
    @dbus_service_property(_interface, signature="t",
 
 
2142
    @dbus_service_property(_interface,
 
1526
2144
                           access="readwrite")
 
1527
2145
    def ExtendedTimeout_dbus_property(self, value=None):
 
1528
2146
        if value is None:       # get
 
1529
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2147
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1530
2149
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1532
2151
    # Interval - property
 
1533
 
    @dbus_service_property(_interface, signature="t",
 
 
2152
    @dbus_service_property(_interface,
 
1534
2154
                           access="readwrite")
 
1535
2155
    def Interval_dbus_property(self, value=None):
 
1536
2156
        if value is None:       # get
 
1537
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2157
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1538
2158
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1539
2159
        if getattr(self, "checker_initiator_tag", None) is None:
 
1541
2161
        if self.enabled:
 
1542
2162
            # Reschedule checker run
 
1543
 
            gobject.source_remove(self.checker_initiator_tag)
 
1544
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1545
 
                                          (value, self.start_checker))
 
1546
 
            self.start_checker()    # Start one now, too
 
 
2163
            GLib.source_remove(self.checker_initiator_tag)
 
 
2164
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2165
                value, self.start_checker)
 
 
2166
            self.start_checker()  # Start one now, too
 
1548
2168
    # Checker - property
 
1549
 
    @dbus_service_property(_interface, signature="s",
 
 
2169
    @dbus_service_property(_interface,
 
1550
2171
                           access="readwrite")
 
1551
2172
    def Checker_dbus_property(self, value=None):
 
1552
2173
        if value is None:       # get
 
1553
2174
            return dbus.String(self.checker_command)
 
1554
 
        self.checker_command = unicode(value)
 
 
2175
        self.checker_command = str(value)
 
1556
2177
    # CheckerRunning - property
 
1557
 
    @dbus_service_property(_interface, signature="b",
 
 
2178
    @dbus_service_property(_interface,
 
1558
2180
                           access="readwrite")
 
1559
2181
    def CheckerRunning_dbus_property(self, value=None):
 
1560
2182
        if value is None:       # get
 
 
1593
2223
        if data[0] == 'data':
 
1595
2225
        if data[0] == 'function':
 
1596
2227
            def func(*args, **kwargs):
 
1597
2228
                self._pipe.send(('funcall', name, args, kwargs))
 
1598
2229
                return self._pipe.recv()[1]
 
1601
2233
    def __setattr__(self, name, value):
 
1602
2234
        if name == '_pipe':
 
1603
2235
            return super(ProxyClient, self).__setattr__(name, value)
 
1604
2236
        self._pipe.send(('setattr', name, value))
 
1607
 
class ClientDBusTransitional(ClientDBus):
 
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
 
1611
2239
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1612
2240
    """A class to handle client connections.
 
1614
2242
    Instantiated once for each connection to handle it.
 
1615
2243
    Note: This will run in its own forked process."""
 
1617
2245
    def handle(self):
 
1618
2246
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1619
2247
            logger.info("TCP connection from: %s",
 
1620
 
                        unicode(self.client_address))
 
 
2248
                        str(self.client_address))
 
1621
2249
            logger.debug("Pipe FD: %d",
 
1622
2250
                         self.server.child_pipe.fileno())
 
1624
 
            session = (gnutls.connection
 
1625
 
                       .ClientSession(self.request,
 
1627
 
                                      .X509Credentials()))
 
1629
 
            # Note: gnutls.connection.X509Credentials is really a
 
1630
 
            # generic GnuTLS certificate credentials object so long as
 
1631
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1632
 
            # here despite using OpenPGP certificates.
 
1634
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1635
 
            #                      "+AES-256-CBC", "+SHA1",
 
1636
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2252
            session = gnutls.ClientSession(self.request)
 
 
2254
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2255
            #                       "+AES-256-CBC", "+SHA1",
 
 
2256
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1638
2258
            # Use a fallback default, since this MUST be set.
 
1639
2259
            priority = self.server.gnutls_priority
 
1640
2260
            if priority is None:
 
1641
2261
                priority = "NORMAL"
 
1642
 
            (gnutls.library.functions
 
1643
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2262
            gnutls.priority_set_direct(session._c_object,
 
 
2263
                                       priority.encode("utf-8"),
 
1646
2266
            # Start communication using the Mandos protocol
 
1647
2267
            # Get protocol number
 
1648
2268
            line = self.request.makefile().readline()
 
1649
2269
            logger.debug("Protocol version: %r", line)
 
1651
2271
                if int(line.strip().split()[0]) > 1:
 
 
2272
                    raise RuntimeError(line)
 
1653
2273
            except (ValueError, IndexError, RuntimeError) as error:
 
1654
2274
                logger.error("Unknown protocol version: %s", error)
 
1657
2277
            # Start GnuTLS connection
 
1659
2279
                session.handshake()
 
1660
 
            except gnutls.errors.GNUTLSError as error:
 
 
2280
            except gnutls.Error as error:
 
1661
2281
                logger.warning("Handshake failed: %s", error)
 
1662
2282
                # Do not run session.bye() here: the session is not
 
1663
2283
                # established.  Just abandon the request.
 
1665
2285
            logger.debug("Handshake succeeded")
 
1667
2287
            approval_required = False
 
1670
 
                    fpr = self.fingerprint(self.peer_certificate
 
1673
 
                        gnutls.errors.GNUTLSError) as error:
 
1674
 
                    logger.warning("Bad certificate: %s", error)
 
1676
 
                logger.debug("Fingerprint: %s", fpr)
 
1679
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2289
                if gnutls.has_rawpk:
 
 
2292
                        key_id = self.key_id(
 
 
2293
                            self.peer_certificate(session))
 
 
2294
                    except (TypeError, gnutls.Error) as error:
 
 
2295
                        logger.warning("Bad certificate: %s", error)
 
 
2297
                    logger.debug("Key ID: %s", key_id)
 
 
2302
                        fpr = self.fingerprint(
 
 
2303
                            self.peer_certificate(session))
 
 
2304
                    except (TypeError, gnutls.Error) as error:
 
 
2305
                        logger.warning("Bad certificate: %s", error)
 
 
2307
                    logger.debug("Fingerprint: %s", fpr)
 
 
2310
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1680
2311
                                         self.client_address)
 
1681
2312
                except KeyError:
 
1684
2315
                if client.approval_delay:
 
1685
2316
                    delay = client.approval_delay
 
1686
2317
                    client.approvals_pending += 1
 
1687
2318
                    approval_required = True
 
1690
2321
                    if not client.enabled:
 
1691
2322
                        logger.info("Client %s is disabled",
 
1693
2324
                        if self.server.use_dbus:
 
1694
2325
                            # Emit D-Bus signal
 
1695
2326
                            client.Rejected("Disabled")
 
1698
2329
                    if client.approved or not client.approval_delay:
 
1699
 
                        #We are approved or approval is disabled
 
 
2330
                        # We are approved or approval is disabled
 
1701
2332
                    elif client.approved is None:
 
1702
2333
                        logger.info("Client %s needs approval",
 
 
1737
2366
                        delay -= time2 - time
 
1740
 
                while sent_size < len(client.secret):
 
1742
 
                        sent = session.send(client.secret[sent_size:])
 
1743
 
                    except gnutls.errors.GNUTLSError as error:
 
1744
 
                        logger.warning("gnutls send failed")
 
1746
 
                    logger.debug("Sent: %d, remaining: %d",
 
1747
 
                                 sent, len(client.secret)
 
1748
 
                                 - (sent_size + sent))
 
 
2369
                    session.send(client.secret)
 
 
2370
                except gnutls.Error as error:
 
 
2371
                    logger.warning("gnutls send failed",
 
1751
2375
                logger.info("Sending secret to %s", client.name)
 
1752
2376
                # bump the timeout using extended_timeout
 
1753
2377
                client.bump_timeout(client.extended_timeout)
 
1754
2378
                if self.server.use_dbus:
 
1755
2379
                    # Emit D-Bus signal
 
1756
2380
                    client.GotSecret()
 
1759
2383
                if approval_required:
 
1760
2384
                    client.approvals_pending -= 1
 
1763
 
                except gnutls.errors.GNUTLSError as error:
 
1764
 
                    logger.warning("GnuTLS bye failed")
 
 
2387
                except gnutls.Error as error:
 
 
2388
                    logger.warning("GnuTLS bye failed",
 
1767
2392
    def peer_certificate(session):
 
1768
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1769
 
        # If not an OpenPGP certificate...
 
1770
 
        if (gnutls.library.functions
 
1771
 
            .gnutls_certificate_type_get(session._c_object)
 
1772
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1773
 
            # ...do the normal thing
 
1774
 
            return session.peer_certificate
 
 
2393
        "Return the peer's certificate as a bytestring"
 
 
2395
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2397
        except AttributeError:
 
 
2398
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2399
        if gnutls.has_rawpk:
 
 
2400
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2402
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2403
        # If not a valid certificate type...
 
 
2404
        if cert_type not in valid_cert_types:
 
 
2405
            logger.info("Cert type %r not in %r", cert_type,
 
 
2407
            # ...return invalid data
 
1775
2409
        list_size = ctypes.c_uint(1)
 
1776
 
        cert_list = (gnutls.library.functions
 
1777
 
                     .gnutls_certificate_get_peers
 
 
2410
        cert_list = (gnutls.certificate_get_peers
 
1778
2411
                     (session._c_object, ctypes.byref(list_size)))
 
1779
2412
        if not bool(cert_list) and list_size.value != 0:
 
1780
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2413
            raise gnutls.Error("error getting peer certificate")
 
1782
2414
        if list_size.value == 0:
 
1784
2416
        cert = cert_list[0]
 
1785
2417
        return ctypes.string_at(cert.data, cert.size)
 
 
2420
    def key_id(certificate):
 
 
2421
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2422
        # New GnuTLS "datum" with the public key
 
 
2423
        datum = gnutls.datum_t(
 
 
2424
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2425
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2426
            ctypes.c_uint(len(certificate)))
 
 
2427
        # XXX all these need to be created in the gnutls "module"
 
 
2428
        # New empty GnuTLS certificate
 
 
2429
        pubkey = gnutls.pubkey_t()
 
 
2430
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2431
        # Import the raw public key into the certificate
 
 
2432
        gnutls.pubkey_import(pubkey,
 
 
2433
                             ctypes.byref(datum),
 
 
2434
                             gnutls.X509_FMT_DER)
 
 
2435
        # New buffer for the key ID
 
 
2436
        buf = ctypes.create_string_buffer(32)
 
 
2437
        buf_len = ctypes.c_size_t(len(buf))
 
 
2438
        # Get the key ID from the raw public key into the buffer
 
 
2439
        gnutls.pubkey_get_key_id(pubkey,
 
 
2440
                                 gnutls.KEYID_USE_SHA256,
 
 
2441
                                 ctypes.cast(ctypes.byref(buf),
 
 
2442
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2443
                                 ctypes.byref(buf_len))
 
 
2444
        # Deinit the certificate
 
 
2445
        gnutls.pubkey_deinit(pubkey)
 
 
2447
        # Convert the buffer to a Python bytestring
 
 
2448
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2449
        # Convert the bytestring to hexadecimal notation
 
 
2450
        hex_key_id = binascii.hexlify(key_id).upper()
 
1788
2454
    def fingerprint(openpgp):
 
1789
2455
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1790
2456
        # New GnuTLS "datum" with the OpenPGP public key
 
1791
 
        datum = (gnutls.library.types
 
1792
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1795
 
                                 ctypes.c_uint(len(openpgp))))
 
 
2457
        datum = gnutls.datum_t(
 
 
2458
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2459
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2460
            ctypes.c_uint(len(openpgp)))
 
1796
2461
        # New empty GnuTLS certificate
 
1797
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1798
 
        (gnutls.library.functions
 
1799
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2462
        crt = gnutls.openpgp_crt_t()
 
 
2463
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1800
2464
        # Import the OpenPGP public key into the certificate
 
1801
 
        (gnutls.library.functions
 
1802
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1803
 
                                    gnutls.library.constants
 
1804
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2465
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2466
                                  gnutls.OPENPGP_FMT_RAW)
 
1805
2467
        # Verify the self signature in the key
 
1806
2468
        crtverify = ctypes.c_uint()
 
1807
 
        (gnutls.library.functions
 
1808
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1809
 
                                         ctypes.byref(crtverify)))
 
 
2469
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2470
                                       ctypes.byref(crtverify))
 
1810
2471
        if crtverify.value != 0:
 
1811
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1812
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2472
            gnutls.openpgp_crt_deinit(crt)
 
 
2473
            raise gnutls.CertificateSecurityError(code
 
1814
2475
        # New buffer for the fingerprint
 
1815
2476
        buf = ctypes.create_string_buffer(20)
 
1816
2477
        buf_len = ctypes.c_size_t()
 
1817
2478
        # Get the fingerprint from the certificate into the buffer
 
1818
 
        (gnutls.library.functions
 
1819
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1820
 
                                             ctypes.byref(buf_len)))
 
 
2479
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2480
                                           ctypes.byref(buf_len))
 
1821
2481
        # Deinit the certificate
 
1822
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2482
        gnutls.openpgp_crt_deinit(crt)
 
1823
2483
        # Convert the buffer to a Python bytestring
 
1824
2484
        fpr = ctypes.string_at(buf, buf_len.value)
 
1825
2485
        # Convert the bytestring to hexadecimal notation
 
 
1830
2490
class MultiprocessingMixIn(object):
 
1831
2491
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1832
2493
    def sub_process_main(self, request, address):
 
1834
2495
            self.finish_request(request, address)
 
1835
2496
        except Exception:
 
1836
2497
            self.handle_error(request, address)
 
1837
2498
        self.close_request(request)
 
1839
2500
    def process_request(self, request, address):
 
1840
2501
        """Start a new process to process the request."""
 
1841
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
 
2502
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2503
                                       args=(request, address))
 
1848
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1849
2509
    """ adds a pipe to the MixIn """
 
1850
2511
    def process_request(self, request, client_address):
 
1851
2512
        """Overrides and wraps the original process_request().
 
1853
2514
        This function creates a new pipe in self.pipe
 
1855
2516
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1857
2518
        proc = MultiprocessingMixIn.process_request(self, request,
 
1858
2519
                                                    client_address)
 
1859
2520
        self.child_pipe.close()
 
1860
2521
        self.add_pipe(parent_pipe, proc)
 
1862
2523
    def add_pipe(self, parent_pipe, proc):
 
1863
2524
        """Dummy function; override as necessary"""
 
1864
 
        raise NotImplementedError
 
 
2525
        raise NotImplementedError()
 
1867
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1868
2529
                     socketserver.TCPServer, object):
 
1869
2530
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1872
2533
        enabled:        Boolean; whether this server is activated yet
 
1873
2534
        interface:      None or a network interface name (string)
 
1874
2535
        use_ipv6:       Boolean; to use IPv6 or not
 
1876
2538
    def __init__(self, server_address, RequestHandlerClass,
 
1877
 
                 interface=None, use_ipv6=True):
 
 
2542
        """If socketfd is set, use that file descriptor instead of
 
 
2543
        creating a new one with socket.socket().
 
1878
2545
        self.interface = interface
 
1880
2547
            self.address_family = socket.AF_INET6
 
 
2548
        if socketfd is not None:
 
 
2549
            # Save the file descriptor
 
 
2550
            self.socketfd = socketfd
 
 
2551
            # Save the original socket.socket() function
 
 
2552
            self.socket_socket = socket.socket
 
 
2554
            # To implement --socket, we monkey patch socket.socket.
 
 
2556
            # (When socketserver.TCPServer is a new-style class, we
 
 
2557
            # could make self.socket into a property instead of monkey
 
 
2558
            # patching socket.socket.)
 
 
2560
            # Create a one-time-only replacement for socket.socket()
 
 
2561
            @functools.wraps(socket.socket)
 
 
2562
            def socket_wrapper(*args, **kwargs):
 
 
2563
                # Restore original function so subsequent calls are
 
 
2565
                socket.socket = self.socket_socket
 
 
2566
                del self.socket_socket
 
 
2567
                # This time only, return a new socket object from the
 
 
2568
                # saved file descriptor.
 
 
2569
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
2570
            # Replace socket.socket() function with wrapper
 
 
2571
            socket.socket = socket_wrapper
 
 
2572
        # The socketserver.TCPServer.__init__ will call
 
 
2573
        # socket.socket(), which might be our replacement,
 
 
2574
        # socket_wrapper(), if socketfd was set.
 
1881
2575
        socketserver.TCPServer.__init__(self, server_address,
 
1882
2576
                                        RequestHandlerClass)
 
1883
2578
    def server_bind(self):
 
1884
2579
        """This overrides the normal server_bind() function
 
1885
2580
        to bind to an interface if one was specified, and also NOT to
 
1886
2581
        bind to an address or port if they were not specified."""
 
 
2582
        global SO_BINDTODEVICE
 
1887
2583
        if self.interface is not None:
 
1888
2584
            if SO_BINDTODEVICE is None:
 
1889
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1890
 
                             " cannot bind to interface %s",
 
1894
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1898
 
                except socket.error as error:
 
1899
 
                    if error[0] == errno.EPERM:
 
1900
 
                        logger.error("No permission to"
 
1901
 
                                     " bind to interface %s",
 
1903
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1904
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1905
 
                                     " cannot bind to interface %s",
 
 
2585
                # Fall back to a hard-coded value which seems to be
 
 
2587
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2588
                SO_BINDTODEVICE = 25
 
 
2590
                self.socket.setsockopt(
 
 
2591
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2592
                    (self.interface + "\0").encode("utf-8"))
 
 
2593
            except socket.error as error:
 
 
2594
                if error.errno == errno.EPERM:
 
 
2595
                    logger.error("No permission to bind to"
 
 
2596
                                 " interface %s", self.interface)
 
 
2597
                elif error.errno == errno.ENOPROTOOPT:
 
 
2598
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2599
                                 " cannot bind to interface %s",
 
 
2601
                elif error.errno == errno.ENODEV:
 
 
2602
                    logger.error("Interface %s does not exist,"
 
 
2603
                                 " cannot bind", self.interface)
 
1909
2606
        # Only bind(2) the socket if we really need to.
 
1910
2607
        if self.server_address[0] or self.server_address[1]:
 
1911
2608
            if not self.server_address[0]:
 
1912
2609
                if self.address_family == socket.AF_INET6:
 
1913
 
                    any_address = "::" # in6addr_any
 
 
2610
                    any_address = "::"  # in6addr_any
 
1915
 
                    any_address = socket.INADDR_ANY
 
 
2612
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1916
2613
                self.server_address = (any_address,
 
1917
2614
                                       self.server_address[1])
 
1918
2615
            elif not self.server_address[1]:
 
1919
 
                self.server_address = (self.server_address[0],
 
 
2616
                self.server_address = (self.server_address[0], 0)
 
1921
2617
#                 if self.interface:
 
1922
2618
#                     self.server_address = (self.server_address[0],
 
 
1948
2649
        self.gnutls_priority = gnutls_priority
 
1949
2650
        IPv6_TCPServer.__init__(self, server_address,
 
1950
2651
                                RequestHandlerClass,
 
1951
 
                                interface = interface,
 
1952
 
                                use_ipv6 = use_ipv6)
 
 
2652
                                interface=interface,
 
1953
2656
    def server_activate(self):
 
1954
2657
        if self.enabled:
 
1955
2658
            return socketserver.TCPServer.server_activate(self)
 
1957
2660
    def enable(self):
 
1958
2661
        self.enabled = True
 
1960
2663
    def add_pipe(self, parent_pipe, proc):
 
1961
2664
        # Call "handle_ipc" for both data and EOF events
 
1962
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1963
 
                             gobject.IO_IN | gobject.IO_HUP,
 
1964
 
                             functools.partial(self.handle_ipc,
 
1969
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1970
 
                   proc = None, client_object=None):
 
1972
 
            gobject.IO_IN: "IN",   # There is data to read.
 
1973
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1975
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1976
 
            gobject.IO_ERR: "ERR", # Error condition.
 
1977
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1978
 
                                    # broken, usually for pipes and
 
1981
 
        conditions_string = ' | '.join(name
 
1983
 
                                       condition_names.iteritems()
 
1984
 
                                       if cond & condition)
 
 
2666
            parent_pipe.fileno(),
 
 
2667
            GLib.IO_IN | GLib.IO_HUP,
 
 
2668
            functools.partial(self.handle_ipc,
 
 
2669
                              parent_pipe=parent_pipe,
 
 
2672
    def handle_ipc(self, source, condition,
 
 
2675
                   client_object=None):
 
1985
2676
        # error, or the other end of multiprocessing.Pipe has closed
 
1986
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
 
2677
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
1987
2678
            # Wait for other process to exit
 
1991
2682
        # Read a request from the child
 
1992
2683
        request = parent_pipe.recv()
 
1993
2684
        command = request[0]
 
1995
2686
        if command == 'init':
 
1997
 
            address = request[2]
 
1999
 
            for c in self.clients.itervalues():
 
2000
 
                if c.fingerprint == fpr:
 
 
2687
            key_id = request[1].decode("ascii")
 
 
2688
            fpr = request[2].decode("ascii")
 
 
2689
            address = request[3]
 
 
2691
            for c in self.clients.values():
 
 
2692
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2694
                if key_id and c.key_id == key_id:
 
 
2697
                if fpr and c.fingerprint == fpr:
 
2004
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2005
 
                            "dress: %s", fpr, address)
 
 
2701
                logger.info("Client not found for key ID: %s, address"
 
 
2702
                            ": %s", key_id or fpr, address)
 
2006
2703
                if self.use_dbus:
 
2007
2704
                    # Emit D-Bus signal
 
2008
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2705
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2010
2707
                parent_pipe.send(False)
 
2013
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
2014
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
2015
 
                                 functools.partial(self.handle_ipc,
 
 
2711
                parent_pipe.fileno(),
 
 
2712
                GLib.IO_IN | GLib.IO_HUP,
 
 
2713
                functools.partial(self.handle_ipc,
 
 
2714
                                  parent_pipe=parent_pipe,
 
 
2716
                                  client_object=client))
 
2021
2717
            parent_pipe.send(True)
 
2022
2718
            # remove the old hook in favor of the new above hook on
 
 
2026
2722
            funcname = request[1]
 
2027
2723
            args = request[2]
 
2028
2724
            kwargs = request[3]
 
2030
2726
            parent_pipe.send(('data', getattr(client_object,
 
2031
2727
                                              funcname)(*args,
 
2034
2730
        if command == 'getattr':
 
2035
2731
            attrname = request[1]
 
2036
 
            if callable(client_object.__getattribute__(attrname)):
 
2037
 
                parent_pipe.send(('function',))
 
 
2732
            if isinstance(client_object.__getattribute__(attrname),
 
 
2733
                          collections.Callable):
 
 
2734
                parent_pipe.send(('function', ))
 
2039
 
                parent_pipe.send(('data', client_object
 
2040
 
                                  .__getattribute__(attrname)))
 
 
2737
                    'data', client_object.__getattribute__(attrname)))
 
2042
2739
        if command == 'setattr':
 
2043
2740
            attrname = request[1]
 
2044
2741
            value = request[2]
 
2045
2742
            setattr(client_object, attrname, value)
 
 
2747
def rfc3339_duration_to_delta(duration):
 
 
2748
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2750
    >>> rfc3339_duration_to_delta("P7D")
 
 
2751
    datetime.timedelta(7)
 
 
2752
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2753
    datetime.timedelta(0, 60)
 
 
2754
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2755
    datetime.timedelta(0, 3600)
 
 
2756
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2757
    datetime.timedelta(1)
 
 
2758
    >>> rfc3339_duration_to_delta("P1W")
 
 
2759
    datetime.timedelta(7)
 
 
2760
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2761
    datetime.timedelta(0, 330)
 
 
2762
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2763
    datetime.timedelta(1, 200)
 
 
2766
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2767
    # possible - there would have to be multiple places for the same
 
 
2768
    # values, like seconds.  The current code, while more esoteric, is
 
 
2769
    # cleaner without depending on a parsing library.  If Python had a
 
 
2770
    # built-in library for parsing we would use it, but we'd like to
 
 
2771
    # avoid excessive use of external libraries.
 
 
2773
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2774
    Token = collections.namedtuple("Token", (
 
 
2775
        "regexp",  # To match token; if "value" is not None, must have
 
 
2776
                   # a "group" containing digits
 
 
2777
        "value",   # datetime.timedelta or None
 
 
2778
        "followers"))           # Tokens valid after this token
 
 
2779
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2780
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2781
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2782
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2783
                         datetime.timedelta(seconds=1),
 
 
2784
                         frozenset((token_end, )))
 
 
2785
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2786
                         datetime.timedelta(minutes=1),
 
 
2787
                         frozenset((token_second, token_end)))
 
 
2788
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2789
                       datetime.timedelta(hours=1),
 
 
2790
                       frozenset((token_minute, token_end)))
 
 
2791
    token_time = Token(re.compile(r"T"),
 
 
2793
                       frozenset((token_hour, token_minute,
 
 
2795
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2796
                      datetime.timedelta(days=1),
 
 
2797
                      frozenset((token_time, token_end)))
 
 
2798
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2799
                        datetime.timedelta(weeks=4),
 
 
2800
                        frozenset((token_day, token_end)))
 
 
2801
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2802
                       datetime.timedelta(weeks=52),
 
 
2803
                       frozenset((token_month, token_end)))
 
 
2804
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2805
                       datetime.timedelta(weeks=1),
 
 
2806
                       frozenset((token_end, )))
 
 
2807
    token_duration = Token(re.compile(r"P"), None,
 
 
2808
                           frozenset((token_year, token_month,
 
 
2809
                                      token_day, token_time,
 
 
2811
    # Define starting values:
 
 
2813
    value = datetime.timedelta()
 
 
2815
    # Following valid tokens
 
 
2816
    followers = frozenset((token_duration, ))
 
 
2817
    # String left to parse
 
 
2819
    # Loop until end token is found
 
 
2820
    while found_token is not token_end:
 
 
2821
        # Search for any currently valid tokens
 
 
2822
        for token in followers:
 
 
2823
            match = token.regexp.match(s)
 
 
2824
            if match is not None:
 
 
2826
                if token.value is not None:
 
 
2827
                    # Value found, parse digits
 
 
2828
                    factor = int(match.group(1), 10)
 
 
2829
                    # Add to value so far
 
 
2830
                    value += factor * token.value
 
 
2831
                # Strip token from string
 
 
2832
                s = token.regexp.sub("", s, 1)
 
 
2835
                # Set valid next tokens
 
 
2836
                followers = found_token.followers
 
 
2839
            # No currently valid tokens were found
 
 
2840
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2050
2846
def string_to_delta(interval):
 
2051
2847
    """Parse a string and return a datetime.timedelta
 
2053
2849
    >>> string_to_delta('7d')
 
2054
2850
    datetime.timedelta(7)
 
2055
2851
    >>> string_to_delta('60s')
 
 
2144
2946
    parser.add_argument("--no-dbus", action="store_false",
 
2145
2947
                        dest="use_dbus", help="Do not provide D-Bus"
 
2146
 
                        " system bus interface")
 
 
2948
                        " system bus interface", default=None)
 
2147
2949
    parser.add_argument("--no-ipv6", action="store_false",
 
2148
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2950
                        dest="use_ipv6", help="Do not use IPv6",
 
2149
2952
    parser.add_argument("--no-restore", action="store_false",
 
2150
2953
                        dest="restore", help="Do not restore stored"
 
 
2954
                        " state", default=None)
 
 
2955
    parser.add_argument("--socket", type=int,
 
 
2956
                        help="Specify a file descriptor to a network"
 
 
2957
                        " socket to use instead of creating one")
 
2152
2958
    parser.add_argument("--statedir", metavar="DIR",
 
2153
2959
                        help="Directory to save/restore state in")
 
 
2960
    parser.add_argument("--foreground", action="store_true",
 
 
2961
                        help="Run in foreground", default=None)
 
 
2962
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2963
                        dest="zeroconf", help="Do not use Zeroconf",
 
2155
2966
    options = parser.parse_args()
 
2157
2968
    if options.check:
 
 
2970
        fail_count, test_count = doctest.testmod()
 
 
2971
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2162
2973
    # Default values for config file for server-global settings
 
2163
 
    server_defaults = { "interface": "",
 
2168
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2169
 
                        "servicename": "Mandos",
 
2174
 
                        "statedir": "/var/lib/mandos"
 
 
2974
    if gnutls.has_rawpk:
 
 
2975
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2976
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2978
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2979
                    ":+SIGN-DSA-SHA256")
 
 
2980
    server_defaults = {"interface": "",
 
 
2984
                       "priority": priority,
 
 
2985
                       "servicename": "Mandos",
 
 
2991
                       "statedir": "/var/lib/mandos",
 
 
2992
                       "foreground": "False",
 
2177
2997
    # Parse config file for server-global settings
 
2178
2998
    server_config = configparser.SafeConfigParser(server_defaults)
 
2179
2999
    del server_defaults
 
2180
 
    server_config.read(os.path.join(options.configdir,
 
 
3000
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2182
3001
    # Convert the SafeConfigParser object to a dict
 
2183
3002
    server_settings = server_config.defaults()
 
2184
3003
    # Use the appropriate methods on the non-string config options
 
2185
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3004
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3005
                   "foreground", "zeroconf"):
 
2186
3006
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2188
3008
    if server_settings["port"]:
 
2189
3009
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
3011
    if server_settings["socket"]:
 
 
3012
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
3014
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
3015
        # over with an opened os.devnull.  But we don't want this to
 
 
3016
        # happen with a supplied network socket.
 
 
3017
        if 0 <= server_settings["socket"] <= 2:
 
 
3018
            server_settings["socket"] = os.dup(server_settings
 
2191
3020
    del server_config
 
2193
3022
    # Override the settings from the config file with command line
 
2194
3023
    # options, if set.
 
2195
3024
    for option in ("interface", "address", "port", "debug",
 
2196
 
                   "priority", "servicename", "configdir",
 
2197
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
 
3025
                   "priority", "servicename", "configdir", "use_dbus",
 
 
3026
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
3027
                   "socket", "foreground", "zeroconf"):
 
2199
3028
        value = getattr(options, option)
 
2200
3029
        if value is not None:
 
2201
3030
            server_settings[option] = value
 
2203
3032
    # Force all strings to be unicode
 
2204
3033
    for option in server_settings.keys():
 
2205
 
        if type(server_settings[option]) is str:
 
2206
 
            server_settings[option] = unicode(server_settings[option])
 
 
3034
        if isinstance(server_settings[option], bytes):
 
 
3035
            server_settings[option] = (server_settings[option]
 
 
3037
    # Force all boolean options to be boolean
 
 
3038
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3039
                   "foreground", "zeroconf"):
 
 
3040
        server_settings[option] = bool(server_settings[option])
 
 
3041
    # Debug implies foreground
 
 
3042
    if server_settings["debug"]:
 
 
3043
        server_settings["foreground"] = True
 
2207
3044
    # Now we have our good server settings in "server_settings"
 
2209
3046
    ##################################################################
 
 
3048
    if (not server_settings["zeroconf"]
 
 
3049
        and not (server_settings["port"]
 
 
3050
                 or server_settings["socket"] != "")):
 
 
3051
        parser.error("Needs port or socket to work without Zeroconf")
 
2211
3053
    # For convenience
 
2212
3054
    debug = server_settings["debug"]
 
2213
3055
    debuglevel = server_settings["debuglevel"]
 
 
2225
3069
            level = getattr(logging, debuglevel.upper())
 
2226
3070
            initlogger(debug, level)
 
2228
3072
    if server_settings["servicename"] != "Mandos":
 
2229
 
        syslogger.setFormatter(logging.Formatter
 
2230
 
                               ('Mandos (%s) [%%(process)d]:'
 
2231
 
                                ' %%(levelname)s: %%(message)s'
 
2232
 
                                % server_settings["servicename"]))
 
 
3073
        syslogger.setFormatter(
 
 
3074
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
3075
                              ' %(levelname)s: %(message)s'.format(
 
 
3076
                                  server_settings["servicename"])))
 
2234
3078
    # Parse config file with clients
 
2235
3079
    client_config = configparser.SafeConfigParser(Client
 
2236
3080
                                                  .client_defaults)
 
2237
3081
    client_config.read(os.path.join(server_settings["configdir"],
 
2238
3082
                                    "clients.conf"))
 
2240
3084
    global mandos_dbus_service
 
2241
3085
    mandos_dbus_service = None
 
2243
 
    tcp_server = MandosServer((server_settings["address"],
 
2244
 
                               server_settings["port"]),
 
2246
 
                              interface=(server_settings["interface"]
 
2250
 
                              server_settings["priority"],
 
2253
 
        pidfilename = "/var/run/mandos.pid"
 
 
3088
    if server_settings["socket"] != "":
 
 
3089
        socketfd = server_settings["socket"]
 
 
3090
    tcp_server = MandosServer(
 
 
3091
        (server_settings["address"], server_settings["port"]),
 
 
3093
        interface=(server_settings["interface"] or None),
 
 
3095
        gnutls_priority=server_settings["priority"],
 
 
3099
        pidfilename = "/run/mandos.pid"
 
 
3100
        if not os.path.isdir("/run/."):
 
 
3101
            pidfilename = "/var/run/mandos.pid"
 
2255
 
            pidfile = open(pidfilename, "w")
 
2257
 
            logger.error("Could not open file %r", pidfilename)
 
2259
 
    for name in ("_mandos", "mandos", "nobody"):
 
 
3104
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
3105
        except IOError as e:
 
 
3106
            logger.error("Could not open file %r", pidfilename,
 
 
3109
    for name, group in (("_mandos", "_mandos"),
 
 
3110
                        ("mandos", "mandos"),
 
 
3111
                        ("nobody", "nogroup")):
 
2261
3113
            uid = pwd.getpwnam(name).pw_uid
 
2262
 
            gid = pwd.getpwnam(name).pw_gid
 
 
3114
            gid = pwd.getpwnam(group).pw_gid
 
2264
3116
        except KeyError:
 
 
 
3125
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2272
3127
    except OSError as error:
 
2273
 
        if error[0] != errno.EPERM:
 
 
3128
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3129
                       .format(uid, gid, os.strerror(error.errno)))
 
 
3130
        if error.errno != errno.EPERM:
 
2277
3134
        # Enable all possible GnuTLS debugging
 
2279
3136
        # "Use a log level over 10 to enable all debugging options."
 
2280
3137
        # - GnuTLS manual
 
2281
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2283
 
        @gnutls.library.types.gnutls_log_func
 
 
3138
        gnutls.global_set_log_level(11)
 
2284
3141
        def debug_gnutls(level, string):
 
2285
3142
            logger.debug("GnuTLS: %s", string[:-1])
 
2287
 
        (gnutls.library.functions
 
2288
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3144
        gnutls.global_set_log_function(debug_gnutls)
 
2290
3146
        # Redirect stdin so all checkers get /dev/null
 
2291
3147
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2292
3148
        os.dup2(null, sys.stdin.fileno())
 
2296
3152
    # Need to fork before connecting to D-Bus
 
2298
3154
        # Close all input and output, do double fork, etc.
 
2301
 
    gobject.threads_init()
 
 
3157
    # multiprocessing will use threads, so before we use GLib we need
 
 
3158
    # to inform GLib that threads will be used.
 
2303
3161
    global main_loop
 
2304
3162
    # From the Avahi example code
 
2305
3163
    DBusGMainLoop(set_as_default=True)
 
2306
 
    main_loop = gobject.MainLoop()
 
 
3164
    main_loop = GLib.MainLoop()
 
2307
3165
    bus = dbus.SystemBus()
 
2308
3166
    # End of Avahi example code
 
2311
3169
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2312
 
                                            bus, do_not_queue=True)
 
2313
 
            old_bus_name = (dbus.service.BusName
 
2314
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2316
 
        except dbus.exceptions.NameExistsException as e:
 
2317
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
 
3172
            old_bus_name = dbus.service.BusName(
 
 
3173
                "se.bsnet.fukt.Mandos", bus,
 
 
3175
        except dbus.exceptions.DBusException as e:
 
 
3176
            logger.error("Disabling D-Bus:", exc_info=e)
 
2318
3177
            use_dbus = False
 
2319
3178
            server_settings["use_dbus"] = False
 
2320
3179
            tcp_server.use_dbus = False
 
2321
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2322
 
    service = AvahiServiceToSyslog(name =
 
2323
 
                                   server_settings["servicename"],
 
2324
 
                                   servicetype = "_mandos._tcp",
 
2325
 
                                   protocol = protocol, bus = bus)
 
2326
 
    if server_settings["interface"]:
 
2327
 
        service.interface = (if_nametoindex
 
2328
 
                             (str(server_settings["interface"])))
 
 
3181
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3182
        service = AvahiServiceToSyslog(
 
 
3183
            name=server_settings["servicename"],
 
 
3184
            servicetype="_mandos._tcp",
 
 
3187
        if server_settings["interface"]:
 
 
3188
            service.interface = if_nametoindex(
 
 
3189
                server_settings["interface"].encode("utf-8"))
 
2330
3191
    global multiprocessing_manager
 
2331
3192
    multiprocessing_manager = multiprocessing.Manager()
 
2333
3194
    client_class = Client
 
2335
 
        client_class = functools.partial(ClientDBusTransitional,
 
 
3196
        client_class = functools.partial(ClientDBus, bus=bus)
 
2338
3198
    client_settings = Client.config_parser(client_config)
 
2339
3199
    old_client_settings = {}
 
2340
3200
    clients_data = {}
 
 
3202
    # This is used to redirect stdout and stderr for checker processes
 
 
3204
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3205
    # Only used if server is running in foreground but not in debug
 
 
3207
    if debug or not foreground:
 
2342
3210
    # Get client data and settings from last running state.
 
2343
3211
    if server_settings["restore"]:
 
2345
3213
            with open(stored_state_path, "rb") as stored_state:
 
2346
 
                clients_data, old_client_settings = (pickle.load
 
 
3214
                if sys.version_info.major == 2:
 
 
3215
                    clients_data, old_client_settings = pickle.load(
 
 
3218
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3219
                        pickle.load(stored_state, encoding="bytes"))
 
 
3220
                    #   Fix bytes to strings
 
 
3223
                    clients_data = {(key.decode("utf-8")
 
 
3224
                                     if isinstance(key, bytes)
 
 
3227
                                    bytes_clients_data.items()}
 
 
3228
                    del bytes_clients_data
 
 
3229
                    for key in clients_data:
 
 
3230
                        value = {(k.decode("utf-8")
 
 
3231
                                  if isinstance(k, bytes) else k): v
 
 
3233
                                 clients_data[key].items()}
 
 
3234
                        clients_data[key] = value
 
 
3236
                        value["client_structure"] = [
 
 
3238
                             if isinstance(s, bytes)
 
 
3240
                            value["client_structure"]]
 
 
3242
                        for k in ("name", "host"):
 
 
3243
                            if isinstance(value[k], bytes):
 
 
3244
                                value[k] = value[k].decode("utf-8")
 
 
3245
                        if not value.has_key("key_id"):
 
 
3246
                            value["key_id"] = ""
 
 
3247
                        elif not value.has_key("fingerprint"):
 
 
3248
                            value["fingerprint"] = ""
 
 
3249
                    #  old_client_settings
 
 
3251
                    old_client_settings = {
 
 
3252
                        (key.decode("utf-8")
 
 
3253
                         if isinstance(key, bytes)
 
 
3256
                        bytes_old_client_settings.items()}
 
 
3257
                    del bytes_old_client_settings
 
 
3259
                    for value in old_client_settings.values():
 
 
3260
                        if isinstance(value["host"], bytes):
 
 
3261
                            value["host"] = (value["host"]
 
2348
3263
            os.remove(stored_state_path)
 
2349
3264
        except IOError as e:
 
2350
 
            logger.warning("Could not load persistent state: {0}"
 
2352
 
            if e.errno != errno.ENOENT:
 
 
3265
            if e.errno == errno.ENOENT:
 
 
3266
                logger.warning("Could not load persistent state:"
 
 
3267
                               " {}".format(os.strerror(e.errno)))
 
 
3269
                logger.critical("Could not load persistent state:",
 
2354
3272
        except EOFError as e:
 
2355
3273
            logger.warning("Could not load persistent state: "
 
2356
 
                           "EOFError: {0}".format(e))
 
2358
3277
    with PGPEngine() as pgp:
 
2359
 
        for client_name, client in clients_data.iteritems():
 
 
3278
        for client_name, client in clients_data.items():
 
 
3279
            # Skip removed clients
 
 
3280
            if client_name not in client_settings:
 
2360
3283
            # Decide which value to use after restoring saved state.
 
2361
3284
            # We have three different values: Old config file,
 
2362
3285
            # new config file, and saved state.
 
 
2423
3345
        clients_data[client_name] = client_settings[client_name]
 
2425
3347
    # Create all client objects
 
2426
 
    for client_name, client in clients_data.iteritems():
 
 
3348
    for client_name, client in clients_data.items():
 
2427
3349
        tcp_server.clients[client_name] = client_class(
 
2428
 
            name = client_name, settings = client)
 
 
3352
            server_settings=server_settings)
 
2430
3354
    if not tcp_server.clients:
 
2431
3355
        logger.warning("No clients defined")
 
2437
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2440
 
            logger.error("Could not write to file %r with PID %d",
 
2443
 
            # "pidfile" was never created
 
 
3358
        if pidfile is not None:
 
 
3362
                    print(pid, file=pidfile)
 
 
3364
                logger.error("Could not write to file %r with PID %d",
 
2445
3367
        del pidfilename
 
2446
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2448
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2449
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3369
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3370
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3371
                             lambda: main_loop.quit() and False)
 
2452
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3375
        @alternate_dbus_interfaces(
 
 
3376
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3377
        class MandosDBusService(DBusObjectWithObjectManager):
 
2453
3378
            """A D-Bus proxy object"""
 
2454
3380
            def __init__(self):
 
2455
3381
                dbus.service.Object.__init__(self, bus, "/")
 
2456
3383
            _interface = "se.recompile.Mandos"
 
2458
 
            @dbus_interface_annotations(_interface)
 
2460
 
                return { "org.freedesktop.DBus.Property"
 
2461
 
                         ".EmitsChangedSignal":
 
2464
3385
            @dbus.service.signal(_interface, signature="o")
 
2465
3386
            def ClientAdded(self, objpath):
 
2469
3390
            @dbus.service.signal(_interface, signature="ss")
 
2470
 
            def ClientNotFound(self, fingerprint, address):
 
 
3391
            def ClientNotFound(self, key_id, address):
 
 
3395
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2474
3397
            @dbus.service.signal(_interface, signature="os")
 
2475
3398
            def ClientRemoved(self, objpath, name):
 
 
3402
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2479
3404
            @dbus.service.method(_interface, out_signature="ao")
 
2480
3405
            def GetAllClients(self):
 
2482
 
                return dbus.Array(c.dbus_object_path
 
2484
 
                                  tcp_server.clients.itervalues())
 
 
3407
                return dbus.Array(c.dbus_object_path for c in
 
 
3408
                                  tcp_server.clients.values())
 
 
3410
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2486
3412
            @dbus.service.method(_interface,
 
2487
3413
                                 out_signature="a{oa{sv}}")
 
2488
3414
            def GetAllClientsWithProperties(self):
 
2490
3416
                return dbus.Dictionary(
 
2491
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2492
 
                     for c in tcp_server.clients.itervalues()),
 
 
3417
                    {c.dbus_object_path: c.GetAll(
 
 
3418
                        "se.recompile.Mandos.Client")
 
 
3419
                     for c in tcp_server.clients.values()},
 
2493
3420
                    signature="oa{sv}")
 
2495
3422
            @dbus.service.method(_interface, in_signature="o")
 
2496
3423
            def RemoveClient(self, object_path):
 
2498
 
                for c in tcp_server.clients.itervalues():
 
 
3425
                for c in tcp_server.clients.values():
 
2499
3426
                    if c.dbus_object_path == object_path:
 
2500
3427
                        del tcp_server.clients[c.name]
 
2501
3428
                        c.remove_from_connection()
 
2502
 
                        # Don't signal anything except ClientRemoved
 
 
3429
                        # Don't signal the disabling
 
2503
3430
                        c.disable(quiet=True)
 
2505
 
                        self.ClientRemoved(object_path, c.name)
 
 
3431
                        # Emit D-Bus signal for removal
 
 
3432
                        self.client_removed_signal(c)
 
2507
3434
                raise KeyError(object_path)
 
2511
 
        class MandosDBusServiceTransitional(MandosDBusService):
 
2512
 
            __metaclass__ = AlternateDBusNamesMetaclass
 
2513
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
 
3438
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3439
                                 out_signature="a{oa{sa{sv}}}")
 
 
3440
            def GetManagedObjects(self):
 
 
3442
                return dbus.Dictionary(
 
 
3443
                    {client.dbus_object_path:
 
 
3445
                         {interface: client.GetAll(interface)
 
 
3447
                          client._get_all_interface_names()})
 
 
3448
                     for client in tcp_server.clients.values()})
 
 
3450
            def client_added_signal(self, client):
 
 
3451
                """Send the new standard signal and the old signal"""
 
 
3453
                    # New standard signal
 
 
3454
                    self.InterfacesAdded(
 
 
3455
                        client.dbus_object_path,
 
 
3457
                            {interface: client.GetAll(interface)
 
 
3459
                             client._get_all_interface_names()}))
 
 
3461
                    self.ClientAdded(client.dbus_object_path)
 
 
3463
            def client_removed_signal(self, client):
 
 
3464
                """Send the new standard signal and the old signal"""
 
 
3466
                    # New standard signal
 
 
3467
                    self.InterfacesRemoved(
 
 
3468
                        client.dbus_object_path,
 
 
3469
                        client._get_all_interface_names())
 
 
3471
                    self.ClientRemoved(client.dbus_object_path,
 
 
3474
        mandos_dbus_service = MandosDBusService()
 
 
3476
    # Save modules to variables to exempt the modules from being
 
 
3477
    # unloaded before the function registered with atexit() is run.
 
 
3478
    mp = multiprocessing
 
2516
3482
        "Cleanup function; run on exit"
 
2519
 
        multiprocessing.active_children()
 
 
3486
        mp.active_children()
 
2520
3488
        if not (tcp_server.clients or client_settings):
 
2523
3491
        # Store client before exiting. Secrets are encrypted with key
 
2524
3492
        # based on what config file has. If config file is
 
2525
3493
        # removed/edited, old secret will thus be unrecovable.
 
2527
3495
        with PGPEngine() as pgp:
 
2528
 
            for client in tcp_server.clients.itervalues():
 
 
3496
            for client in tcp_server.clients.values():
 
2529
3497
                key = client_settings[client.name]["secret"]
 
2530
3498
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2532
3500
                client_dict = {}
 
2534
3502
                # A list of attributes that can not be pickled
 
2536
 
                exclude = set(("bus", "changedstate", "secret",
 
2538
 
                for name, typ in (inspect.getmembers
 
2539
 
                                  (dbus.service.Object)):
 
 
3504
                exclude = {"bus", "changedstate", "secret",
 
 
3505
                           "checker", "server_settings"}
 
 
3506
                for name, typ in inspect.getmembers(dbus.service
 
2540
3508
                    exclude.add(name)
 
2542
3510
                client_dict["encrypted_secret"] = (client
 
2543
3511
                                                   .encrypted_secret)
 
2544
3512
                for attr in client.client_structure:
 
2545
3513
                    if attr not in exclude:
 
2546
3514
                        client_dict[attr] = getattr(client, attr)
 
2548
3516
                clients[client.name] = client_dict
 
2549
3517
                del client_settings[client.name]["secret"]
 
2552
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2555
 
                                                (stored_state_path))
 
2556
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2557
 
                pickle.dump((clients, client_settings), stored_state)
 
 
3520
            with tempfile.NamedTemporaryFile(
 
 
3524
                    dir=os.path.dirname(stored_state_path),
 
 
3525
                    delete=False) as stored_state:
 
 
3526
                pickle.dump((clients, client_settings), stored_state,
 
 
3528
                tempname = stored_state.name
 
2558
3529
            os.rename(tempname, stored_state_path)
 
2559
3530
        except (IOError, OSError) as e:
 
2560
 
            logger.warning("Could not save persistent state: {0}"
 
2564
3533
                    os.remove(tempname)
 
2565
3534
                except NameError:
 
2567
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
 
3536
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3537
                logger.warning("Could not save persistent state: {}"
 
 
3538
                               .format(os.strerror(e.errno)))
 
 
3540
                logger.warning("Could not save persistent state:",
 
2571
3544
        # Delete all clients, and settings from config
 
2572
3545
        while tcp_server.clients:
 
2573
3546
            name, client = tcp_server.clients.popitem()
 
2575
3548
                client.remove_from_connection()
 
2576
 
            # Don't signal anything except ClientRemoved
 
 
3549
            # Don't signal the disabling
 
2577
3550
            client.disable(quiet=True)
 
 
3551
            # Emit D-Bus signal for removal
 
2580
 
                mandos_dbus_service.ClientRemoved(client
 
 
3553
                mandos_dbus_service.client_removed_signal(client)
 
2583
3554
        client_settings.clear()
 
2585
3556
    atexit.register(cleanup)
 
2587
 
    for client in tcp_server.clients.itervalues():
 
 
3558
    for client in tcp_server.clients.values():
 
2590
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3560
            # Emit D-Bus signal for adding
 
 
3561
            mandos_dbus_service.client_added_signal(client)
 
2591
3562
        # Need to initiate checking of clients
 
2592
3563
        if client.enabled:
 
2593
3564
            client.init_checker()
 
2595
3566
    tcp_server.enable()
 
2596
3567
    tcp_server.server_activate()
 
2598
3569
    # Find out what port we got
 
2599
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3571
        service.port = tcp_server.socket.getsockname()[1]
 
2601
3573
        logger.info("Now listening on address %r, port %d,"
 
2602
 
                    " flowinfo %d, scope_id %d"
 
2603
 
                    % tcp_server.socket.getsockname())
 
 
3574
                    " flowinfo %d, scope_id %d",
 
 
3575
                    *tcp_server.socket.getsockname())
 
2605
 
        logger.info("Now listening on address %r, port %d"
 
2606
 
                    % tcp_server.socket.getsockname())
 
2608
 
    #service.interface = tcp_server.socket.getsockname()[3]
 
 
3577
        logger.info("Now listening on address %r, port %d",
 
 
3578
                    *tcp_server.socket.getsockname())
 
 
3580
    # service.interface = tcp_server.socket.getsockname()[3]
 
2611
 
        # From the Avahi example code
 
2614
 
        except dbus.exceptions.DBusException as error:
 
2615
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2618
 
        # End of Avahi example code
 
2620
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2621
 
                             lambda *args, **kwargs:
 
2622
 
                             (tcp_server.handle_request
 
2623
 
                              (*args[2:], **kwargs) or True))
 
 
3584
            # From the Avahi example code
 
 
3587
            except dbus.exceptions.DBusException as error:
 
 
3588
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3591
            # End of Avahi example code
 
 
3593
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
 
3594
                          lambda *args, **kwargs:
 
 
3595
                          (tcp_server.handle_request
 
 
3596
                           (*args[2:], **kwargs) or True))
 
2625
3598
        logger.debug("Starting main loop")
 
2626
3599
        main_loop.run()
 
2627
3600
    except AvahiError as error: