70
 
    import cPickle as pickle
 
 
63
import cPickle as pickle
 
73
64
import multiprocessing
 
82
69
import dbus.service
 
83
 
from gi.repository import GLib
 
84
72
from dbus.mainloop.glib import DBusGMainLoop
 
87
75
import xml.dom.minidom
 
 
77
import Crypto.Cipher.AES
 
90
 
# Try to find the value of SO_BINDTODEVICE:
 
92
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
93
 
    # newer, and it is also the most natural place for it:
 
94
80
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
95
81
except AttributeError:
 
97
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
99
83
        from IN import SO_BINDTODEVICE
 
100
84
    except ImportError:
 
101
 
        # In Python 2.7 it seems to have been removed entirely.
 
102
 
        # Try running the C preprocessor:
 
104
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
106
 
                                  stdin=subprocess.PIPE,
 
107
 
                                  stdout=subprocess.PIPE)
 
108
 
            stdout = cc.communicate(
 
109
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
110
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
111
 
        except (OSError, ValueError, IndexError):
 
113
 
            SO_BINDTODEVICE = None
 
115
 
if sys.version_info.major == 2:
 
119
 
stored_state_file = "clients.pickle"
 
 
85
        SO_BINDTODEVICE = None
 
121
90
logger = logging.getLogger()
 
125
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
126
 
        ctypes.util.find_library("c")).if_nametoindex
 
127
 
except (OSError, AttributeError):
 
129
 
    def if_nametoindex(interface):
 
130
 
        "Get an interface index the hard way, i.e. using fcntl()"
 
131
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
132
 
        with contextlib.closing(socket.socket()) as s:
 
133
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
134
 
                                struct.pack(b"16s16x", interface))
 
135
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
136
 
        return interface_index
 
139
 
def copy_function(func):
 
140
 
    """Make a copy of a function"""
 
141
 
    if sys.version_info.major == 2:
 
142
 
        return types.FunctionType(func.func_code,
 
148
 
        return types.FunctionType(func.__code__,
 
155
 
def initlogger(debug, level=logging.WARNING):
 
156
 
    """init logger and add loglevel"""
 
159
 
    syslogger = (logging.handlers.SysLogHandler(
 
160
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
162
 
    syslogger.setFormatter(logging.Formatter
 
163
 
                           ('Mandos [%(process)d]: %(levelname)s:'
 
165
 
    logger.addHandler(syslogger)
 
168
 
        console = logging.StreamHandler()
 
169
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
173
 
        logger.addHandler(console)
 
174
 
    logger.setLevel(level)
 
177
 
class PGPError(Exception):
 
178
 
    """Exception if encryption/decryption fails"""
 
182
 
class PGPEngine(object):
 
183
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
186
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
189
 
            output = subprocess.check_output(["gpgconf"])
 
190
 
            for line in output.splitlines():
 
191
 
                name, text, path = line.split(b":")
 
196
 
            if e.errno != errno.ENOENT:
 
198
 
        self.gnupgargs = ['--batch',
 
199
 
                          '--homedir', self.tempdir,
 
202
 
        # Only GPG version 1 has the --no-use-agent option.
 
203
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
204
 
            self.gnupgargs.append("--no-use-agent")
 
209
 
    def __exit__(self, exc_type, exc_value, traceback):
 
217
 
        if self.tempdir is not None:
 
218
 
            # Delete contents of tempdir
 
219
 
            for root, dirs, files in os.walk(self.tempdir,
 
221
 
                for filename in files:
 
222
 
                    os.remove(os.path.join(root, filename))
 
224
 
                    os.rmdir(os.path.join(root, dirname))
 
226
 
            os.rmdir(self.tempdir)
 
229
 
    def password_encode(self, password):
 
230
 
        # Passphrase can not be empty and can not contain newlines or
 
231
 
        # NUL bytes.  So we prefix it and hex encode it.
 
232
 
        encoded = b"mandos" + binascii.hexlify(password)
 
233
 
        if len(encoded) > 2048:
 
234
 
            # GnuPG can't handle long passwords, so encode differently
 
235
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
236
 
                       .replace(b"\n", b"\\n")
 
237
 
                       .replace(b"\0", b"\\x00"))
 
240
 
    def encrypt(self, data, password):
 
241
 
        passphrase = self.password_encode(password)
 
242
 
        with tempfile.NamedTemporaryFile(
 
243
 
                dir=self.tempdir) as passfile:
 
244
 
            passfile.write(passphrase)
 
246
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
250
 
                                    stdin=subprocess.PIPE,
 
251
 
                                    stdout=subprocess.PIPE,
 
252
 
                                    stderr=subprocess.PIPE)
 
253
 
            ciphertext, err = proc.communicate(input=data)
 
254
 
        if proc.returncode != 0:
 
258
 
    def decrypt(self, data, password):
 
259
 
        passphrase = self.password_encode(password)
 
260
 
        with tempfile.NamedTemporaryFile(
 
261
 
                dir=self.tempdir) as passfile:
 
262
 
            passfile.write(passphrase)
 
264
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
268
 
                                    stdin=subprocess.PIPE,
 
269
 
                                    stdout=subprocess.PIPE,
 
270
 
                                    stderr=subprocess.PIPE)
 
271
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
272
 
        if proc.returncode != 0:
 
274
 
        return decrypted_plaintext
 
277
 
# Pretend that we have an Avahi module
 
279
 
    """This isn't so much a class as it is a module-like namespace.
 
280
 
    It is instantiated once, and simulates having an Avahi module."""
 
281
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
282
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
283
 
    PROTO_INET = 0               # avahi-common/address.h
 
284
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
285
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
286
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
287
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
288
 
    DBUS_PATH_SERVER = "/"
 
290
 
    def string_array_to_txt_array(self, t):
 
291
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
292
 
                           for s in t), signature="ay")
 
293
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
294
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
295
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
296
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
297
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
298
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
299
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
300
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
 
91
stored_state_path = "/var/lib/mandos/clients.pickle"
 
 
93
syslogger = (logging.handlers.SysLogHandler
 
 
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
95
              address = str("/dev/log")))
 
 
96
syslogger.setFormatter(logging.Formatter
 
 
97
                       ('Mandos [%(process)d]: %(levelname)s:'
 
 
99
logger.addHandler(syslogger)
 
 
101
console = logging.StreamHandler()
 
 
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
106
logger.addHandler(console)
 
304
109
class AvahiError(Exception):
 
305
110
    def __init__(self, value, *args, **kwargs):
 
306
111
        self.value = value
 
307
 
        return super(AvahiError, self).__init__(value, *args,
 
 
112
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
113
    def __unicode__(self):
 
 
114
        return unicode(repr(self.value))
 
311
116
class AvahiServiceError(AvahiError):
 
315
119
class AvahiGroupError(AvahiError):
 
319
123
class AvahiService(object):
 
320
124
    """An Avahi (Zeroconf) service.
 
323
127
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
324
128
               Used to optionally bind to the specified interface.
 
325
129
    name: string; Example: 'Mandos'
 
326
130
    type: string; Example: '_mandos._tcp'.
 
327
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
 
131
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
328
132
    port: integer; what port to announce
 
329
133
    TXT: list of strings; TXT record for the service
 
330
134
    domain: string; Domain to publish on, default to .local if empty.
 
 
489
263
                                    follow_name_owner_changes=True),
 
490
264
                avahi.DBUS_INTERFACE_SERVER)
 
491
265
        self.server.connect_to_signal("StateChanged",
 
492
 
                                      self.server_state_changed)
 
 
266
                                 self.server_state_changed)
 
493
267
        self.server_state_changed(self.server.GetState())
 
496
269
class AvahiServiceToSyslog(AvahiService):
 
497
 
    def rename(self, *args, **kwargs):
 
498
271
        """Add the new name to the syslog messages"""
 
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
500
 
        syslogger.setFormatter(logging.Formatter(
 
501
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
272
        ret = AvahiService.rename(self)
 
 
273
        syslogger.setFormatter(logging.Formatter
 
 
274
                               ('Mandos (%s) [%%(process)d]:'
 
 
275
                                ' %%(levelname)s: %%(message)s'
 
506
 
# Pretend that we have a GnuTLS module
 
507
 
class GnuTLS(object):
 
508
 
    """This isn't so much a class as it is a module-like namespace.
 
509
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
511
 
    library = ctypes.util.find_library("gnutls")
 
513
 
        library = ctypes.util.find_library("gnutls-deb0")
 
514
 
    _library = ctypes.cdll.LoadLibrary(library)
 
516
 
    _need_version = b"3.3.0"
 
519
 
        # Need to use "self" here, since this method is called before
 
520
 
        # the assignment to the "gnutls" global variable happens.
 
521
 
        if self.check_version(self._need_version) is None:
 
522
 
            raise self.Error("Needs GnuTLS {} or later"
 
523
 
                             .format(self._need_version))
 
525
 
    # Unless otherwise indicated, the constants and types below are
 
526
 
    # all from the gnutls/gnutls.h C header file.
 
536
 
    E_NO_CERTIFICATE_FOUND = -49
 
537
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
540
 
    class session_int(ctypes.Structure):
 
542
 
    session_t = ctypes.POINTER(session_int)
 
544
 
    class certificate_credentials_st(ctypes.Structure):
 
546
 
    certificate_credentials_t = ctypes.POINTER(
 
547
 
        certificate_credentials_st)
 
548
 
    certificate_type_t = ctypes.c_int
 
550
 
    class datum_t(ctypes.Structure):
 
551
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
552
 
                    ('size', ctypes.c_uint)]
 
554
 
    class openpgp_crt_int(ctypes.Structure):
 
556
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
557
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
558
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
559
 
    credentials_type_t = ctypes.c_int
 
560
 
    transport_ptr_t = ctypes.c_void_p
 
561
 
    close_request_t = ctypes.c_int
 
564
 
    class Error(Exception):
 
565
 
        # We need to use the class name "GnuTLS" here, since this
 
566
 
        # exception might be raised from within GnuTLS.__init__,
 
567
 
        # which is called before the assignment to the "gnutls"
 
568
 
        # global variable has happened.
 
569
 
        def __init__(self, message=None, code=None, args=()):
 
570
 
            # Default usage is by a message string, but if a return
 
571
 
            # code is passed, convert it to a string with
 
574
 
            if message is None and code is not None:
 
575
 
                message = GnuTLS.strerror(code)
 
576
 
            return super(GnuTLS.Error, self).__init__(
 
579
 
    class CertificateSecurityError(Error):
 
583
 
    class Credentials(object):
 
585
 
            self._c_object = gnutls.certificate_credentials_t()
 
586
 
            gnutls.certificate_allocate_credentials(
 
587
 
                ctypes.byref(self._c_object))
 
588
 
            self.type = gnutls.CRD_CERTIFICATE
 
591
 
            gnutls.certificate_free_credentials(self._c_object)
 
593
 
    class ClientSession(object):
 
594
 
        def __init__(self, socket, credentials=None):
 
595
 
            self._c_object = gnutls.session_t()
 
596
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
597
 
            gnutls.set_default_priority(self._c_object)
 
598
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
599
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
602
 
            if credentials is None:
 
603
 
                credentials = gnutls.Credentials()
 
604
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
605
 
                                   ctypes.cast(credentials._c_object,
 
607
 
            self.credentials = credentials
 
610
 
            gnutls.deinit(self._c_object)
 
613
 
            return gnutls.handshake(self._c_object)
 
615
 
        def send(self, data):
 
619
 
                data_len -= gnutls.record_send(self._c_object,
 
624
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
626
 
    # Error handling functions
 
627
 
    def _error_code(result):
 
628
 
        """A function to raise exceptions on errors, suitable
 
629
 
        for the 'restype' attribute on ctypes functions"""
 
632
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
633
 
            raise gnutls.CertificateSecurityError(code=result)
 
634
 
        raise gnutls.Error(code=result)
 
636
 
    def _retry_on_error(result, func, arguments):
 
637
 
        """A function to retry on some errors, suitable
 
638
 
        for the 'errcheck' attribute on ctypes functions"""
 
640
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
641
 
                return _error_code(result)
 
642
 
            result = func(*arguments)
 
645
 
    # Unless otherwise indicated, the function declarations below are
 
646
 
    # all from the gnutls/gnutls.h C header file.
 
649
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
650
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
651
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
652
 
    priority_set_direct.restype = _error_code
 
654
 
    init = _library.gnutls_init
 
655
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
656
 
    init.restype = _error_code
 
658
 
    set_default_priority = _library.gnutls_set_default_priority
 
659
 
    set_default_priority.argtypes = [session_t]
 
660
 
    set_default_priority.restype = _error_code
 
662
 
    record_send = _library.gnutls_record_send
 
663
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
665
 
    record_send.restype = ctypes.c_ssize_t
 
666
 
    record_send.errcheck = _retry_on_error
 
668
 
    certificate_allocate_credentials = (
 
669
 
        _library.gnutls_certificate_allocate_credentials)
 
670
 
    certificate_allocate_credentials.argtypes = [
 
671
 
        ctypes.POINTER(certificate_credentials_t)]
 
672
 
    certificate_allocate_credentials.restype = _error_code
 
674
 
    certificate_free_credentials = (
 
675
 
        _library.gnutls_certificate_free_credentials)
 
676
 
    certificate_free_credentials.argtypes = [
 
677
 
        certificate_credentials_t]
 
678
 
    certificate_free_credentials.restype = None
 
680
 
    handshake_set_private_extensions = (
 
681
 
        _library.gnutls_handshake_set_private_extensions)
 
682
 
    handshake_set_private_extensions.argtypes = [session_t,
 
684
 
    handshake_set_private_extensions.restype = None
 
686
 
    credentials_set = _library.gnutls_credentials_set
 
687
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
689
 
    credentials_set.restype = _error_code
 
691
 
    strerror = _library.gnutls_strerror
 
692
 
    strerror.argtypes = [ctypes.c_int]
 
693
 
    strerror.restype = ctypes.c_char_p
 
695
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
696
 
    certificate_type_get.argtypes = [session_t]
 
697
 
    certificate_type_get.restype = _error_code
 
699
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
700
 
    certificate_get_peers.argtypes = [session_t,
 
701
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
702
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
704
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
705
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
706
 
    global_set_log_level.restype = None
 
708
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
709
 
    global_set_log_function.argtypes = [log_func]
 
710
 
    global_set_log_function.restype = None
 
712
 
    deinit = _library.gnutls_deinit
 
713
 
    deinit.argtypes = [session_t]
 
714
 
    deinit.restype = None
 
716
 
    handshake = _library.gnutls_handshake
 
717
 
    handshake.argtypes = [session_t]
 
718
 
    handshake.restype = _error_code
 
719
 
    handshake.errcheck = _retry_on_error
 
721
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
722
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
723
 
    transport_set_ptr.restype = None
 
725
 
    bye = _library.gnutls_bye
 
726
 
    bye.argtypes = [session_t, close_request_t]
 
727
 
    bye.restype = _error_code
 
728
 
    bye.errcheck = _retry_on_error
 
730
 
    check_version = _library.gnutls_check_version
 
731
 
    check_version.argtypes = [ctypes.c_char_p]
 
732
 
    check_version.restype = ctypes.c_char_p
 
734
 
    # All the function declarations below are from gnutls/openpgp.h
 
736
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
737
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
738
 
    openpgp_crt_init.restype = _error_code
 
740
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
741
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
742
 
                                   ctypes.POINTER(datum_t),
 
744
 
    openpgp_crt_import.restype = _error_code
 
746
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
747
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
748
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
749
 
    openpgp_crt_verify_self.restype = _error_code
 
751
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
752
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
753
 
    openpgp_crt_deinit.restype = None
 
755
 
    openpgp_crt_get_fingerprint = (
 
756
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
757
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
761
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
763
 
    # Remove non-public functions
 
764
 
    del _error_code, _retry_on_error
 
765
 
# Create the global "gnutls" object, simulating a module
 
769
 
def call_pipe(connection,       # : multiprocessing.Connection
 
770
 
              func, *args, **kwargs):
 
771
 
    """This function is meant to be called by multiprocessing.Process
 
773
 
    This function runs func(*args, **kwargs), and writes the resulting
 
774
 
    return value on the provided multiprocessing.Connection.
 
776
 
    connection.send(func(*args, **kwargs))
 
 
279
def _timedelta_to_milliseconds(td):
 
 
280
    "Convert a datetime.timedelta() to milliseconds"
 
 
281
    return ((td.days * 24 * 60 * 60 * 1000)
 
 
282
            + (td.seconds * 1000)
 
 
283
            + (td.microseconds // 1000))
 
780
285
class Client(object):
 
781
286
    """A representation of a client host served by this server.
 
784
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
289
    _approved:   bool(); 'None' if not yet approved/disapproved
 
785
290
    approval_delay: datetime.timedelta(); Time to wait for approval
 
786
291
    approval_duration: datetime.timedelta(); Duration of one approval
 
787
292
    checker:    subprocess.Popen(); a running checker process used
 
788
293
                                    to see if the client lives.
 
789
294
                                    'None' if no process is running.
 
790
 
    checker_callback_tag: a GLib event source tag, or None
 
 
295
    checker_callback_tag: a gobject event source tag, or None
 
791
296
    checker_command: string; External command which is run to check
 
792
297
                     if client lives.  %() expansions are done at
 
793
298
                     runtime with vars(self) as dict, so that for
 
794
299
                     instance %(name)s can be used in the command.
 
795
 
    checker_initiator_tag: a GLib event source tag, or None
 
 
300
    checker_initiator_tag: a gobject event source tag, or None
 
796
301
    created:    datetime.datetime(); (UTC) object creation
 
797
302
    client_structure: Object describing what attributes a client has
 
798
303
                      and is used for storing the client at exit
 
799
304
    current_checker_command: string; current running checker_command
 
800
 
    disable_initiator_tag: a GLib event source tag, or None
 
 
305
    disable_initiator_tag: a gobject event source tag, or None
 
802
307
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
803
308
                 uniquely identify the client
 
 
805
310
    interval:   datetime.timedelta(); How often to start a new checker
 
806
311
    last_approval_request: datetime.datetime(); (UTC) or None
 
807
312
    last_checked_ok: datetime.datetime(); (UTC) or None
 
808
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
809
 
                         status of last checker. -1 reflects crashed
 
810
 
                         checker, -2 means no checker completed yet.
 
811
 
    last_checker_signal: The signal which killed the last checker, if
 
812
 
                         last_checker_status is -1
 
813
 
    last_enabled: datetime.datetime(); (UTC) or None
 
 
313
    last_checker_status: integer between 0 and 255 reflecting exit status
 
 
314
                         of last checker. -1 reflect crashed checker,
 
 
316
    last_enabled: datetime.datetime(); (UTC)
 
814
317
    name:       string; from the config file, used in log messages and
 
815
318
                        D-Bus identifiers
 
816
319
    secret:     bytestring; sent verbatim (over TLS) to client
 
817
320
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
818
321
                                      until this client is disabled
 
819
 
    extended_timeout:   extra long timeout when secret has been sent
 
 
322
    extended_timeout:   extra long timeout when password has been sent
 
820
323
    runtime_expansions: Allowed attributes for runtime expansion.
 
821
324
    expires:    datetime.datetime(); time (UTC) when a client will be
 
822
325
                disabled, or None
 
823
 
    server_settings: The server_settings dict from main()
 
826
328
    runtime_expansions = ("approval_delay", "approval_duration",
 
827
 
                          "created", "enabled", "expires",
 
828
 
                          "fingerprint", "host", "interval",
 
829
 
                          "last_approval_request", "last_checked_ok",
 
 
329
                          "created", "enabled", "fingerprint",
 
 
330
                          "host", "interval", "last_checked_ok",
 
830
331
                          "last_enabled", "name", "timeout")
 
833
 
        "extended_timeout": "PT15M",
 
835
 
        "checker": "fping -q -- %%(host)s",
 
837
 
        "approval_delay": "PT0S",
 
838
 
        "approval_duration": "PT1S",
 
839
 
        "approved_by_default": "True",
 
844
 
    def config_parser(config):
 
845
 
        """Construct a new dict of client settings of this form:
 
846
 
        { client_name: {setting_name: value, ...}, ...}
 
847
 
        with exceptions for any special settings as defined above.
 
848
 
        NOTE: Must be a pure function. Must return the same result
 
849
 
        value given the same arguments.
 
852
 
        for client_name in config.sections():
 
853
 
            section = dict(config.items(client_name))
 
854
 
            client = settings[client_name] = {}
 
856
 
            client["host"] = section["host"]
 
857
 
            # Reformat values from string types to Python types
 
858
 
            client["approved_by_default"] = config.getboolean(
 
859
 
                client_name, "approved_by_default")
 
860
 
            client["enabled"] = config.getboolean(client_name,
 
863
 
            # Uppercase and remove spaces from fingerprint for later
 
864
 
            # comparison purposes with return value from the
 
865
 
            # fingerprint() function
 
866
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
868
 
            if "secret" in section:
 
869
 
                client["secret"] = codecs.decode(section["secret"]
 
872
 
            elif "secfile" in section:
 
873
 
                with open(os.path.expanduser(os.path.expandvars
 
874
 
                                             (section["secfile"])),
 
876
 
                    client["secret"] = secfile.read()
 
878
 
                raise TypeError("No secret or secfile for section {}"
 
880
 
            client["timeout"] = string_to_delta(section["timeout"])
 
881
 
            client["extended_timeout"] = string_to_delta(
 
882
 
                section["extended_timeout"])
 
883
 
            client["interval"] = string_to_delta(section["interval"])
 
884
 
            client["approval_delay"] = string_to_delta(
 
885
 
                section["approval_delay"])
 
886
 
            client["approval_duration"] = string_to_delta(
 
887
 
                section["approval_duration"])
 
888
 
            client["checker_command"] = section["checker"]
 
889
 
            client["last_approval_request"] = None
 
890
 
            client["last_checked_ok"] = None
 
891
 
            client["last_checker_status"] = -2
 
895
 
    def __init__(self, settings, name=None, server_settings=None):
 
 
333
    def timeout_milliseconds(self):
 
 
334
        "Return the 'timeout' attribute in milliseconds"
 
 
335
        return _timedelta_to_milliseconds(self.timeout)
 
 
337
    def extended_timeout_milliseconds(self):
 
 
338
        "Return the 'extended_timeout' attribute in milliseconds"
 
 
339
        return _timedelta_to_milliseconds(self.extended_timeout)
 
 
341
    def interval_milliseconds(self):
 
 
342
        "Return the 'interval' attribute in milliseconds"
 
 
343
        return _timedelta_to_milliseconds(self.interval)
 
 
345
    def approval_delay_milliseconds(self):
 
 
346
        return _timedelta_to_milliseconds(self.approval_delay)
 
 
348
    def __init__(self, name = None, config=None):
 
 
349
        """Note: the 'checker' key in 'config' sets the
 
 
350
        'checker_command' attribute and *not* the 'checker'
 
897
 
        if server_settings is None:
 
899
 
        self.server_settings = server_settings
 
900
 
        # adding all client settings
 
901
 
        for setting, value in settings.items():
 
902
 
            setattr(self, setting, value)
 
905
 
            if not hasattr(self, "last_enabled"):
 
906
 
                self.last_enabled = datetime.datetime.utcnow()
 
907
 
            if not hasattr(self, "expires"):
 
908
 
                self.expires = (datetime.datetime.utcnow()
 
911
 
            self.last_enabled = None
 
914
355
        logger.debug("Creating client %r", self.name)
 
 
356
        # Uppercase and remove spaces from fingerprint for later
 
 
357
        # comparison purposes with return value from the fingerprint()
 
 
359
        self.fingerprint = (config["fingerprint"].upper()
 
915
361
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
916
 
        self.created = settings.get("created",
 
917
 
                                    datetime.datetime.utcnow())
 
919
 
        # attributes specific for this server instance
 
 
362
        if "secret" in config:
 
 
363
            self.secret = config["secret"].decode("base64")
 
 
364
        elif "secfile" in config:
 
 
365
            with open(os.path.expanduser(os.path.expandvars
 
 
366
                                         (config["secfile"])),
 
 
368
                self.secret = secfile.read()
 
 
370
            raise TypeError("No secret or secfile for client %s"
 
 
372
        self.host = config.get("host", "")
 
 
373
        self.created = datetime.datetime.utcnow()
 
 
375
        self.last_approval_request = None
 
 
376
        self.last_enabled = datetime.datetime.utcnow()
 
 
377
        self.last_checked_ok = None
 
 
378
        self.last_checker_status = None
 
 
379
        self.timeout = string_to_delta(config["timeout"])
 
 
380
        self.extended_timeout = string_to_delta(config
 
 
381
                                                ["extended_timeout"])
 
 
382
        self.interval = string_to_delta(config["interval"])
 
920
383
        self.checker = None
 
921
384
        self.checker_initiator_tag = None
 
922
385
        self.disable_initiator_tag = None
 
 
386
        self.expires = datetime.datetime.utcnow() + self.timeout
 
923
387
        self.checker_callback_tag = None
 
 
388
        self.checker_command = config["checker"]
 
924
389
        self.current_checker_command = None
 
 
390
        self._approved = None
 
 
391
        self.approved_by_default = config.get("approved_by_default",
 
926
393
        self.approvals_pending = 0
 
927
 
        self.changedstate = multiprocessing_manager.Condition(
 
928
 
            multiprocessing_manager.Lock())
 
929
 
        self.client_structure = [attr
 
930
 
                                 for attr in self.__dict__.keys()
 
931
 
                                 if not attr.startswith("_")]
 
 
394
        self.approval_delay = string_to_delta(
 
 
395
            config["approval_delay"])
 
 
396
        self.approval_duration = string_to_delta(
 
 
397
            config["approval_duration"])
 
 
398
        self.changedstate = (multiprocessing_manager
 
 
399
                             .Condition(multiprocessing_manager
 
 
401
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
932
402
        self.client_structure.append("client_structure")
 
934
 
        for name, t in inspect.getmembers(
 
935
 
                type(self), lambda obj: isinstance(obj, property)):
 
 
405
        for name, t in inspect.getmembers(type(self),
 
 
406
                                          lambda obj: isinstance(obj, property)):
 
936
407
            if not name.startswith("_"):
 
937
408
                self.client_structure.append(name)
 
939
410
    # Send notice to process children that client state has changed
 
940
411
    def send_changedstate(self):
 
941
412
        with self.changedstate:
 
942
413
            self.changedstate.notify_all()
 
944
415
    def enable(self):
 
945
416
        """Start this client's checker and timeout hooks"""
 
946
417
        if getattr(self, "enabled", False):
 
947
418
            # Already enabled
 
 
420
        self.send_changedstate()
 
949
421
        self.expires = datetime.datetime.utcnow() + self.timeout
 
950
422
        self.enabled = True
 
951
423
        self.last_enabled = datetime.datetime.utcnow()
 
952
424
        self.init_checker()
 
953
 
        self.send_changedstate()
 
955
426
    def disable(self, quiet=True):
 
956
427
        """Disable this client."""
 
957
428
        if not getattr(self, "enabled", False):
 
 
431
            self.send_changedstate()
 
960
433
            logger.info("Disabling client %s", self.name)
 
961
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
962
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
434
        if getattr(self, "disable_initiator_tag", False):
 
 
435
            gobject.source_remove(self.disable_initiator_tag)
 
963
436
            self.disable_initiator_tag = None
 
964
437
        self.expires = None
 
965
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
966
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
438
        if getattr(self, "checker_initiator_tag", False):
 
 
439
            gobject.source_remove(self.checker_initiator_tag)
 
967
440
            self.checker_initiator_tag = None
 
968
441
        self.stop_checker()
 
969
442
        self.enabled = False
 
971
 
            self.send_changedstate()
 
972
 
        # Do not run this again if called by a GLib.timeout_add
 
 
443
        # Do not run this again if called by a gobject.timeout_add
 
975
446
    def __del__(self):
 
978
449
    def init_checker(self):
 
979
450
        # Schedule a new checker to be started an 'interval' from now,
 
980
451
        # and every interval from then on.
 
981
 
        if self.checker_initiator_tag is not None:
 
982
 
            GLib.source_remove(self.checker_initiator_tag)
 
983
 
        self.checker_initiator_tag = GLib.timeout_add(
 
984
 
            int(self.interval.total_seconds() * 1000),
 
 
452
        self.checker_initiator_tag = (gobject.timeout_add
 
 
453
                                      (self.interval_milliseconds(),
 
986
455
        # Schedule a disable() when 'timeout' has passed
 
987
 
        if self.disable_initiator_tag is not None:
 
988
 
            GLib.source_remove(self.disable_initiator_tag)
 
989
 
        self.disable_initiator_tag = GLib.timeout_add(
 
990
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
456
        self.disable_initiator_tag = (gobject.timeout_add
 
 
457
                                   (self.timeout_milliseconds(),
 
991
459
        # Also start a new checker *right now*.
 
992
460
        self.start_checker()
 
994
 
    def checker_callback(self, source, condition, connection,
 
 
463
    def checker_callback(self, pid, condition, command):
 
996
464
        """The checker has completed, so take appropriate actions."""
 
997
465
        self.checker_callback_tag = None
 
998
466
        self.checker = None
 
999
 
        # Read return code from connection (see call_pipe)
 
1000
 
        returncode = connection.recv()
 
1004
 
            self.last_checker_status = returncode
 
1005
 
            self.last_checker_signal = None
 
 
467
        if os.WIFEXITED(condition):
 
 
468
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
1006
469
            if self.last_checker_status == 0:
 
1007
470
                logger.info("Checker for %(name)s succeeded",
 
1009
472
                self.checked_ok()
 
1011
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
474
                logger.info("Checker for %(name)s failed",
 
1013
477
            self.last_checker_status = -1
 
1014
 
            self.last_checker_signal = -returncode
 
1015
478
            logger.warning("Checker for %(name)s crashed?",
 
1019
 
    def checked_ok(self):
 
1020
 
        """Assert that the client has been seen, alive and well."""
 
1021
 
        self.last_checked_ok = datetime.datetime.utcnow()
 
1022
 
        self.last_checker_status = 0
 
1023
 
        self.last_checker_signal = None
 
1026
 
    def bump_timeout(self, timeout=None):
 
1027
 
        """Bump up the timeout for this client."""
 
 
481
    def checked_ok(self, timeout=None):
 
 
482
        """Bump up the timeout for this client.
 
 
484
        This should only be called when the client has been seen,
 
1028
487
        if timeout is None:
 
1029
488
            timeout = self.timeout
 
 
489
        self.last_checked_ok = datetime.datetime.utcnow()
 
1030
490
        if self.disable_initiator_tag is not None:
 
1031
 
            GLib.source_remove(self.disable_initiator_tag)
 
1032
 
            self.disable_initiator_tag = None
 
 
491
            gobject.source_remove(self.disable_initiator_tag)
 
1033
492
        if getattr(self, "enabled", False):
 
1034
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1035
 
                int(timeout.total_seconds() * 1000), self.disable)
 
 
493
            self.disable_initiator_tag = (gobject.timeout_add
 
 
494
                                          (_timedelta_to_milliseconds
 
 
495
                                           (timeout), self.disable))
 
1036
496
            self.expires = datetime.datetime.utcnow() + timeout
 
1038
498
    def need_approval(self):
 
1039
499
        self.last_approval_request = datetime.datetime.utcnow()
 
1041
501
    def start_checker(self):
 
1042
502
        """Start a new checker subprocess if one is not running.
 
1044
504
        If a checker already exists, leave it running and do
 
1046
506
        # The reason for not killing a running checker is that if we
 
1047
 
        # did that, and if a checker (for some reason) started running
 
1048
 
        # slowly and taking more than 'interval' time, then the client
 
1049
 
        # would inevitably timeout, since no checker would get a
 
1050
 
        # chance to run to completion.  If we instead leave running
 
 
507
        # did that, then if a checker (for some reason) started
 
 
508
        # running slowly and taking more than 'interval' time, the
 
 
509
        # client would inevitably timeout, since no checker would get
 
 
510
        # a chance to run to completion.  If we instead leave running
 
1051
511
        # checkers alone, the checker would have to take more time
 
1052
512
        # than 'timeout' for the client to be disabled, which is as it
 
1055
 
        if self.checker is not None and not self.checker.is_alive():
 
1056
 
            logger.warning("Checker was not alive; joining")
 
 
515
        # If a checker exists, make sure it is not a zombie
 
 
517
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
518
        except (AttributeError, OSError) as error:
 
 
519
            if (isinstance(error, OSError)
 
 
520
                and error.errno != errno.ECHILD):
 
 
524
                logger.warning("Checker was a zombie")
 
 
525
                gobject.source_remove(self.checker_callback_tag)
 
 
526
                self.checker_callback(pid, status,
 
 
527
                                      self.current_checker_command)
 
1059
528
        # Start a new checker if needed
 
1060
529
        if self.checker is None:
 
1061
 
            # Escape attributes for the shell
 
1063
 
                attr: re.escape(str(getattr(self, attr)))
 
1064
 
                for attr in self.runtime_expansions}
 
1066
 
                command = self.checker_command % escaped_attrs
 
1067
 
            except TypeError as error:
 
1068
 
                logger.error('Could not format string "%s"',
 
1069
 
                             self.checker_command,
 
1071
 
                return True     # Try again later
 
 
531
                # In case checker_command has exactly one % operator
 
 
532
                command = self.checker_command % self.host
 
 
534
                # Escape attributes for the shell
 
 
535
                escaped_attrs = dict(
 
 
537
                     re.escape(unicode(str(getattr(self, attr, "")),
 
 
541
                    self.runtime_expansions)
 
 
544
                    command = self.checker_command % escaped_attrs
 
 
545
                except TypeError as error:
 
 
546
                    logger.error('Could not format string "%s":'
 
 
547
                                 ' %s', self.checker_command, error)
 
 
548
                    return True # Try again later
 
1072
549
            self.current_checker_command = command
 
1073
 
            logger.info("Starting checker %r for %s", command,
 
1075
 
            # We don't need to redirect stdout and stderr, since
 
1076
 
            # in normal mode, that is already done by daemon(),
 
1077
 
            # and in debug mode we don't want to.  (Stdin is
 
1078
 
            # always replaced by /dev/null.)
 
1079
 
            # The exception is when not debugging but nevertheless
 
1080
 
            # running in the foreground; use the previously
 
1082
 
            popen_args = {"close_fds": True,
 
1085
 
            if (not self.server_settings["debug"]
 
1086
 
                and self.server_settings["foreground"]):
 
1087
 
                popen_args.update({"stdout": wnull,
 
1089
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1090
 
            self.checker = multiprocessing.Process(
 
1092
 
                args=(pipe[1], subprocess.call, command),
 
1094
 
            self.checker.start()
 
1095
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1096
 
                pipe[0].fileno(), GLib.IO_IN,
 
1097
 
                self.checker_callback, pipe[0], command)
 
1098
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
551
                logger.info("Starting checker %r for %s",
 
 
553
                # We don't need to redirect stdout and stderr, since
 
 
554
                # in normal mode, that is already done by daemon(),
 
 
555
                # and in debug mode we don't want to.  (Stdin is
 
 
556
                # always replaced by /dev/null.)
 
 
557
                self.checker = subprocess.Popen(command,
 
 
560
                self.checker_callback_tag = (gobject.child_watch_add
 
 
562
                                              self.checker_callback,
 
 
564
                # The checker may have completed before the gobject
 
 
565
                # watch was added.  Check for this.
 
 
566
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
568
                    gobject.source_remove(self.checker_callback_tag)
 
 
569
                    self.checker_callback(pid, status, command)
 
 
570
            except OSError as error:
 
 
571
                logger.error("Failed to start subprocess: %s",
 
 
573
        # Re-run this periodically if run by gobject.timeout_add
 
1101
576
    def stop_checker(self):
 
1102
577
        """Force the checker process, if any, to stop."""
 
1103
578
        if self.checker_callback_tag:
 
1104
 
            GLib.source_remove(self.checker_callback_tag)
 
 
579
            gobject.source_remove(self.checker_callback_tag)
 
1105
580
            self.checker_callback_tag = None
 
1106
581
        if getattr(self, "checker", None) is None:
 
1108
583
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1109
 
        self.checker.terminate()
 
 
585
            os.kill(self.checker.pid, signal.SIGTERM)
 
 
587
            #if self.checker.poll() is None:
 
 
588
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
 
589
        except OSError as error:
 
 
590
            if error.errno != errno.ESRCH: # No such process
 
1110
592
        self.checker = None
 
1113
 
def dbus_service_property(dbus_interface,
 
 
594
    # Encrypts a client secret and stores it in a varible encrypted_secret
 
 
595
    def encrypt_secret(self, key):
 
 
596
        # Encryption-key need to be of a specific size, so we hash inputed key
 
 
597
        hasheng = hashlib.sha256()
 
 
599
        encryptionkey = hasheng.digest()
 
 
601
        # Create validation hash so we know at decryption if it was sucessful
 
 
602
        hasheng = hashlib.sha256()
 
 
603
        hasheng.update(self.secret)
 
 
604
        validationhash = hasheng.digest()
 
 
607
        iv = os.urandom(Crypto.Cipher.AES.block_size)
 
 
608
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
 
609
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
 
610
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
 
 
611
        self.encrypted_secret = (ciphertext, iv)
 
 
613
    # Decrypt a encrypted client secret
 
 
614
    def decrypt_secret(self, key):
 
 
615
        # Decryption-key need to be of a specific size, so we hash inputed key
 
 
616
        hasheng = hashlib.sha256()
 
 
618
        encryptionkey = hasheng.digest()
 
 
620
        # Decrypt encrypted secret
 
 
621
        ciphertext, iv = self.encrypted_secret
 
 
622
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
 
 
623
                                        Crypto.Cipher.AES.MODE_CFB, iv)
 
 
624
        plain = ciphereng.decrypt(ciphertext)
 
 
626
        # Validate decrypted secret to know if it was succesful
 
 
627
        hasheng = hashlib.sha256()
 
 
628
        validationhash = plain[:hasheng.digest_size]
 
 
629
        secret = plain[hasheng.digest_size:]
 
 
630
        hasheng.update(secret)
 
 
632
        # if validation fails, we use key as new secret. Otherwhise, we use
 
 
633
        # the decrypted secret
 
 
634
        if hasheng.digest() == validationhash:
 
 
638
        del self.encrypted_secret
 
 
641
def dbus_service_property(dbus_interface, signature="v",
 
 
642
                          access="readwrite", byte_arrays=False):
 
1117
643
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1118
644
    become properties on the D-Bus.
 
1120
646
    The decorated method will be called with no arguments by "Get"
 
1121
647
    and with one argument by "Set".
 
1123
649
    The parameters, where they are supported, are the same as
 
1124
650
    dbus.service.method, except there is only "signature", since the
 
1125
651
    type from Get() and the type sent to Set() is the same.
 
 
1208
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1209
 
    """A D-Bus object with annotations.
 
1211
 
    Classes inheriting from this can use the dbus_annotations
 
1212
 
    decorator to add annotations to methods or signals.
 
1216
 
    def _is_dbus_thing(thing):
 
1217
 
        """Returns a function testing if an attribute is a D-Bus thing
 
1219
 
        If called like _is_dbus_thing("method") it returns a function
 
1220
 
        suitable for use as predicate to inspect.getmembers().
 
1222
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1225
 
    def _get_all_dbus_things(self, thing):
 
1226
 
        """Returns a generator of (name, attribute) pairs
 
1228
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
1229
 
                 athing.__get__(self))
 
1230
 
                for cls in self.__class__.__mro__
 
1232
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1234
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1236
 
                         path_keyword='object_path',
 
1237
 
                         connection_keyword='connection')
 
1238
 
    def Introspect(self, object_path, connection):
 
1239
 
        """Overloading of standard D-Bus method.
 
1241
 
        Inserts annotation tags on methods and signals.
 
1243
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1246
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1248
 
            for if_tag in document.getElementsByTagName("interface"):
 
1249
 
                # Add annotation tags
 
1250
 
                for typ in ("method", "signal"):
 
1251
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1253
 
                        for name, prop in (self.
 
1254
 
                                           _get_all_dbus_things(typ)):
 
1255
 
                            if (name == tag.getAttribute("name")
 
1256
 
                                and prop._dbus_interface
 
1257
 
                                == if_tag.getAttribute("name")):
 
1258
 
                                annots.update(getattr(
 
1259
 
                                    prop, "_dbus_annotations", {}))
 
1260
 
                        for name, value in annots.items():
 
1261
 
                            ann_tag = document.createElement(
 
1263
 
                            ann_tag.setAttribute("name", name)
 
1264
 
                            ann_tag.setAttribute("value", value)
 
1265
 
                            tag.appendChild(ann_tag)
 
1266
 
                # Add interface annotation tags
 
1267
 
                for annotation, value in dict(
 
1268
 
                    itertools.chain.from_iterable(
 
1269
 
                        annotations().items()
 
1270
 
                        for name, annotations
 
1271
 
                        in self._get_all_dbus_things("interface")
 
1272
 
                        if name == if_tag.getAttribute("name")
 
1274
 
                    ann_tag = document.createElement("annotation")
 
1275
 
                    ann_tag.setAttribute("name", annotation)
 
1276
 
                    ann_tag.setAttribute("value", value)
 
1277
 
                    if_tag.appendChild(ann_tag)
 
1278
 
                # Fix argument name for the Introspect method itself
 
1279
 
                if (if_tag.getAttribute("name")
 
1280
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1281
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1282
 
                        if cn.getAttribute("name") == "Introspect":
 
1283
 
                            for arg in cn.getElementsByTagName("arg"):
 
1284
 
                                if (arg.getAttribute("direction")
 
1286
 
                                    arg.setAttribute("name",
 
1288
 
            xmlstring = document.toxml("utf-8")
 
1290
 
        except (AttributeError, xml.dom.DOMException,
 
1291
 
                xml.parsers.expat.ExpatError) as error:
 
1292
 
            logger.error("Failed to override Introspection method",
 
1297
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
690
class DBusObjectWithProperties(dbus.service.Object):
 
1298
691
    """A D-Bus object with properties.
 
1300
693
    Classes inheriting from this can use the dbus_service_property
 
1301
694
    decorator to expose methods as D-Bus properties.  It exposes the
 
1302
695
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
699
    def _is_dbus_property(obj):
 
 
700
        return getattr(obj, "_dbus_is_property", False)
 
 
702
    def _get_all_dbus_properties(self):
 
 
703
        """Returns a generator of (name, attribute) pairs
 
 
705
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
 
706
                for cls in self.__class__.__mro__
 
 
708
                inspect.getmembers(cls, self._is_dbus_property))
 
1305
710
    def _get_dbus_property(self, interface_name, property_name):
 
1306
711
        """Returns a bound method if one exists which is a D-Bus
 
1307
712
        property with the specified name and interface.
 
1309
 
        for cls in self.__class__.__mro__:
 
1310
 
            for name, value in inspect.getmembers(
 
1311
 
                    cls, self._is_dbus_thing("property")):
 
 
714
        for cls in  self.__class__.__mro__:
 
 
715
            for name, value in (inspect.getmembers
 
 
716
                                (cls, self._is_dbus_property)):
 
1312
717
                if (value._dbus_name == property_name
 
1313
718
                    and value._dbus_interface == interface_name):
 
1314
719
                    return value.__get__(self)
 
1316
721
        # No such property
 
1317
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1318
 
            self.dbus_object_path, interface_name, property_name))
 
1321
 
    def _get_all_interface_names(cls):
 
1322
 
        """Get a sequence of all interfaces supported by an object"""
 
1323
 
        return (name for name in set(getattr(getattr(x, attr),
 
1324
 
                                             "_dbus_interface", None)
 
1325
 
                                     for x in (inspect.getmro(cls))
 
1327
 
                if name is not None)
 
1329
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
722
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
723
                                   + interface_name + "."
 
 
726
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1331
727
                         out_signature="v")
 
1332
728
    def Get(self, interface_name, property_name):
 
1333
729
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1458
821
        except (AttributeError, xml.dom.DOMException,
 
1459
822
                xml.parsers.expat.ExpatError) as error:
 
1460
823
            logger.error("Failed to override Introspection method",
 
1466
 
    dbus.OBJECT_MANAGER_IFACE
 
1467
 
except AttributeError:
 
1468
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1471
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1472
 
    """A D-Bus object with an ObjectManager.
 
1474
 
    Classes inheriting from this exposes the standard
 
1475
 
    GetManagedObjects call and the InterfacesAdded and
 
1476
 
    InterfacesRemoved signals on the standard
 
1477
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1479
 
    Note: No signals are sent automatically; they must be sent
 
1482
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1483
 
                         out_signature="a{oa{sa{sv}}}")
 
1484
 
    def GetManagedObjects(self):
 
1485
 
        """This function must be overridden"""
 
1486
 
        raise NotImplementedError()
 
1488
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1489
 
                         signature="oa{sa{sv}}")
 
1490
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1493
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1494
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1497
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1499
 
                         path_keyword='object_path',
 
1500
 
                         connection_keyword='connection')
 
1501
 
    def Introspect(self, object_path, connection):
 
1502
 
        """Overloading of standard D-Bus method.
 
1504
 
        Override return argument name of GetManagedObjects to be
 
1505
 
        "objpath_interfaces_and_properties"
 
1507
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1511
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1513
 
            for if_tag in document.getElementsByTagName("interface"):
 
1514
 
                # Fix argument name for the GetManagedObjects method
 
1515
 
                if (if_tag.getAttribute("name")
 
1516
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1517
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1518
 
                        if (cn.getAttribute("name")
 
1519
 
                            == "GetManagedObjects"):
 
1520
 
                            for arg in cn.getElementsByTagName("arg"):
 
1521
 
                                if (arg.getAttribute("direction")
 
1525
 
                                        "objpath_interfaces"
 
1527
 
            xmlstring = document.toxml("utf-8")
 
1529
 
        except (AttributeError, xml.dom.DOMException,
 
1530
 
                xml.parsers.expat.ExpatError) as error:
 
1531
 
            logger.error("Failed to override Introspection method",
 
1536
 
def datetime_to_dbus(dt, variant_level=0):
 
 
828
def datetime_to_dbus (dt, variant_level=0):
 
1537
829
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1539
 
        return dbus.String("", variant_level=variant_level)
 
1540
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1543
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1544
 
    """A class decorator; applied to a subclass of
 
1545
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1546
 
    interface names according to the "alt_interface_names" mapping.
 
1549
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1550
 
                                    "net.example.AlternateInterface"})
 
1551
 
    class SampleDBusObject(dbus.service.Object):
 
1552
 
        @dbus.service.method("org.example.Interface")
 
1553
 
        def SampleDBusMethod():
 
1556
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1557
 
    reachable via two interfaces: "org.example.Interface" and
 
1558
 
    "net.example.AlternateInterface", the latter of which will have
 
1559
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1560
 
    "true", unless "deprecate" is passed with a False value.
 
1562
 
    This works for methods and signals, and also for D-Bus properties
 
1563
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1564
 
    dbus_interface_annotations decorator).
 
 
831
        return dbus.String("", variant_level = variant_level)
 
 
832
    return dbus.String(dt.isoformat(),
 
 
833
                       variant_level=variant_level)
 
 
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
 
837
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
 
838
    will add additional D-Bus attributes matching a certain pattern.
 
1568
 
        for orig_interface_name, alt_interface_name in (
 
1569
 
                alt_interface_names.items()):
 
1571
 
            interface_names = set()
 
1572
 
            # Go though all attributes of the class
 
1573
 
            for attrname, attribute in inspect.getmembers(cls):
 
 
840
    def __new__(mcs, name, bases, attr):
 
 
841
        # Go through all the base classes which could have D-Bus
 
 
842
        # methods, signals, or properties in them
 
 
843
        for base in (b for b in bases
 
 
844
                     if issubclass(b, dbus.service.Object)):
 
 
845
            # Go though all attributes of the base class
 
 
846
            for attrname, attribute in inspect.getmembers(base):
 
1574
847
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1575
848
                # with the wrong interface name
 
1576
849
                if (not hasattr(attribute, "_dbus_interface")
 
1577
 
                    or not attribute._dbus_interface.startswith(
 
1578
 
                        orig_interface_name)):
 
 
850
                    or not attribute._dbus_interface
 
 
851
                    .startswith("se.recompile.Mandos")):
 
1580
853
                # Create an alternate D-Bus interface name based on
 
1581
854
                # the current name
 
1582
 
                alt_interface = attribute._dbus_interface.replace(
 
1583
 
                    orig_interface_name, alt_interface_name)
 
1584
 
                interface_names.add(alt_interface)
 
 
855
                alt_interface = (attribute._dbus_interface
 
 
856
                                 .replace("se.recompile.Mandos",
 
 
857
                                          "se.bsnet.fukt.Mandos"))
 
1585
858
                # Is this a D-Bus signal?
 
1586
859
                if getattr(attribute, "_dbus_is_signal", False):
 
1587
 
                    # Extract the original non-method undecorated
 
1588
 
                    # function by black magic
 
1589
 
                    if sys.version_info.major == 2:
 
1590
 
                        nonmethod_func = (dict(
 
 
860
                    # Extract the original non-method function by
 
 
862
                    nonmethod_func = (dict(
 
1591
863
                            zip(attribute.func_code.co_freevars,
 
1592
 
                                attribute.__closure__))
 
1593
 
                                          ["func"].cell_contents)
 
1595
 
                        nonmethod_func = (dict(
 
1596
 
                            zip(attribute.__code__.co_freevars,
 
1597
 
                                attribute.__closure__))
 
1598
 
                                          ["func"].cell_contents)
 
 
864
                                attribute.__closure__))["func"]
 
1599
866
                    # Create a new, but exactly alike, function
 
1600
867
                    # object, and decorate it to be a new D-Bus signal
 
1601
868
                    # with the alternate D-Bus interface name
 
1602
 
                    new_function = copy_function(nonmethod_func)
 
1603
 
                    new_function = (dbus.service.signal(
 
1605
 
                        attribute._dbus_signature)(new_function))
 
1606
 
                    # Copy annotations, if any
 
1608
 
                        new_function._dbus_annotations = dict(
 
1609
 
                            attribute._dbus_annotations)
 
1610
 
                    except AttributeError:
 
 
869
                    new_function = (dbus.service.signal
 
 
871
                                     attribute._dbus_signature)
 
 
873
                                nonmethod_func.func_code,
 
 
874
                                nonmethod_func.func_globals,
 
 
875
                                nonmethod_func.func_name,
 
 
876
                                nonmethod_func.func_defaults,
 
 
877
                                nonmethod_func.func_closure)))
 
1613
878
                    # Define a creator of a function to call both the
 
1614
 
                    # original and alternate functions, so both the
 
1615
 
                    # original and alternate signals gets sent when
 
1616
 
                    # the function is called
 
 
879
                    # old and new functions, so both the old and new
 
 
880
                    # signals gets sent when the function is called
 
1617
881
                    def fixscope(func1, func2):
 
1618
882
                        """This function is a scope container to pass
 
1619
883
                        func1 and func2 to the "call_both" function
 
1620
884
                        outside of its arguments"""
 
1622
 
                        @functools.wraps(func2)
 
1623
885
                        def call_both(*args, **kwargs):
 
1624
886
                            """This function will emit two D-Bus
 
1625
887
                            signals by calling func1 and func2"""
 
1626
888
                            func1(*args, **kwargs)
 
1627
889
                            func2(*args, **kwargs)
 
1628
 
                        # Make wrapper function look like a D-Bus
 
1630
 
                        for name, attr in inspect.getmembers(func2):
 
1631
 
                            if name.startswith("_dbus_"):
 
1632
 
                                setattr(call_both, name, attr)
 
1634
890
                        return call_both
 
1635
891
                    # Create the "call_both" function and add it to
 
1637
 
                    attr[attrname] = fixscope(attribute, new_function)
 
 
893
                    attr[attrname] = fixscope(attribute,
 
1638
895
                # Is this a D-Bus method?
 
1639
896
                elif getattr(attribute, "_dbus_is_method", False):
 
1640
897
                    # Create a new, but exactly alike, function
 
1641
898
                    # object.  Decorate it to be a new D-Bus method
 
1642
899
                    # with the alternate D-Bus interface name.  Add it
 
1645
 
                        dbus.service.method(
 
1647
 
                            attribute._dbus_in_signature,
 
1648
 
                            attribute._dbus_out_signature)
 
1649
 
                        (copy_function(attribute)))
 
1650
 
                    # Copy annotations, if any
 
1652
 
                        attr[attrname]._dbus_annotations = dict(
 
1653
 
                            attribute._dbus_annotations)
 
1654
 
                    except AttributeError:
 
 
901
                    attr[attrname] = (dbus.service.method
 
 
903
                                       attribute._dbus_in_signature,
 
 
904
                                       attribute._dbus_out_signature)
 
 
906
                                       (attribute.func_code,
 
 
907
                                        attribute.func_globals,
 
 
909
                                        attribute.func_defaults,
 
 
910
                                        attribute.func_closure)))
 
1656
911
                # Is this a D-Bus property?
 
1657
912
                elif getattr(attribute, "_dbus_is_property", False):
 
1658
913
                    # Create a new, but exactly alike, function
 
1659
914
                    # object, and decorate it to be a new D-Bus
 
1660
915
                    # property with the alternate D-Bus interface
 
1661
916
                    # name.  Add it to the class.
 
1662
 
                    attr[attrname] = (dbus_service_property(
 
1663
 
                        alt_interface, attribute._dbus_signature,
 
1664
 
                        attribute._dbus_access,
 
1665
 
                        attribute._dbus_get_args_options
 
1667
 
                                      (copy_function(attribute)))
 
1668
 
                    # Copy annotations, if any
 
1670
 
                        attr[attrname]._dbus_annotations = dict(
 
1671
 
                            attribute._dbus_annotations)
 
1672
 
                    except AttributeError:
 
1674
 
                # Is this a D-Bus interface?
 
1675
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1676
 
                    # Create a new, but exactly alike, function
 
1677
 
                    # object.  Decorate it to be a new D-Bus interface
 
1678
 
                    # with the alternate D-Bus interface name.  Add it
 
1681
 
                        dbus_interface_annotations(alt_interface)
 
1682
 
                        (copy_function(attribute)))
 
1684
 
                # Deprecate all alternate interfaces
 
1685
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1686
 
                for interface_name in interface_names:
 
1688
 
                    @dbus_interface_annotations(interface_name)
 
1690
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1692
 
                    # Find an unused name
 
1693
 
                    for aname in (iname.format(i)
 
1694
 
                                  for i in itertools.count()):
 
1695
 
                        if aname not in attr:
 
1699
 
                # Replace the class with a new subclass of it with
 
1700
 
                # methods, signals, etc. as created above.
 
1701
 
                if sys.version_info.major == 2:
 
1702
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1705
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1712
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1713
 
                            "se.bsnet.fukt.Mandos"})
 
 
917
                    attr[attrname] = (dbus_service_property
 
 
919
                                       attribute._dbus_signature,
 
 
920
                                       attribute._dbus_access,
 
 
922
                                       ._dbus_get_args_options
 
 
925
                                       (attribute.func_code,
 
 
926
                                        attribute.func_globals,
 
 
928
                                        attribute.func_defaults,
 
 
929
                                        attribute.func_closure)))
 
 
930
        return type.__new__(mcs, name, bases, attr)
 
1714
932
class ClientDBus(Client, DBusObjectWithProperties):
 
1715
933
    """A Client class using D-Bus
 
1718
936
    dbus_object_path: dbus.ObjectPath
 
1719
937
    bus: dbus.SystemBus()
 
1722
940
    runtime_expansions = (Client.runtime_expansions
 
1723
 
                          + ("dbus_object_path", ))
 
1725
 
    _interface = "se.recompile.Mandos.Client"
 
 
941
                          + ("dbus_object_path",))
 
1727
943
    # dbus.service.Object doesn't use super(), so we can't either.
 
1729
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
945
    def __init__(self, bus = None, *args, **kwargs):
 
1731
947
        Client.__init__(self, *args, **kwargs)
 
 
949
        self._approvals_pending = 0
 
1732
950
        # Only now, when this client is initialized, can it show up on
 
1734
 
        client_object_name = str(self.name).translate(
 
 
952
        client_object_name = unicode(self.name).translate(
 
1735
953
            {ord("."): ord("_"),
 
1736
954
             ord("-"): ord("_")})
 
1737
 
        self.dbus_object_path = dbus.ObjectPath(
 
1738
 
            "/clients/" + client_object_name)
 
 
955
        self.dbus_object_path = (dbus.ObjectPath
 
 
956
                                 ("/clients/" + client_object_name))
 
1739
957
        DBusObjectWithProperties.__init__(self, self.bus,
 
1740
958
                                          self.dbus_object_path)
 
1742
 
    def notifychangeproperty(transform_func, dbus_name,
 
1743
 
                             type_func=lambda x: x,
 
1745
 
                             invalidate_only=False,
 
1746
 
                             _interface=_interface):
 
 
960
    def notifychangeproperty(transform_func,
 
 
961
                             dbus_name, type_func=lambda x: x,
 
1747
963
        """ Modify a variable so that it's a property which announces
 
1748
964
        its changes to DBus.
 
 
2305
1488
                        delay -= time2 - time
 
2308
 
                    session.send(client.secret)
 
2309
 
                except gnutls.Error as error:
 
2310
 
                    logger.warning("gnutls send failed",
 
 
1491
                while sent_size < len(client.secret):
 
 
1493
                        sent = session.send(client.secret[sent_size:])
 
 
1494
                    except gnutls.errors.GNUTLSError as error:
 
 
1495
                        logger.warning("gnutls send failed")
 
 
1497
                    logger.debug("Sent: %d, remaining: %d",
 
 
1498
                                 sent, len(client.secret)
 
 
1499
                                 - (sent_size + sent))
 
2314
1502
                logger.info("Sending secret to %s", client.name)
 
2315
1503
                # bump the timeout using extended_timeout
 
2316
 
                client.bump_timeout(client.extended_timeout)
 
 
1504
                client.checked_ok(client.extended_timeout)
 
2317
1505
                if self.server.use_dbus:
 
2318
1506
                    # Emit D-Bus signal
 
2319
1507
                    client.GotSecret()
 
2322
1510
                if approval_required:
 
2323
1511
                    client.approvals_pending -= 1
 
2326
 
                except gnutls.Error as error:
 
2327
 
                    logger.warning("GnuTLS bye failed",
 
 
1514
                except gnutls.errors.GNUTLSError as error:
 
 
1515
                    logger.warning("GnuTLS bye failed")
 
2331
1518
    def peer_certificate(session):
 
2332
1519
        "Return the peer's OpenPGP certificate as a bytestring"
 
2333
1520
        # If not an OpenPGP certificate...
 
2334
 
        if (gnutls.certificate_type_get(session._c_object)
 
2335
 
            != gnutls.CRT_OPENPGP):
 
2336
 
            # ...return invalid data
 
 
1521
        if (gnutls.library.functions
 
 
1522
            .gnutls_certificate_type_get(session._c_object)
 
 
1523
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1524
            # ...do the normal thing
 
 
1525
            return session.peer_certificate
 
2338
1526
        list_size = ctypes.c_uint(1)
 
2339
 
        cert_list = (gnutls.certificate_get_peers
 
 
1527
        cert_list = (gnutls.library.functions
 
 
1528
                     .gnutls_certificate_get_peers
 
2340
1529
                     (session._c_object, ctypes.byref(list_size)))
 
2341
1530
        if not bool(cert_list) and list_size.value != 0:
 
2342
 
            raise gnutls.Error("error getting peer certificate")
 
 
1531
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2343
1533
        if list_size.value == 0:
 
2345
1535
        cert = cert_list[0]
 
2346
1536
        return ctypes.string_at(cert.data, cert.size)
 
2349
1539
    def fingerprint(openpgp):
 
2350
1540
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2351
1541
        # New GnuTLS "datum" with the OpenPGP public key
 
2352
 
        datum = gnutls.datum_t(
 
2353
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2354
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2355
 
            ctypes.c_uint(len(openpgp)))
 
 
1542
        datum = (gnutls.library.types
 
 
1543
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1546
                                 ctypes.c_uint(len(openpgp))))
 
2356
1547
        # New empty GnuTLS certificate
 
2357
 
        crt = gnutls.openpgp_crt_t()
 
2358
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1548
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1549
        (gnutls.library.functions
 
 
1550
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2359
1551
        # Import the OpenPGP public key into the certificate
 
2360
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2361
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1552
        (gnutls.library.functions
 
 
1553
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1554
                                    gnutls.library.constants
 
 
1555
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2362
1556
        # Verify the self signature in the key
 
2363
1557
        crtverify = ctypes.c_uint()
 
2364
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2365
 
                                       ctypes.byref(crtverify))
 
 
1558
        (gnutls.library.functions
 
 
1559
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1560
                                         ctypes.byref(crtverify)))
 
2366
1561
        if crtverify.value != 0:
 
2367
 
            gnutls.openpgp_crt_deinit(crt)
 
2368
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
 
1562
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1563
            raise (gnutls.errors.CertificateSecurityError
 
2369
1565
        # New buffer for the fingerprint
 
2370
1566
        buf = ctypes.create_string_buffer(20)
 
2371
1567
        buf_len = ctypes.c_size_t()
 
2372
1568
        # Get the fingerprint from the certificate into the buffer
 
2373
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2374
 
                                           ctypes.byref(buf_len))
 
 
1569
        (gnutls.library.functions
 
 
1570
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1571
                                             ctypes.byref(buf_len)))
 
2375
1572
        # Deinit the certificate
 
2376
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1573
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2377
1574
        # Convert the buffer to a Python bytestring
 
2378
1575
        fpr = ctypes.string_at(buf, buf_len.value)
 
2379
1576
        # Convert the bytestring to hexadecimal notation
 
2380
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
 
1577
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
2384
1581
class MultiprocessingMixIn(object):
 
2385
1582
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2387
1583
    def sub_process_main(self, request, address):
 
2389
1585
            self.finish_request(request, address)
 
2391
1587
            self.handle_error(request, address)
 
2392
1588
        self.close_request(request)
 
2394
1590
    def process_request(self, request, address):
 
2395
1591
        """Start a new process to process the request."""
 
2396
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2397
 
                                       args=(request, address))
 
 
1592
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2402
1599
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2403
1600
    """ adds a pipe to the MixIn """
 
2405
1601
    def process_request(self, request, client_address):
 
2406
1602
        """Overrides and wraps the original process_request().
 
2408
1604
        This function creates a new pipe in self.pipe
 
2410
1606
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2412
1608
        proc = MultiprocessingMixIn.process_request(self, request,
 
2413
1609
                                                    client_address)
 
2414
1610
        self.child_pipe.close()
 
2415
1611
        self.add_pipe(parent_pipe, proc)
 
2417
1613
    def add_pipe(self, parent_pipe, proc):
 
2418
1614
        """Dummy function; override as necessary"""
 
2419
 
        raise NotImplementedError()
 
 
1615
        raise NotImplementedError
 
2422
1618
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2423
1619
                     socketserver.TCPServer, object):
 
2424
1620
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2427
1623
        enabled:        Boolean; whether this server is activated yet
 
2428
1624
        interface:      None or a network interface name (string)
 
2429
1625
        use_ipv6:       Boolean; to use IPv6 or not
 
2432
1627
    def __init__(self, server_address, RequestHandlerClass,
 
2436
 
        """If socketfd is set, use that file descriptor instead of
 
2437
 
        creating a new one with socket.socket().
 
 
1628
                 interface=None, use_ipv6=True):
 
2439
1629
        self.interface = interface
 
2441
1631
            self.address_family = socket.AF_INET6
 
2442
 
        if socketfd is not None:
 
2443
 
            # Save the file descriptor
 
2444
 
            self.socketfd = socketfd
 
2445
 
            # Save the original socket.socket() function
 
2446
 
            self.socket_socket = socket.socket
 
2448
 
            # To implement --socket, we monkey patch socket.socket.
 
2450
 
            # (When socketserver.TCPServer is a new-style class, we
 
2451
 
            # could make self.socket into a property instead of monkey
 
2452
 
            # patching socket.socket.)
 
2454
 
            # Create a one-time-only replacement for socket.socket()
 
2455
 
            @functools.wraps(socket.socket)
 
2456
 
            def socket_wrapper(*args, **kwargs):
 
2457
 
                # Restore original function so subsequent calls are
 
2459
 
                socket.socket = self.socket_socket
 
2460
 
                del self.socket_socket
 
2461
 
                # This time only, return a new socket object from the
 
2462
 
                # saved file descriptor.
 
2463
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2464
 
            # Replace socket.socket() function with wrapper
 
2465
 
            socket.socket = socket_wrapper
 
2466
 
        # The socketserver.TCPServer.__init__ will call
 
2467
 
        # socket.socket(), which might be our replacement,
 
2468
 
        # socket_wrapper(), if socketfd was set.
 
2469
1632
        socketserver.TCPServer.__init__(self, server_address,
 
2470
1633
                                        RequestHandlerClass)
 
2472
1634
    def server_bind(self):
 
2473
1635
        """This overrides the normal server_bind() function
 
2474
1636
        to bind to an interface if one was specified, and also NOT to
 
2475
1637
        bind to an address or port if they were not specified."""
 
2476
 
        global SO_BINDTODEVICE
 
2477
1638
        if self.interface is not None:
 
2478
1639
            if SO_BINDTODEVICE is None:
 
2479
 
                # Fall back to a hard-coded value which seems to be
 
2481
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2482
 
                SO_BINDTODEVICE = 25
 
2484
 
                self.socket.setsockopt(
 
2485
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2486
 
                    (self.interface + "\0").encode("utf-8"))
 
2487
 
            except socket.error as error:
 
2488
 
                if error.errno == errno.EPERM:
 
2489
 
                    logger.error("No permission to bind to"
 
2490
 
                                 " interface %s", self.interface)
 
2491
 
                elif error.errno == errno.ENOPROTOOPT:
 
2492
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2493
 
                                 " cannot bind to interface %s",
 
2495
 
                elif error.errno == errno.ENODEV:
 
2496
 
                    logger.error("Interface %s does not exist,"
 
2497
 
                                 " cannot bind", self.interface)
 
 
1640
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1641
                             " cannot bind to interface %s",
 
 
1645
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1649
                except socket.error as error:
 
 
1650
                    if error[0] == errno.EPERM:
 
 
1651
                        logger.error("No permission to"
 
 
1652
                                     " bind to interface %s",
 
 
1654
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1655
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1656
                                     " cannot bind to interface %s",
 
2500
1660
        # Only bind(2) the socket if we really need to.
 
2501
1661
        if self.server_address[0] or self.server_address[1]:
 
2502
1662
            if not self.server_address[0]:
 
2503
1663
                if self.address_family == socket.AF_INET6:
 
2504
 
                    any_address = "::"  # in6addr_any
 
 
1664
                    any_address = "::" # in6addr_any
 
2506
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1666
                    any_address = socket.INADDR_ANY
 
2507
1667
                self.server_address = (any_address,
 
2508
1668
                                       self.server_address[1])
 
2509
1669
            elif not self.server_address[1]:
 
2510
 
                self.server_address = (self.server_address[0], 0)
 
 
1670
                self.server_address = (self.server_address[0],
 
2511
1672
#                 if self.interface:
 
2512
1673
#                     self.server_address = (self.server_address[0],
 
 
2834
1919
    parser.add_argument("--no-dbus", action="store_false",
 
2835
1920
                        dest="use_dbus", help="Do not provide D-Bus"
 
2836
 
                        " system bus interface", default=None)
 
 
1921
                        " system bus interface")
 
2837
1922
    parser.add_argument("--no-ipv6", action="store_false",
 
2838
 
                        dest="use_ipv6", help="Do not use IPv6",
 
 
1923
                        dest="use_ipv6", help="Do not use IPv6")
 
2840
1924
    parser.add_argument("--no-restore", action="store_false",
 
2841
 
                        dest="restore", help="Do not restore stored"
 
2842
 
                        " state", default=None)
 
2843
 
    parser.add_argument("--socket", type=int,
 
2844
 
                        help="Specify a file descriptor to a network"
 
2845
 
                        " socket to use instead of creating one")
 
2846
 
    parser.add_argument("--statedir", metavar="DIR",
 
2847
 
                        help="Directory to save/restore state in")
 
2848
 
    parser.add_argument("--foreground", action="store_true",
 
2849
 
                        help="Run in foreground", default=None)
 
2850
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2851
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
1925
                        dest="restore", help="Do not restore stored state",
 
2854
1928
    options = parser.parse_args()
 
2856
1930
    if options.check:
 
2858
 
        fail_count, test_count = doctest.testmod()
 
2859
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2861
1935
    # Default values for config file for server-global settings
 
2862
 
    server_defaults = {"interface": "",
 
2867
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2868
 
                       ":+SIGN-DSA-SHA256",
 
2869
 
                       "servicename": "Mandos",
 
2875
 
                       "statedir": "/var/lib/mandos",
 
2876
 
                       "foreground": "False",
 
 
1936
    server_defaults = { "interface": "",
 
 
1941
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1942
                        "servicename": "Mandos",
 
2880
1948
    # Parse config file for server-global settings
 
2881
1949
    server_config = configparser.SafeConfigParser(server_defaults)
 
2882
1950
    del server_defaults
 
2883
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
1951
    server_config.read(os.path.join(options.configdir,
 
2884
1953
    # Convert the SafeConfigParser object to a dict
 
2885
1954
    server_settings = server_config.defaults()
 
2886
1955
    # Use the appropriate methods on the non-string config options
 
2887
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2888
 
                   "foreground", "zeroconf"):
 
 
1956
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2889
1957
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2891
1959
    if server_settings["port"]:
 
2892
1960
        server_settings["port"] = server_config.getint("DEFAULT",
 
2894
 
    if server_settings["socket"]:
 
2895
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2897
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2898
 
        # over with an opened os.devnull.  But we don't want this to
 
2899
 
        # happen with a supplied network socket.
 
2900
 
        if 0 <= server_settings["socket"] <= 2:
 
2901
 
            server_settings["socket"] = os.dup(server_settings
 
2903
1962
    del server_config
 
2905
1964
    # Override the settings from the config file with command line
 
2906
1965
    # options, if set.
 
2907
1966
    for option in ("interface", "address", "port", "debug",
 
2908
 
                   "priority", "servicename", "configdir", "use_dbus",
 
2909
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2910
 
                   "socket", "foreground", "zeroconf"):
 
 
1967
                   "priority", "servicename", "configdir",
 
 
1968
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2911
1969
        value = getattr(options, option)
 
2912
1970
        if value is not None:
 
2913
1971
            server_settings[option] = value
 
2915
1973
    # Force all strings to be unicode
 
2916
1974
    for option in server_settings.keys():
 
2917
 
        if isinstance(server_settings[option], bytes):
 
2918
 
            server_settings[option] = (server_settings[option]
 
2920
 
    # Force all boolean options to be boolean
 
2921
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2922
 
                   "foreground", "zeroconf"):
 
2923
 
        server_settings[option] = bool(server_settings[option])
 
2924
 
    # Debug implies foreground
 
2925
 
    if server_settings["debug"]:
 
2926
 
        server_settings["foreground"] = True
 
 
1975
        if type(server_settings[option]) is str:
 
 
1976
            server_settings[option] = unicode(server_settings[option])
 
2927
1977
    # Now we have our good server settings in "server_settings"
 
2929
1979
    ##################################################################
 
2931
 
    if (not server_settings["zeroconf"]
 
2932
 
        and not (server_settings["port"]
 
2933
 
                 or server_settings["socket"] != "")):
 
2934
 
        parser.error("Needs port or socket to work without Zeroconf")
 
2936
1981
    # For convenience
 
2937
1982
    debug = server_settings["debug"]
 
2938
1983
    debuglevel = server_settings["debuglevel"]
 
2939
1984
    use_dbus = server_settings["use_dbus"]
 
2940
1985
    use_ipv6 = server_settings["use_ipv6"]
 
2941
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
2943
 
    foreground = server_settings["foreground"]
 
2944
 
    zeroconf = server_settings["zeroconf"]
 
2947
 
        initlogger(debug, logging.DEBUG)
 
2952
 
            level = getattr(logging, debuglevel.upper())
 
2953
 
            initlogger(debug, level)
 
2955
1987
    if server_settings["servicename"] != "Mandos":
 
2956
 
        syslogger.setFormatter(
 
2957
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2958
 
                              ' %(levelname)s: %(message)s'.format(
 
2959
 
                                  server_settings["servicename"])))
 
 
1988
        syslogger.setFormatter(logging.Formatter
 
 
1989
                               ('Mandos (%s) [%%(process)d]:'
 
 
1990
                                ' %%(levelname)s: %%(message)s'
 
 
1991
                                % server_settings["servicename"]))
 
2961
1993
    # Parse config file with clients
 
2962
 
    client_config = configparser.SafeConfigParser(Client
 
 
1994
    client_defaults = { "timeout": "5m",
 
 
1995
                        "extended_timeout": "15m",
 
 
1997
                        "checker": "fping -q -- %%(host)s",
 
 
1999
                        "approval_delay": "0s",
 
 
2000
                        "approval_duration": "1s",
 
 
2002
    client_config = configparser.SafeConfigParser(client_defaults)
 
2964
2003
    client_config.read(os.path.join(server_settings["configdir"],
 
2965
2004
                                    "clients.conf"))
 
2967
2006
    global mandos_dbus_service
 
2968
2007
    mandos_dbus_service = None
 
2971
 
    if server_settings["socket"] != "":
 
2972
 
        socketfd = server_settings["socket"]
 
2973
 
    tcp_server = MandosServer(
 
2974
 
        (server_settings["address"], server_settings["port"]),
 
2976
 
        interface=(server_settings["interface"] or None),
 
2978
 
        gnutls_priority=server_settings["priority"],
 
2982
 
        pidfilename = "/run/mandos.pid"
 
2983
 
        if not os.path.isdir("/run/."):
 
2984
 
            pidfilename = "/var/run/mandos.pid"
 
2987
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2988
 
        except IOError as e:
 
2989
 
            logger.error("Could not open file %r", pidfilename,
 
2992
 
    for name, group in (("_mandos", "_mandos"),
 
2993
 
                        ("mandos", "mandos"),
 
2994
 
                        ("nobody", "nogroup")):
 
2996
 
            uid = pwd.getpwnam(name).pw_uid
 
2997
 
            gid = pwd.getpwnam(group).pw_gid
 
 
2009
    tcp_server = MandosServer((server_settings["address"],
 
 
2010
                               server_settings["port"]),
 
 
2012
                              interface=(server_settings["interface"]
 
 
2016
                              server_settings["priority"],
 
 
2019
        pidfilename = "/var/run/mandos.pid"
 
 
2021
            pidfile = open(pidfilename, "w")
 
 
2023
            logger.error("Could not open file %r", pidfilename)
 
 
2026
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
2027
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
2030
            uid = pwd.getpwnam("mandos").pw_uid
 
 
2031
            gid = pwd.getpwnam("mandos").pw_gid
 
2999
2032
        except KeyError:
 
 
2034
                uid = pwd.getpwnam("nobody").pw_uid
 
 
2035
                gid = pwd.getpwnam("nobody").pw_gid
 
3008
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3010
2042
    except OSError as error:
 
3011
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3012
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3013
 
        if error.errno != errno.EPERM:
 
 
2043
        if error[0] != errno.EPERM:
 
 
2046
    if not debug and not debuglevel:
 
 
2047
        logger.setLevel(logging.WARNING)
 
 
2049
        level = getattr(logging, debuglevel.upper())
 
 
2050
        logger.setLevel(level)
 
 
2053
        logger.setLevel(logging.DEBUG)
 
3017
2054
        # Enable all possible GnuTLS debugging
 
3019
2056
        # "Use a log level over 10 to enable all debugging options."
 
3020
2057
        # - GnuTLS manual
 
3021
 
        gnutls.global_set_log_level(11)
 
 
2058
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2060
        @gnutls.library.types.gnutls_log_func
 
3024
2061
        def debug_gnutls(level, string):
 
3025
2062
            logger.debug("GnuTLS: %s", string[:-1])
 
3027
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
2064
        (gnutls.library.functions
 
 
2065
         .gnutls_global_set_log_function(debug_gnutls))
 
3029
2067
        # Redirect stdin so all checkers get /dev/null
 
3030
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
2068
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
3031
2069
        os.dup2(null, sys.stdin.fileno())
 
 
2073
        # No console logging
 
 
2074
        logger.removeHandler(console)
 
3035
2076
    # Need to fork before connecting to D-Bus
 
3037
2078
        # Close all input and output, do double fork, etc.
 
3040
 
    # multiprocessing will use threads, so before we use GLib we need
 
3041
 
    # to inform GLib that threads will be used.
 
3044
2081
    global main_loop
 
3045
2082
    # From the Avahi example code
 
3046
 
    DBusGMainLoop(set_as_default=True)
 
3047
 
    main_loop = GLib.MainLoop()
 
 
2083
    DBusGMainLoop(set_as_default=True )
 
 
2084
    main_loop = gobject.MainLoop()
 
3048
2085
    bus = dbus.SystemBus()
 
3049
2086
    # End of Avahi example code
 
3052
2089
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3055
 
            old_bus_name = dbus.service.BusName(
 
3056
 
                "se.bsnet.fukt.Mandos", bus,
 
3058
 
        except dbus.exceptions.DBusException as e:
 
3059
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
2090
                                            bus, do_not_queue=True)
 
 
2091
            old_bus_name = (dbus.service.BusName
 
 
2092
                            ("se.bsnet.fukt.Mandos", bus,
 
 
2094
        except dbus.exceptions.NameExistsException as e:
 
 
2095
            logger.error(unicode(e) + ", disabling D-Bus")
 
3060
2096
            use_dbus = False
 
3061
2097
            server_settings["use_dbus"] = False
 
3062
2098
            tcp_server.use_dbus = False
 
3064
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3065
 
        service = AvahiServiceToSyslog(
 
3066
 
            name=server_settings["servicename"],
 
3067
 
            servicetype="_mandos._tcp",
 
3070
 
        if server_settings["interface"]:
 
3071
 
            service.interface = if_nametoindex(
 
3072
 
                server_settings["interface"].encode("utf-8"))
 
 
2099
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2100
    service = AvahiServiceToSyslog(name =
 
 
2101
                                   server_settings["servicename"],
 
 
2102
                                   servicetype = "_mandos._tcp",
 
 
2103
                                   protocol = protocol, bus = bus)
 
 
2104
    if server_settings["interface"]:
 
 
2105
        service.interface = (if_nametoindex
 
 
2106
                             (str(server_settings["interface"])))
 
3074
2108
    global multiprocessing_manager
 
3075
2109
    multiprocessing_manager = multiprocessing.Manager()
 
3077
2111
    client_class = Client
 
3079
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
3081
 
    client_settings = Client.config_parser(client_config)
 
 
2113
        client_class = functools.partial(ClientDBusTransitional,
 
 
2116
    special_settings = {
 
 
2117
        # Some settings need to be accessd by special methods;
 
 
2118
        # booleans need .getboolean(), etc.  Here is a list of them:
 
 
2119
        "approved_by_default":
 
 
2121
            client_config.getboolean(section, "approved_by_default"),
 
 
2123
    # Construct a new dict of client settings of this form:
 
 
2124
    # { client_name: {setting_name: value, ...}, ...}
 
 
2125
    # with exceptions for any special settings as defined above
 
 
2126
    client_settings = dict((clientname,
 
 
2128
                                 (value if setting not in special_settings
 
 
2129
                                  else special_settings[setting](clientname)))
 
 
2130
                                for setting, value in client_config.items(clientname)))
 
 
2131
                          for clientname in client_config.sections())
 
3082
2133
    old_client_settings = {}
 
3085
 
    # This is used to redirect stdout and stderr for checker processes
 
3087
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3088
 
    # Only used if server is running in foreground but not in debug
 
3090
 
    if debug or not foreground:
 
3093
 
    # Get client data and settings from last running state.
 
 
2136
    # Get client data and settings from last running state. 
 
3094
2137
    if server_settings["restore"]:
 
3096
2139
            with open(stored_state_path, "rb") as stored_state:
 
3097
 
                if sys.version_info.major == 2:
 
3098
 
                    clients_data, old_client_settings = pickle.load(
 
3101
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3102
 
                        pickle.load(stored_state, encoding="bytes"))
 
3103
 
                    #   Fix bytes to strings
 
3106
 
                    clients_data = {(key.decode("utf-8")
 
3107
 
                                     if isinstance(key, bytes)
 
3110
 
                                    bytes_clients_data.items()}
 
3111
 
                    del bytes_clients_data
 
3112
 
                    for key in clients_data:
 
3113
 
                        value = {(k.decode("utf-8")
 
3114
 
                                  if isinstance(k, bytes) else k): v
 
3116
 
                                 clients_data[key].items()}
 
3117
 
                        clients_data[key] = value
 
3119
 
                        value["client_structure"] = [
 
3121
 
                             if isinstance(s, bytes)
 
3123
 
                            value["client_structure"]]
 
3125
 
                        for k in ("name", "host"):
 
3126
 
                            if isinstance(value[k], bytes):
 
3127
 
                                value[k] = value[k].decode("utf-8")
 
3128
 
                    #  old_client_settings
 
3130
 
                    old_client_settings = {
 
3131
 
                        (key.decode("utf-8")
 
3132
 
                         if isinstance(key, bytes)
 
3135
 
                        bytes_old_client_settings.items()}
 
3136
 
                    del bytes_old_client_settings
 
3138
 
                    for value in old_client_settings.values():
 
3139
 
                        if isinstance(value["host"], bytes):
 
3140
 
                            value["host"] = (value["host"]
 
 
2140
                clients_data, old_client_settings = pickle.load(stored_state)
 
3142
2141
            os.remove(stored_state_path)
 
3143
2142
        except IOError as e:
 
3144
 
            if e.errno == errno.ENOENT:
 
3145
 
                logger.warning("Could not load persistent state:"
 
3146
 
                               " {}".format(os.strerror(e.errno)))
 
3148
 
                logger.critical("Could not load persistent state:",
 
 
2143
            logger.warning("Could not load persistant state: {0}".format(e))
 
 
2144
            if e.errno != errno.ENOENT:
 
3151
 
        except EOFError as e:
 
3152
 
            logger.warning("Could not load persistent state: "
 
3156
 
    with PGPEngine() as pgp:
 
3157
 
        for client_name, client in clients_data.items():
 
3158
 
            # Skip removed clients
 
3159
 
            if client_name not in client_settings:
 
3162
 
            # Decide which value to use after restoring saved state.
 
3163
 
            # We have three different values: Old config file,
 
3164
 
            # new config file, and saved state.
 
3165
 
            # New config value takes precedence if it differs from old
 
3166
 
            # config value, otherwise use saved state.
 
3167
 
            for name, value in client_settings[client_name].items():
 
3169
 
                    # For each value in new config, check if it
 
3170
 
                    # differs from the old config value (Except for
 
3171
 
                    # the "secret" attribute)
 
3172
 
                    if (name != "secret"
 
3174
 
                             old_client_settings[client_name][name])):
 
3175
 
                        client[name] = value
 
3179
 
            # Clients who has passed its expire date can still be
 
3180
 
            # enabled if its last checker was successful.  A Client
 
3181
 
            # whose checker succeeded before we stored its state is
 
3182
 
            # assumed to have successfully run all checkers during
 
3184
 
            if client["enabled"]:
 
3185
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
3186
 
                    if not client["last_checked_ok"]:
 
3188
 
                            "disabling client {} - Client never "
 
3189
 
                            "performed a successful checker".format(
 
3191
 
                        client["enabled"] = False
 
3192
 
                    elif client["last_checker_status"] != 0:
 
3194
 
                            "disabling client {} - Client last"
 
3195
 
                            " checker failed with error code"
 
3198
 
                                client["last_checker_status"]))
 
3199
 
                        client["enabled"] = False
 
3201
 
                        client["expires"] = (
 
3202
 
                            datetime.datetime.utcnow()
 
3203
 
                            + client["timeout"])
 
3204
 
                        logger.debug("Last checker succeeded,"
 
3205
 
                                     " keeping {} enabled".format(
 
 
2147
    for client in clients_data:
 
 
2148
        client_name = client["name"]
 
 
2150
        # Decide which value to use after restoring saved state.
 
 
2151
        # We have three different values: Old config file,
 
 
2152
        # new config file, and saved state.
 
 
2153
        # New config value takes precedence if it differs from old
 
 
2154
        # config value, otherwise use saved state.
 
 
2155
        for name, value in client_settings[client_name].items():
 
3208
 
                client["secret"] = pgp.decrypt(
 
3209
 
                    client["encrypted_secret"],
 
3210
 
                    client_settings[client_name]["secret"])
 
3212
 
                # If decryption fails, we use secret from new settings
 
3213
 
                logger.debug("Failed to decrypt {} old secret".format(
 
3215
 
                client["secret"] = (client_settings[client_name]
 
3218
 
    # Add/remove clients based on new changes made to config
 
3219
 
    for client_name in (set(old_client_settings)
 
3220
 
                        - set(client_settings)):
 
3221
 
        del clients_data[client_name]
 
3222
 
    for client_name in (set(client_settings)
 
3223
 
                        - set(old_client_settings)):
 
3224
 
        clients_data[client_name] = client_settings[client_name]
 
3226
 
    # Create all client objects
 
3227
 
    for client_name, client in clients_data.items():
 
3228
 
        tcp_server.clients[client_name] = client_class(
 
3231
 
            server_settings=server_settings)
 
 
2157
                # For each value in new config, check if it differs
 
 
2158
                # from the old config value (Except for the "secret"
 
 
2160
                if name != "secret" and value != old_client_settings[client_name][name]:
 
 
2161
                    setattr(client, name, value)
 
 
2165
        # Clients who has passed its expire date, can still be enabled if its
 
 
2166
        # last checker was sucessful. Clients who checkers failed before we
 
 
2167
        # stored it state is asumed to had failed checker during downtime.
 
 
2168
        if client["enabled"] and client["last_checked_ok"]:
 
 
2169
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
 
 
2170
                > client["interval"]):
 
 
2171
                if client["last_checker_status"] != 0:
 
 
2172
                    client["enabled"] = False
 
 
2174
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
 
 
2176
        client["changedstate"] = (multiprocessing_manager
 
 
2177
                                  .Condition(multiprocessing_manager
 
 
2180
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
 
 
2181
            tcp_server.clients[client_name] = new_client
 
 
2182
            new_client.bus = bus
 
 
2183
            for name, value in client.iteritems():
 
 
2184
                setattr(new_client, name, value)
 
 
2185
            client_object_name = unicode(client_name).translate(
 
 
2186
                {ord("."): ord("_"),
 
 
2187
                 ord("-"): ord("_")})
 
 
2188
            new_client.dbus_object_path = (dbus.ObjectPath
 
 
2189
                                     ("/clients/" + client_object_name))
 
 
2190
            DBusObjectWithProperties.__init__(new_client,
 
 
2192
                                              new_client.dbus_object_path)
 
 
2194
            tcp_server.clients[client_name] = Client.__new__(Client)
 
 
2195
            for name, value in client.iteritems():
 
 
2196
                setattr(tcp_server.clients[client_name], name, value)
 
 
2198
        tcp_server.clients[client_name].decrypt_secret(
 
 
2199
            client_settings[client_name]["secret"])            
 
 
2201
    # Create/remove clients based on new changes made to config
 
 
2202
    for clientname in set(old_client_settings) - set(client_settings):
 
 
2203
        del tcp_server.clients[clientname]
 
 
2204
    for clientname in set(client_settings) - set(old_client_settings):
 
 
2205
        tcp_server.clients[clientname] = (client_class(name = clientname,
 
3233
2211
    if not tcp_server.clients:
 
3234
2212
        logger.warning("No clients defined")
 
3237
 
        if pidfile is not None:
 
3241
 
                    print(pid, file=pidfile)
 
3243
 
                logger.error("Could not write to file %r with PID %d",
 
 
2218
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
2221
            logger.error("Could not write to file %r with PID %d",
 
 
2224
            # "pidfile" was never created
 
3246
2226
        del pidfilename
 
3248
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3249
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3250
 
                             lambda: main_loop.quit() and False)
 
 
2228
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
2230
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
2231
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3254
 
        @alternate_dbus_interfaces(
 
3255
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3256
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
2234
        class MandosDBusService(dbus.service.Object):
 
3257
2235
            """A D-Bus proxy object"""
 
3259
2236
            def __init__(self):
 
3260
2237
                dbus.service.Object.__init__(self, bus, "/")
 
3262
2238
            _interface = "se.recompile.Mandos"
 
3264
2240
            @dbus.service.signal(_interface, signature="o")
 
3265
2241
            def ClientAdded(self, objpath):
 
3269
2245
            @dbus.service.signal(_interface, signature="ss")
 
3270
2246
            def ClientNotFound(self, fingerprint, address):
 
3274
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3276
2250
            @dbus.service.signal(_interface, signature="os")
 
3277
2251
            def ClientRemoved(self, objpath, name):
 
3281
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3283
2255
            @dbus.service.method(_interface, out_signature="ao")
 
3284
2256
            def GetAllClients(self):
 
3286
 
                return dbus.Array(c.dbus_object_path for c in
 
3287
 
                                  tcp_server.clients.values())
 
3289
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
2258
                return dbus.Array(c.dbus_object_path
 
 
2260
                                  tcp_server.clients.itervalues())
 
3291
2262
            @dbus.service.method(_interface,
 
3292
2263
                                 out_signature="a{oa{sv}}")
 
3293
2264
            def GetAllClientsWithProperties(self):
 
3295
2266
                return dbus.Dictionary(
 
3296
 
                    {c.dbus_object_path: c.GetAll(
 
3297
 
                        "se.recompile.Mandos.Client")
 
3298
 
                     for c in tcp_server.clients.values()},
 
 
2267
                    ((c.dbus_object_path, c.GetAll(""))
 
 
2268
                     for c in tcp_server.clients.itervalues()),
 
3299
2269
                    signature="oa{sv}")
 
3301
2271
            @dbus.service.method(_interface, in_signature="o")
 
3302
2272
            def RemoveClient(self, object_path):
 
3304
 
                for c in tcp_server.clients.values():
 
 
2274
                for c in tcp_server.clients.itervalues():
 
3305
2275
                    if c.dbus_object_path == object_path:
 
3306
2276
                        del tcp_server.clients[c.name]
 
3307
2277
                        c.remove_from_connection()
 
3308
 
                        # Don't signal the disabling
 
 
2278
                        # Don't signal anything except ClientRemoved
 
3309
2279
                        c.disable(quiet=True)
 
3310
 
                        # Emit D-Bus signal for removal
 
3311
 
                        self.client_removed_signal(c)
 
 
2281
                        self.ClientRemoved(object_path, c.name)
 
3313
2283
                raise KeyError(object_path)
 
3317
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3318
 
                                 out_signature="a{oa{sa{sv}}}")
 
3319
 
            def GetManagedObjects(self):
 
3321
 
                return dbus.Dictionary(
 
3322
 
                    {client.dbus_object_path:
 
3324
 
                         {interface: client.GetAll(interface)
 
3326
 
                          client._get_all_interface_names()})
 
3327
 
                     for client in tcp_server.clients.values()})
 
3329
 
            def client_added_signal(self, client):
 
3330
 
                """Send the new standard signal and the old signal"""
 
3332
 
                    # New standard signal
 
3333
 
                    self.InterfacesAdded(
 
3334
 
                        client.dbus_object_path,
 
3336
 
                            {interface: client.GetAll(interface)
 
3338
 
                             client._get_all_interface_names()}))
 
3340
 
                    self.ClientAdded(client.dbus_object_path)
 
3342
 
            def client_removed_signal(self, client):
 
3343
 
                """Send the new standard signal and the old signal"""
 
3345
 
                    # New standard signal
 
3346
 
                    self.InterfacesRemoved(
 
3347
 
                        client.dbus_object_path,
 
3348
 
                        client._get_all_interface_names())
 
3350
 
                    self.ClientRemoved(client.dbus_object_path,
 
3353
 
        mandos_dbus_service = MandosDBusService()
 
3355
 
    # Save modules to variables to exempt the modules from being
 
3356
 
    # unloaded before the function registered with atexit() is run.
 
3357
 
    mp = multiprocessing
 
 
2287
        class MandosDBusServiceTransitional(MandosDBusService):
 
 
2288
            __metaclass__ = AlternateDBusNamesMetaclass
 
 
2289
        mandos_dbus_service = MandosDBusServiceTransitional()
 
3361
2292
        "Cleanup function; run on exit"
 
3365
 
        mp.active_children()
 
 
2295
        multiprocessing.active_children()
 
3367
2296
        if not (tcp_server.clients or client_settings):
 
3370
 
        # Store client before exiting. Secrets are encrypted with key
 
3371
 
        # based on what config file has. If config file is
 
3372
 
        # removed/edited, old secret will thus be unrecovable.
 
3374
 
        with PGPEngine() as pgp:
 
3375
 
            for client in tcp_server.clients.values():
 
3376
 
                key = client_settings[client.name]["secret"]
 
3377
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3381
 
                # A list of attributes that can not be pickled
 
3383
 
                exclude = {"bus", "changedstate", "secret",
 
3384
 
                           "checker", "server_settings"}
 
3385
 
                for name, typ in inspect.getmembers(dbus.service
 
3389
 
                client_dict["encrypted_secret"] = (client
 
3391
 
                for attr in client.client_structure:
 
3392
 
                    if attr not in exclude:
 
3393
 
                        client_dict[attr] = getattr(client, attr)
 
3395
 
                clients[client.name] = client_dict
 
3396
 
                del client_settings[client.name]["secret"]
 
 
2299
        # Store client before exiting. Secrets are encrypted with key based
 
 
2300
        # on what config file has. If config file is removed/edited, old
 
 
2301
        # secret will thus be unrecovable.
 
 
2303
        for client in tcp_server.clients.itervalues():
 
 
2304
            client.encrypt_secret(client_settings[client.name]["secret"])
 
 
2308
            # A list of attributes that will not be stored when shuting down.
 
 
2309
            exclude = set(("bus", "changedstate", "secret"))            
 
 
2310
            for name, typ in inspect.getmembers(dbus.service.Object):
 
 
2313
            client_dict["encrypted_secret"] = client.encrypted_secret
 
 
2314
            for attr in client.client_structure:
 
 
2315
                if attr not in exclude:
 
 
2316
                    client_dict[attr] = getattr(client, attr)
 
 
2318
            clients.append(client_dict) 
 
 
2319
            del client_settings[client.name]["secret"]
 
3399
 
            with tempfile.NamedTemporaryFile(
 
3403
 
                    dir=os.path.dirname(stored_state_path),
 
3404
 
                    delete=False) as stored_state:
 
3405
 
                pickle.dump((clients, client_settings), stored_state,
 
3407
 
                tempname = stored_state.name
 
3408
 
            os.rename(tempname, stored_state_path)
 
3409
 
        except (IOError, OSError) as e:
 
3415
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3416
 
                logger.warning("Could not save persistent state: {}"
 
3417
 
                               .format(os.strerror(e.errno)))
 
3419
 
                logger.warning("Could not save persistent state:",
 
 
2322
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
 
2323
                pickle.dump((clients, client_settings), stored_state)
 
 
2324
        except IOError as e:
 
 
2325
            logger.warning("Could not save persistant state: {0}".format(e))
 
 
2326
            if e.errno != errno.ENOENT:
 
3423
2329
        # Delete all clients, and settings from config