69
 
    import cPickle as pickle
 
 
63
import cPickle as pickle
 
72
64
import multiprocessing
 
81
70
import dbus.service
 
82
 
from gi.repository import GLib
 
83
73
from dbus.mainloop.glib import DBusGMainLoop
 
86
76
import xml.dom.minidom
 
89
 
# Try to find the value of SO_BINDTODEVICE:
 
91
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
92
 
    # newer, and it is also the most natural place for it:
 
93
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
94
82
except AttributeError:
 
96
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
98
84
        from IN import SO_BINDTODEVICE
 
99
85
    except ImportError:
 
100
 
        # In Python 2.7 it seems to have been removed entirely.
 
101
 
        # Try running the C preprocessor:
 
103
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
105
 
                                  stdin=subprocess.PIPE,
 
106
 
                                  stdout=subprocess.PIPE)
 
107
 
            stdout = cc.communicate(
 
108
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
109
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
110
 
        except (OSError, ValueError, IndexError):
 
112
 
            SO_BINDTODEVICE = None
 
114
 
if sys.version_info.major == 2:
 
 
86
        SO_BINDTODEVICE = None
 
118
89
stored_state_file = "clients.pickle"
 
120
91
logger = logging.getLogger()
 
 
92
syslogger = (logging.handlers.SysLogHandler
 
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
94
              address = str("/dev/log")))
 
124
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
125
 
        ctypes.util.find_library("c")).if_nametoindex
 
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
 
98
                      (ctypes.util.find_library("c"))
 
126
100
except (OSError, AttributeError):
 
128
101
    def if_nametoindex(interface):
 
129
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
130
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
131
104
        with contextlib.closing(socket.socket()) as s:
 
132
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
133
 
                                struct.pack(b"16s16x", interface))
 
134
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
 
106
                                struct.pack(str("16s16x"),
 
 
108
        interface_index = struct.unpack(str("I"),
 
135
110
        return interface_index
 
138
 
def copy_function(func):
 
139
 
    """Make a copy of a function"""
 
140
 
    if sys.version_info.major == 2:
 
141
 
        return types.FunctionType(func.func_code,
 
147
 
        return types.FunctionType(func.__code__,
 
154
113
def initlogger(debug, level=logging.WARNING):
 
155
114
    """init logger and add loglevel"""
 
158
 
    syslogger = (logging.handlers.SysLogHandler(
 
159
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
161
116
    syslogger.setFormatter(logging.Formatter
 
162
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
164
119
    logger.addHandler(syslogger)
 
167
122
        console = logging.StreamHandler()
 
168
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
225
168
            os.rmdir(self.tempdir)
 
226
169
            self.tempdir = None
 
228
171
    def password_encode(self, password):
 
229
172
        # Passphrase can not be empty and can not contain newlines or
 
230
173
        # NUL bytes.  So we prefix it and hex encode it.
 
231
 
        encoded = b"mandos" + binascii.hexlify(password)
 
232
 
        if len(encoded) > 2048:
 
233
 
            # GnuPG can't handle long passwords, so encode differently
 
234
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
235
 
                       .replace(b"\n", b"\\n")
 
236
 
                       .replace(b"\0", b"\\x00"))
 
 
174
        return b"mandos" + binascii.hexlify(password)
 
239
176
    def encrypt(self, data, password):
 
240
 
        passphrase = self.password_encode(password)
 
241
 
        with tempfile.NamedTemporaryFile(
 
242
 
                dir=self.tempdir) as passfile:
 
243
 
            passfile.write(passphrase)
 
245
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
249
 
                                    stdin=subprocess.PIPE,
 
250
 
                                    stdout=subprocess.PIPE,
 
251
 
                                    stderr=subprocess.PIPE)
 
252
 
            ciphertext, err = proc.communicate(input=data)
 
253
 
        if proc.returncode != 0:
 
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
 
178
        with open(os.devnull) as devnull:
 
 
180
                proc = self.gnupg.run(['--symmetric'],
 
 
181
                                      create_fhs=['stdin', 'stdout'],
 
 
182
                                      attach_fhs={'stderr': devnull})
 
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
 
186
                    ciphertext = f.read()
 
 
190
        self.gnupg.passphrase = None
 
255
191
        return ciphertext
 
257
193
    def decrypt(self, data, password):
 
258
 
        passphrase = self.password_encode(password)
 
259
 
        with tempfile.NamedTemporaryFile(
 
260
 
                dir=self.tempdir) as passfile:
 
261
 
            passfile.write(passphrase)
 
263
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
267
 
                                    stdin=subprocess.PIPE,
 
268
 
                                    stdout=subprocess.PIPE,
 
269
 
                                    stderr=subprocess.PIPE)
 
270
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
271
 
        if proc.returncode != 0:
 
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
 
195
        with open(os.devnull) as devnull:
 
 
197
                proc = self.gnupg.run(['--decrypt'],
 
 
198
                                      create_fhs=['stdin', 'stdout'],
 
 
199
                                      attach_fhs={'stderr': devnull})
 
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
 
203
                    decrypted_plaintext = f.read()
 
 
207
        self.gnupg.passphrase = None
 
273
208
        return decrypted_plaintext
 
276
 
# Pretend that we have an Avahi module
 
278
 
    """This isn't so much a class as it is a module-like namespace.
 
279
 
    It is instantiated once, and simulates having an Avahi module."""
 
280
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
281
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
282
 
    PROTO_INET = 0               # avahi-common/address.h
 
283
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
284
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
285
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
286
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
287
 
    DBUS_PATH_SERVER = "/"
 
289
 
    def string_array_to_txt_array(self, t):
 
290
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
291
 
                           for s in t), signature="ay")
 
292
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
293
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
294
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
295
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
296
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
297
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
298
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
299
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
303
212
class AvahiError(Exception):
 
304
213
    def __init__(self, value, *args, **kwargs):
 
305
214
        self.value = value
 
306
 
        return super(AvahiError, self).__init__(value, *args,
 
 
215
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
216
    def __unicode__(self):
 
 
217
        return unicode(repr(self.value))
 
310
219
class AvahiServiceError(AvahiError):
 
314
222
class AvahiGroupError(AvahiError):
 
318
226
class AvahiService(object):
 
319
227
    """An Avahi (Zeroconf) service.
 
322
230
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
323
231
               Used to optionally bind to the specified interface.
 
324
232
    name: string; Example: 'Mandos'
 
325
233
    type: string; Example: '_mandos._tcp'.
 
326
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
327
235
    port: integer; what port to announce
 
328
236
    TXT: list of strings; TXT record for the service
 
329
237
    domain: string; Domain to publish on, default to .local if empty.
 
 
488
366
                                    follow_name_owner_changes=True),
 
489
367
                avahi.DBUS_INTERFACE_SERVER)
 
490
368
        self.server.connect_to_signal("StateChanged",
 
491
 
                                      self.server_state_changed)
 
 
369
                                 self.server_state_changed)
 
492
370
        self.server_state_changed(self.server.GetState())
 
495
372
class AvahiServiceToSyslog(AvahiService):
 
496
 
    def rename(self, *args, **kwargs):
 
497
374
        """Add the new name to the syslog messages"""
 
498
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
499
 
        syslogger.setFormatter(logging.Formatter(
 
500
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
375
        ret = AvahiService.rename(self)
 
 
376
        syslogger.setFormatter(logging.Formatter
 
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
 
378
                                ' %%(levelname)s: %%(message)s'
 
505
 
# Pretend that we have a GnuTLS module
 
506
 
class GnuTLS(object):
 
507
 
    """This isn't so much a class as it is a module-like namespace.
 
508
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
510
 
    library = ctypes.util.find_library("gnutls")
 
512
 
        library = ctypes.util.find_library("gnutls-deb0")
 
513
 
    _library = ctypes.cdll.LoadLibrary(library)
 
515
 
    _need_version = b"3.3.0"
 
518
 
        # Need to use "self" here, since this method is called before
 
519
 
        # the assignment to the "gnutls" global variable happens.
 
520
 
        if self.check_version(self._need_version) is None:
 
521
 
            raise self.Error("Needs GnuTLS {} or later"
 
522
 
                             .format(self._need_version))
 
524
 
    # Unless otherwise indicated, the constants and types below are
 
525
 
    # all from the gnutls/gnutls.h C header file.
 
535
 
    E_NO_CERTIFICATE_FOUND = -49
 
536
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
539
 
    class session_int(ctypes.Structure):
 
541
 
    session_t = ctypes.POINTER(session_int)
 
543
 
    class certificate_credentials_st(ctypes.Structure):
 
545
 
    certificate_credentials_t = ctypes.POINTER(
 
546
 
        certificate_credentials_st)
 
547
 
    certificate_type_t = ctypes.c_int
 
549
 
    class datum_t(ctypes.Structure):
 
550
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
551
 
                    ('size', ctypes.c_uint)]
 
553
 
    class openpgp_crt_int(ctypes.Structure):
 
555
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
556
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
557
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
558
 
    credentials_type_t = ctypes.c_int
 
559
 
    transport_ptr_t = ctypes.c_void_p
 
560
 
    close_request_t = ctypes.c_int
 
563
 
    class Error(Exception):
 
564
 
        # We need to use the class name "GnuTLS" here, since this
 
565
 
        # exception might be raised from within GnuTLS.__init__,
 
566
 
        # which is called before the assignment to the "gnutls"
 
567
 
        # global variable has happened.
 
568
 
        def __init__(self, message=None, code=None, args=()):
 
569
 
            # Default usage is by a message string, but if a return
 
570
 
            # code is passed, convert it to a string with
 
573
 
            if message is None and code is not None:
 
574
 
                message = GnuTLS.strerror(code)
 
575
 
            return super(GnuTLS.Error, self).__init__(
 
578
 
    class CertificateSecurityError(Error):
 
582
 
    class Credentials(object):
 
584
 
            self._c_object = gnutls.certificate_credentials_t()
 
585
 
            gnutls.certificate_allocate_credentials(
 
586
 
                ctypes.byref(self._c_object))
 
587
 
            self.type = gnutls.CRD_CERTIFICATE
 
590
 
            gnutls.certificate_free_credentials(self._c_object)
 
592
 
    class ClientSession(object):
 
593
 
        def __init__(self, socket, credentials=None):
 
594
 
            self._c_object = gnutls.session_t()
 
595
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
596
 
            gnutls.set_default_priority(self._c_object)
 
597
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
598
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
601
 
            if credentials is None:
 
602
 
                credentials = gnutls.Credentials()
 
603
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
604
 
                                   ctypes.cast(credentials._c_object,
 
606
 
            self.credentials = credentials
 
609
 
            gnutls.deinit(self._c_object)
 
612
 
            return gnutls.handshake(self._c_object)
 
614
 
        def send(self, data):
 
618
 
                data_len -= gnutls.record_send(self._c_object,
 
623
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
625
 
    # Error handling functions
 
626
 
    def _error_code(result):
 
627
 
        """A function to raise exceptions on errors, suitable
 
628
 
        for the 'restype' attribute on ctypes functions"""
 
631
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
632
 
            raise gnutls.CertificateSecurityError(code=result)
 
633
 
        raise gnutls.Error(code=result)
 
635
 
    def _retry_on_error(result, func, arguments):
 
636
 
        """A function to retry on some errors, suitable
 
637
 
        for the 'errcheck' attribute on ctypes functions"""
 
639
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
640
 
                return _error_code(result)
 
641
 
            result = func(*arguments)
 
644
 
    # Unless otherwise indicated, the function declarations below are
 
645
 
    # all from the gnutls/gnutls.h C header file.
 
648
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
649
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
650
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
651
 
    priority_set_direct.restype = _error_code
 
653
 
    init = _library.gnutls_init
 
654
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
655
 
    init.restype = _error_code
 
657
 
    set_default_priority = _library.gnutls_set_default_priority
 
658
 
    set_default_priority.argtypes = [session_t]
 
659
 
    set_default_priority.restype = _error_code
 
661
 
    record_send = _library.gnutls_record_send
 
662
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
664
 
    record_send.restype = ctypes.c_ssize_t
 
665
 
    record_send.errcheck = _retry_on_error
 
667
 
    certificate_allocate_credentials = (
 
668
 
        _library.gnutls_certificate_allocate_credentials)
 
669
 
    certificate_allocate_credentials.argtypes = [
 
670
 
        ctypes.POINTER(certificate_credentials_t)]
 
671
 
    certificate_allocate_credentials.restype = _error_code
 
673
 
    certificate_free_credentials = (
 
674
 
        _library.gnutls_certificate_free_credentials)
 
675
 
    certificate_free_credentials.argtypes = [
 
676
 
        certificate_credentials_t]
 
677
 
    certificate_free_credentials.restype = None
 
679
 
    handshake_set_private_extensions = (
 
680
 
        _library.gnutls_handshake_set_private_extensions)
 
681
 
    handshake_set_private_extensions.argtypes = [session_t,
 
683
 
    handshake_set_private_extensions.restype = None
 
685
 
    credentials_set = _library.gnutls_credentials_set
 
686
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
688
 
    credentials_set.restype = _error_code
 
690
 
    strerror = _library.gnutls_strerror
 
691
 
    strerror.argtypes = [ctypes.c_int]
 
692
 
    strerror.restype = ctypes.c_char_p
 
694
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
695
 
    certificate_type_get.argtypes = [session_t]
 
696
 
    certificate_type_get.restype = _error_code
 
698
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
699
 
    certificate_get_peers.argtypes = [session_t,
 
700
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
701
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
703
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
704
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
705
 
    global_set_log_level.restype = None
 
707
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
708
 
    global_set_log_function.argtypes = [log_func]
 
709
 
    global_set_log_function.restype = None
 
711
 
    deinit = _library.gnutls_deinit
 
712
 
    deinit.argtypes = [session_t]
 
713
 
    deinit.restype = None
 
715
 
    handshake = _library.gnutls_handshake
 
716
 
    handshake.argtypes = [session_t]
 
717
 
    handshake.restype = _error_code
 
718
 
    handshake.errcheck = _retry_on_error
 
720
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
721
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
722
 
    transport_set_ptr.restype = None
 
724
 
    bye = _library.gnutls_bye
 
725
 
    bye.argtypes = [session_t, close_request_t]
 
726
 
    bye.restype = _error_code
 
727
 
    bye.errcheck = _retry_on_error
 
729
 
    check_version = _library.gnutls_check_version
 
730
 
    check_version.argtypes = [ctypes.c_char_p]
 
731
 
    check_version.restype = ctypes.c_char_p
 
733
 
    # All the function declarations below are from gnutls/openpgp.h
 
735
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
736
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
737
 
    openpgp_crt_init.restype = _error_code
 
739
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
740
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
741
 
                                   ctypes.POINTER(datum_t),
 
743
 
    openpgp_crt_import.restype = _error_code
 
745
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
746
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
747
 
                                        ctypes.POINTER(ctypes.c_uint)]
 
748
 
    openpgp_crt_verify_self.restype = _error_code
 
750
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
751
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
752
 
    openpgp_crt_deinit.restype = None
 
754
 
    openpgp_crt_get_fingerprint = (
 
755
 
        _library.gnutls_openpgp_crt_get_fingerprint)
 
756
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
760
 
    openpgp_crt_get_fingerprint.restype = _error_code
 
762
 
    # Remove non-public functions
 
763
 
    del _error_code, _retry_on_error
 
764
 
# Create the global "gnutls" object, simulating a module
 
768
 
def call_pipe(connection,       # : multiprocessing.Connection
 
769
 
              func, *args, **kwargs):
 
770
 
    """This function is meant to be called by multiprocessing.Process
 
772
 
    This function runs func(*args, **kwargs), and writes the resulting
 
773
 
    return value on the provided multiprocessing.Connection.
 
775
 
    connection.send(func(*args, **kwargs))
 
 
382
def timedelta_to_milliseconds(td):
 
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
 
385
            + (td.seconds * 1000)
 
 
386
            + (td.microseconds // 1000))
 
779
388
class Client(object):
 
780
389
    """A representation of a client host served by this server.
 
783
392
    approved:   bool(); 'None' if not yet approved/disapproved
 
784
393
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
806
415
    last_checked_ok: datetime.datetime(); (UTC) or None
 
807
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
808
417
                         status of last checker. -1 reflects crashed
 
809
 
                         checker, -2 means no checker completed yet.
 
810
 
    last_checker_signal: The signal which killed the last checker, if
 
811
 
                         last_checker_status is -1
 
812
419
    last_enabled: datetime.datetime(); (UTC) or None
 
813
420
    name:       string; from the config file, used in log messages and
 
814
421
                        D-Bus identifiers
 
815
422
    secret:     bytestring; sent verbatim (over TLS) to client
 
816
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
817
424
                                      until this client is disabled
 
818
 
    extended_timeout:   extra long timeout when secret has been sent
 
 
425
    extended_timeout:   extra long timeout when password has been sent
 
819
426
    runtime_expansions: Allowed attributes for runtime expansion.
 
820
427
    expires:    datetime.datetime(); time (UTC) when a client will be
 
821
428
                disabled, or None
 
822
 
    server_settings: The server_settings dict from main()
 
825
431
    runtime_expansions = ("approval_delay", "approval_duration",
 
826
 
                          "created", "enabled", "expires",
 
827
 
                          "fingerprint", "host", "interval",
 
828
 
                          "last_approval_request", "last_checked_ok",
 
 
432
                          "created", "enabled", "fingerprint",
 
 
433
                          "host", "interval", "last_checked_ok",
 
829
434
                          "last_enabled", "name", "timeout")
 
832
 
        "extended_timeout": "PT15M",
 
834
 
        "checker": "fping -q -- %%(host)s",
 
836
 
        "approval_delay": "PT0S",
 
837
 
        "approval_duration": "PT1S",
 
838
 
        "approved_by_default": "True",
 
 
435
    client_defaults = { "timeout": "5m",
 
 
436
                        "extended_timeout": "15m",
 
 
438
                        "checker": "fping -q -- %%(host)s",
 
 
440
                        "approval_delay": "0s",
 
 
441
                        "approval_duration": "1s",
 
 
442
                        "approved_by_default": "True",
 
 
446
    def timeout_milliseconds(self):
 
 
447
        "Return the 'timeout' attribute in milliseconds"
 
 
448
        return timedelta_to_milliseconds(self.timeout)
 
 
450
    def extended_timeout_milliseconds(self):
 
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
 
 
454
    def interval_milliseconds(self):
 
 
455
        "Return the 'interval' attribute in milliseconds"
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
 
458
    def approval_delay_milliseconds(self):
 
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
843
462
    def config_parser(config):
 
 
923
541
        self.current_checker_command = None
 
924
542
        self.approved = None
 
925
543
        self.approvals_pending = 0
 
926
 
        self.changedstate = multiprocessing_manager.Condition(
 
927
 
            multiprocessing_manager.Lock())
 
928
 
        self.client_structure = [attr
 
929
 
                                 for attr in self.__dict__.keys()
 
 
544
        self.changedstate = (multiprocessing_manager
 
 
545
                             .Condition(multiprocessing_manager
 
 
547
        self.client_structure = [attr for attr in
 
 
548
                                 self.__dict__.iterkeys()
 
930
549
                                 if not attr.startswith("_")]
 
931
550
        self.client_structure.append("client_structure")
 
933
 
        for name, t in inspect.getmembers(
 
934
 
                type(self), lambda obj: isinstance(obj, property)):
 
 
552
        for name, t in inspect.getmembers(type(self),
 
935
556
            if not name.startswith("_"):
 
936
557
                self.client_structure.append(name)
 
938
559
    # Send notice to process children that client state has changed
 
939
560
    def send_changedstate(self):
 
940
561
        with self.changedstate:
 
941
562
            self.changedstate.notify_all()
 
943
564
    def enable(self):
 
944
565
        """Start this client's checker and timeout hooks"""
 
945
566
        if getattr(self, "enabled", False):
 
946
567
            # Already enabled
 
 
569
        self.send_changedstate()
 
948
570
        self.expires = datetime.datetime.utcnow() + self.timeout
 
949
571
        self.enabled = True
 
950
572
        self.last_enabled = datetime.datetime.utcnow()
 
951
573
        self.init_checker()
 
952
 
        self.send_changedstate()
 
954
575
    def disable(self, quiet=True):
 
955
576
        """Disable this client."""
 
956
577
        if not getattr(self, "enabled", False):
 
 
580
            self.send_changedstate()
 
959
582
            logger.info("Disabling client %s", self.name)
 
960
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
961
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
583
        if getattr(self, "disable_initiator_tag", False):
 
 
584
            gobject.source_remove(self.disable_initiator_tag)
 
962
585
            self.disable_initiator_tag = None
 
963
586
        self.expires = None
 
964
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
965
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
587
        if getattr(self, "checker_initiator_tag", False):
 
 
588
            gobject.source_remove(self.checker_initiator_tag)
 
966
589
            self.checker_initiator_tag = None
 
967
590
        self.stop_checker()
 
968
591
        self.enabled = False
 
970
 
            self.send_changedstate()
 
971
 
        # Do not run this again if called by a GLib.timeout_add
 
 
592
        # Do not run this again if called by a gobject.timeout_add
 
974
595
    def __del__(self):
 
977
598
    def init_checker(self):
 
978
599
        # Schedule a new checker to be started an 'interval' from now,
 
979
600
        # and every interval from then on.
 
980
 
        if self.checker_initiator_tag is not None:
 
981
 
            GLib.source_remove(self.checker_initiator_tag)
 
982
 
        self.checker_initiator_tag = GLib.timeout_add(
 
983
 
            int(self.interval.total_seconds() * 1000),
 
 
601
        self.checker_initiator_tag = (gobject.timeout_add
 
 
602
                                      (self.interval_milliseconds(),
 
985
604
        # Schedule a disable() when 'timeout' has passed
 
986
 
        if self.disable_initiator_tag is not None:
 
987
 
            GLib.source_remove(self.disable_initiator_tag)
 
988
 
        self.disable_initiator_tag = GLib.timeout_add(
 
989
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
605
        self.disable_initiator_tag = (gobject.timeout_add
 
 
606
                                   (self.timeout_milliseconds(),
 
990
608
        # Also start a new checker *right now*.
 
991
609
        self.start_checker()
 
993
 
    def checker_callback(self, source, condition, connection,
 
 
611
    def checker_callback(self, pid, condition, command):
 
995
612
        """The checker has completed, so take appropriate actions."""
 
996
613
        self.checker_callback_tag = None
 
997
614
        self.checker = None
 
998
 
        # Read return code from connection (see call_pipe)
 
999
 
        returncode = connection.recv()
 
1003
 
            self.last_checker_status = returncode
 
1004
 
            self.last_checker_signal = None
 
 
615
        if os.WIFEXITED(condition):
 
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
1005
617
            if self.last_checker_status == 0:
 
1006
618
                logger.info("Checker for %(name)s succeeded",
 
1008
620
                self.checked_ok()
 
1010
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
622
                logger.info("Checker for %(name)s failed",
 
1012
625
            self.last_checker_status = -1
 
1013
 
            self.last_checker_signal = -returncode
 
1014
626
            logger.warning("Checker for %(name)s crashed?",
 
1018
 
    def checked_ok(self):
 
1019
 
        """Assert that the client has been seen, alive and well."""
 
1020
 
        self.last_checked_ok = datetime.datetime.utcnow()
 
1021
 
        self.last_checker_status = 0
 
1022
 
        self.last_checker_signal = None
 
1025
 
    def bump_timeout(self, timeout=None):
 
1026
 
        """Bump up the timeout for this client."""
 
 
629
    def checked_ok(self, timeout=None):
 
 
630
        """Bump up the timeout for this client.
 
 
632
        This should only be called when the client has been seen,
 
1027
635
        if timeout is None:
 
1028
636
            timeout = self.timeout
 
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
 
1029
638
        if self.disable_initiator_tag is not None:
 
1030
 
            GLib.source_remove(self.disable_initiator_tag)
 
1031
 
            self.disable_initiator_tag = None
 
 
639
            gobject.source_remove(self.disable_initiator_tag)
 
1032
640
        if getattr(self, "enabled", False):
 
1033
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1034
 
                int(timeout.total_seconds() * 1000), self.disable)
 
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
 
642
                                          (timedelta_to_milliseconds
 
 
643
                                           (timeout), self.disable))
 
1035
644
            self.expires = datetime.datetime.utcnow() + timeout
 
1037
646
    def need_approval(self):
 
1038
647
        self.last_approval_request = datetime.datetime.utcnow()
 
1040
649
    def start_checker(self):
 
1041
650
        """Start a new checker subprocess if one is not running.
 
1043
652
        If a checker already exists, leave it running and do
 
1045
654
        # The reason for not killing a running checker is that if we
 
1046
 
        # did that, and if a checker (for some reason) started running
 
1047
 
        # slowly and taking more than 'interval' time, then the client
 
1048
 
        # would inevitably timeout, since no checker would get a
 
1049
 
        # chance to run to completion.  If we instead leave running
 
 
655
        # did that, then if a checker (for some reason) started
 
 
656
        # running slowly and taking more than 'interval' time, the
 
 
657
        # client would inevitably timeout, since no checker would get
 
 
658
        # a chance to run to completion.  If we instead leave running
 
1050
659
        # checkers alone, the checker would have to take more time
 
1051
660
        # than 'timeout' for the client to be disabled, which is as it
 
1054
 
        if self.checker is not None and not self.checker.is_alive():
 
1055
 
            logger.warning("Checker was not alive; joining")
 
 
663
        # If a checker exists, make sure it is not a zombie
 
 
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
666
        except (AttributeError, OSError) as error:
 
 
667
            if (isinstance(error, OSError)
 
 
668
                and error.errno != errno.ECHILD):
 
 
672
                logger.warning("Checker was a zombie")
 
 
673
                gobject.source_remove(self.checker_callback_tag)
 
 
674
                self.checker_callback(pid, status,
 
 
675
                                      self.current_checker_command)
 
1058
676
        # Start a new checker if needed
 
1059
677
        if self.checker is None:
 
1060
 
            # Escape attributes for the shell
 
1062
 
                attr: re.escape(str(getattr(self, attr)))
 
1063
 
                for attr in self.runtime_expansions}
 
1065
 
                command = self.checker_command % escaped_attrs
 
1066
 
            except TypeError as error:
 
1067
 
                logger.error('Could not format string "%s"',
 
1068
 
                             self.checker_command,
 
1070
 
                return True     # Try again later
 
 
679
                # In case checker_command has exactly one % operator
 
 
680
                command = self.checker_command % self.host
 
 
682
                # Escape attributes for the shell
 
 
683
                escaped_attrs = dict(
 
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
 
689
                    self.runtime_expansions)
 
 
692
                    command = self.checker_command % escaped_attrs
 
 
693
                except TypeError as error:
 
 
694
                    logger.error('Could not format string "%s":'
 
 
695
                                 ' %s', self.checker_command, error)
 
 
696
                    return True # Try again later
 
1071
697
            self.current_checker_command = command
 
1072
 
            logger.info("Starting checker %r for %s", command,
 
1074
 
            # We don't need to redirect stdout and stderr, since
 
1075
 
            # in normal mode, that is already done by daemon(),
 
1076
 
            # and in debug mode we don't want to.  (Stdin is
 
1077
 
            # always replaced by /dev/null.)
 
1078
 
            # The exception is when not debugging but nevertheless
 
1079
 
            # running in the foreground; use the previously
 
1081
 
            popen_args = {"close_fds": True,
 
1084
 
            if (not self.server_settings["debug"]
 
1085
 
                and self.server_settings["foreground"]):
 
1086
 
                popen_args.update({"stdout": wnull,
 
1088
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1089
 
            self.checker = multiprocessing.Process(
 
1091
 
                args=(pipe[1], subprocess.call, command),
 
1093
 
            self.checker.start()
 
1094
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1095
 
                pipe[0].fileno(), GLib.IO_IN,
 
1096
 
                self.checker_callback, pipe[0], command)
 
1097
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
699
                logger.info("Starting checker %r for %s",
 
 
701
                # We don't need to redirect stdout and stderr, since
 
 
702
                # in normal mode, that is already done by daemon(),
 
 
703
                # and in debug mode we don't want to.  (Stdin is
 
 
704
                # always replaced by /dev/null.)
 
 
705
                self.checker = subprocess.Popen(command,
 
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
 
710
                                              self.checker_callback,
 
 
712
                # The checker may have completed before the gobject
 
 
713
                # watch was added.  Check for this.
 
 
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
 
717
                    self.checker_callback(pid, status, command)
 
 
718
            except OSError as error:
 
 
719
                logger.error("Failed to start subprocess: %s",
 
 
721
        # Re-run this periodically if run by gobject.timeout_add
 
1100
724
    def stop_checker(self):
 
1101
725
        """Force the checker process, if any, to stop."""
 
1102
726
        if self.checker_callback_tag:
 
1103
 
            GLib.source_remove(self.checker_callback_tag)
 
 
727
            gobject.source_remove(self.checker_callback_tag)
 
1104
728
            self.checker_callback_tag = None
 
1105
729
        if getattr(self, "checker", None) is None:
 
1107
731
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1108
 
        self.checker.terminate()
 
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
 
 
735
            #if self.checker.poll() is None:
 
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
 
737
        except OSError as error:
 
 
738
            if error.errno != errno.ESRCH: # No such process
 
1109
740
        self.checker = None
 
1112
 
def dbus_service_property(dbus_interface,
 
 
743
def dbus_service_property(dbus_interface, signature="v",
 
 
744
                          access="readwrite", byte_arrays=False):
 
1116
745
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1117
746
    become properties on the D-Bus.
 
1119
748
    The decorated method will be called with no arguments by "Get"
 
1120
749
    and with one argument by "Set".
 
1122
751
    The parameters, where they are supported, are the same as
 
1123
752
    dbus.service.method, except there is only "signature", since the
 
1124
753
    type from Get() and the type sent to Set() is the same.
 
 
1207
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1208
 
    """A D-Bus object with annotations.
 
1210
 
    Classes inheriting from this can use the dbus_annotations
 
1211
 
    decorator to add annotations to methods or signals.
 
1215
 
    def _is_dbus_thing(thing):
 
1216
 
        """Returns a function testing if an attribute is a D-Bus thing
 
1218
 
        If called like _is_dbus_thing("method") it returns a function
 
1219
 
        suitable for use as predicate to inspect.getmembers().
 
1221
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1224
 
    def _get_all_dbus_things(self, thing):
 
1225
 
        """Returns a generator of (name, attribute) pairs
 
1227
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
1228
 
                 athing.__get__(self))
 
1229
 
                for cls in self.__class__.__mro__
 
1231
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1233
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1235
 
                         path_keyword='object_path',
 
1236
 
                         connection_keyword='connection')
 
1237
 
    def Introspect(self, object_path, connection):
 
1238
 
        """Overloading of standard D-Bus method.
 
1240
 
        Inserts annotation tags on methods and signals.
 
1242
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1245
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1247
 
            for if_tag in document.getElementsByTagName("interface"):
 
1248
 
                # Add annotation tags
 
1249
 
                for typ in ("method", "signal"):
 
1250
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1252
 
                        for name, prop in (self.
 
1253
 
                                           _get_all_dbus_things(typ)):
 
1254
 
                            if (name == tag.getAttribute("name")
 
1255
 
                                and prop._dbus_interface
 
1256
 
                                == if_tag.getAttribute("name")):
 
1257
 
                                annots.update(getattr(
 
1258
 
                                    prop, "_dbus_annotations", {}))
 
1259
 
                        for name, value in annots.items():
 
1260
 
                            ann_tag = document.createElement(
 
1262
 
                            ann_tag.setAttribute("name", name)
 
1263
 
                            ann_tag.setAttribute("value", value)
 
1264
 
                            tag.appendChild(ann_tag)
 
1265
 
                # Add interface annotation tags
 
1266
 
                for annotation, value in dict(
 
1267
 
                    itertools.chain.from_iterable(
 
1268
 
                        annotations().items()
 
1269
 
                        for name, annotations
 
1270
 
                        in self._get_all_dbus_things("interface")
 
1271
 
                        if name == if_tag.getAttribute("name")
 
1273
 
                    ann_tag = document.createElement("annotation")
 
1274
 
                    ann_tag.setAttribute("name", annotation)
 
1275
 
                    ann_tag.setAttribute("value", value)
 
1276
 
                    if_tag.appendChild(ann_tag)
 
1277
 
                # Fix argument name for the Introspect method itself
 
1278
 
                if (if_tag.getAttribute("name")
 
1279
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1280
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1281
 
                        if cn.getAttribute("name") == "Introspect":
 
1282
 
                            for arg in cn.getElementsByTagName("arg"):
 
1283
 
                                if (arg.getAttribute("direction")
 
1285
 
                                    arg.setAttribute("name",
 
1287
 
            xmlstring = document.toxml("utf-8")
 
1289
 
        except (AttributeError, xml.dom.DOMException,
 
1290
 
                xml.parsers.expat.ExpatError) as error:
 
1291
 
            logger.error("Failed to override Introspection method",
 
1296
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
792
class DBusObjectWithProperties(dbus.service.Object):
 
1297
793
    """A D-Bus object with properties.
 
1299
795
    Classes inheriting from this can use the dbus_service_property
 
1300
796
    decorator to expose methods as D-Bus properties.  It exposes the
 
1301
797
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
801
    def _is_dbus_property(obj):
 
 
802
        return getattr(obj, "_dbus_is_property", False)
 
 
804
    def _get_all_dbus_properties(self):
 
 
805
        """Returns a generator of (name, attribute) pairs
 
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
 
808
                for cls in self.__class__.__mro__
 
 
810
                inspect.getmembers(cls, self._is_dbus_property))
 
1304
812
    def _get_dbus_property(self, interface_name, property_name):
 
1305
813
        """Returns a bound method if one exists which is a D-Bus
 
1306
814
        property with the specified name and interface.
 
1308
 
        for cls in self.__class__.__mro__:
 
1309
 
            for name, value in inspect.getmembers(
 
1310
 
                    cls, self._is_dbus_thing("property")):
 
 
816
        for cls in  self.__class__.__mro__:
 
 
817
            for name, value in (inspect.getmembers
 
 
818
                                (cls, self._is_dbus_property)):
 
1311
819
                if (value._dbus_name == property_name
 
1312
820
                    and value._dbus_interface == interface_name):
 
1313
821
                    return value.__get__(self)
 
1315
823
        # No such property
 
1316
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1317
 
            self.dbus_object_path, interface_name, property_name))
 
1320
 
    def _get_all_interface_names(cls):
 
1321
 
        """Get a sequence of all interfaces supported by an object"""
 
1322
 
        return (name for name in set(getattr(getattr(x, attr),
 
1323
 
                                             "_dbus_interface", None)
 
1324
 
                                     for x in (inspect.getmro(cls))
 
1326
 
                if name is not None)
 
1328
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
825
                                   + interface_name + "."
 
 
828
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1330
829
                         out_signature="v")
 
1331
830
    def Get(self, interface_name, property_name):
 
1332
831
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1379
875
            if not hasattr(value, "variant_level"):
 
1380
876
                properties[name] = value
 
1382
 
            properties[name] = type(value)(
 
1383
 
                value, variant_level=value.variant_level + 1)
 
 
878
            properties[name] = type(value)(value, variant_level=
 
 
879
                                           value.variant_level+1)
 
1384
880
        return dbus.Dictionary(properties, signature="sv")
 
1386
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
1387
 
    def PropertiesChanged(self, interface_name, changed_properties,
 
1388
 
                          invalidated_properties):
 
1389
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
1394
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1395
883
                         out_signature="s",
 
1396
884
                         path_keyword='object_path',
 
1397
885
                         connection_keyword='connection')
 
1398
886
    def Introspect(self, object_path, connection):
 
1399
 
        """Overloading of standard D-Bus method.
 
1401
 
        Inserts property tags and interface annotation tags.
 
 
887
        """Standard D-Bus method, overloaded to insert property tags.
 
1403
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1407
892
            document = xml.dom.minidom.parseString(xmlstring)
 
1409
893
            def make_tag(document, name, prop):
 
1410
894
                e = document.createElement("property")
 
1411
895
                e.setAttribute("name", name)
 
1412
896
                e.setAttribute("type", prop._dbus_signature)
 
1413
897
                e.setAttribute("access", prop._dbus_access)
 
1416
899
            for if_tag in document.getElementsByTagName("interface"):
 
1418
900
                for tag in (make_tag(document, name, prop)
 
1420
 
                            in self._get_all_dbus_things("property")
 
 
902
                            in self._get_all_dbus_properties()
 
1421
903
                            if prop._dbus_interface
 
1422
904
                            == if_tag.getAttribute("name")):
 
1423
905
                    if_tag.appendChild(tag)
 
1424
 
                # Add annotation tags for properties
 
1425
 
                for tag in if_tag.getElementsByTagName("property"):
 
1427
 
                    for name, prop in self._get_all_dbus_things(
 
1429
 
                        if (name == tag.getAttribute("name")
 
1430
 
                            and prop._dbus_interface
 
1431
 
                            == if_tag.getAttribute("name")):
 
1432
 
                            annots.update(getattr(
 
1433
 
                                prop, "_dbus_annotations", {}))
 
1434
 
                    for name, value in annots.items():
 
1435
 
                        ann_tag = document.createElement(
 
1437
 
                        ann_tag.setAttribute("name", name)
 
1438
 
                        ann_tag.setAttribute("value", value)
 
1439
 
                        tag.appendChild(ann_tag)
 
1440
906
                # Add the names to the return values for the
 
1441
907
                # "org.freedesktop.DBus.Properties" methods
 
1442
908
                if (if_tag.getAttribute("name")
 
 
1457
923
        except (AttributeError, xml.dom.DOMException,
 
1458
924
                xml.parsers.expat.ExpatError) as error:
 
1459
925
            logger.error("Failed to override Introspection method",
 
1465
 
    dbus.OBJECT_MANAGER_IFACE
 
1466
 
except AttributeError:
 
1467
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1470
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1471
 
    """A D-Bus object with an ObjectManager.
 
1473
 
    Classes inheriting from this exposes the standard
 
1474
 
    GetManagedObjects call and the InterfacesAdded and
 
1475
 
    InterfacesRemoved signals on the standard
 
1476
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1478
 
    Note: No signals are sent automatically; they must be sent
 
1481
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1482
 
                         out_signature="a{oa{sa{sv}}}")
 
1483
 
    def GetManagedObjects(self):
 
1484
 
        """This function must be overridden"""
 
1485
 
        raise NotImplementedError()
 
1487
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1488
 
                         signature="oa{sa{sv}}")
 
1489
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1492
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1493
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1496
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1498
 
                         path_keyword='object_path',
 
1499
 
                         connection_keyword='connection')
 
1500
 
    def Introspect(self, object_path, connection):
 
1501
 
        """Overloading of standard D-Bus method.
 
1503
 
        Override return argument name of GetManagedObjects to be
 
1504
 
        "objpath_interfaces_and_properties"
 
1506
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1510
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1512
 
            for if_tag in document.getElementsByTagName("interface"):
 
1513
 
                # Fix argument name for the GetManagedObjects method
 
1514
 
                if (if_tag.getAttribute("name")
 
1515
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1516
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1517
 
                        if (cn.getAttribute("name")
 
1518
 
                            == "GetManagedObjects"):
 
1519
 
                            for arg in cn.getElementsByTagName("arg"):
 
1520
 
                                if (arg.getAttribute("direction")
 
1524
 
                                        "objpath_interfaces"
 
1526
 
            xmlstring = document.toxml("utf-8")
 
1528
 
        except (AttributeError, xml.dom.DOMException,
 
1529
 
                xml.parsers.expat.ExpatError) as error:
 
1530
 
            logger.error("Failed to override Introspection method",
 
1535
 
def datetime_to_dbus(dt, variant_level=0):
 
 
930
def datetime_to_dbus (dt, variant_level=0):
 
1536
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1538
 
        return dbus.String("", variant_level=variant_level)
 
1539
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1542
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1543
 
    """A class decorator; applied to a subclass of
 
1544
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1545
 
    interface names according to the "alt_interface_names" mapping.
 
1548
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1549
 
                                    "net.example.AlternateInterface"})
 
1550
 
    class SampleDBusObject(dbus.service.Object):
 
1551
 
        @dbus.service.method("org.example.Interface")
 
1552
 
        def SampleDBusMethod():
 
1555
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1556
 
    reachable via two interfaces: "org.example.Interface" and
 
1557
 
    "net.example.AlternateInterface", the latter of which will have
 
1558
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1559
 
    "true", unless "deprecate" is passed with a False value.
 
1561
 
    This works for methods and signals, and also for D-Bus properties
 
1562
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1563
 
    dbus_interface_annotations decorator).
 
 
933
        return dbus.String("", variant_level = variant_level)
 
 
934
    return dbus.String(dt.isoformat(),
 
 
935
                       variant_level=variant_level)
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
 
941
    will add additional D-Bus attributes matching a certain pattern.
 
1567
 
        for orig_interface_name, alt_interface_name in (
 
1568
 
                alt_interface_names.items()):
 
1570
 
            interface_names = set()
 
1571
 
            # Go though all attributes of the class
 
1572
 
            for attrname, attribute in inspect.getmembers(cls):
 
 
943
    def __new__(mcs, name, bases, attr):
 
 
944
        # Go through all the base classes which could have D-Bus
 
 
945
        # methods, signals, or properties in them
 
 
946
        for base in (b for b in bases
 
 
947
                     if issubclass(b, dbus.service.Object)):
 
 
948
            # Go though all attributes of the base class
 
 
949
            for attrname, attribute in inspect.getmembers(base):
 
1573
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1574
951
                # with the wrong interface name
 
1575
952
                if (not hasattr(attribute, "_dbus_interface")
 
1576
 
                    or not attribute._dbus_interface.startswith(
 
1577
 
                        orig_interface_name)):
 
 
953
                    or not attribute._dbus_interface
 
 
954
                    .startswith("se.recompile.Mandos")):
 
1579
956
                # Create an alternate D-Bus interface name based on
 
1580
957
                # the current name
 
1581
 
                alt_interface = attribute._dbus_interface.replace(
 
1582
 
                    orig_interface_name, alt_interface_name)
 
1583
 
                interface_names.add(alt_interface)
 
 
958
                alt_interface = (attribute._dbus_interface
 
 
959
                                 .replace("se.recompile.Mandos",
 
 
960
                                          "se.bsnet.fukt.Mandos"))
 
1584
961
                # Is this a D-Bus signal?
 
1585
962
                if getattr(attribute, "_dbus_is_signal", False):
 
1586
 
                    # Extract the original non-method undecorated
 
1587
 
                    # function by black magic
 
1588
 
                    if sys.version_info.major == 2:
 
1589
 
                        nonmethod_func = (dict(
 
 
963
                    # Extract the original non-method function by
 
 
965
                    nonmethod_func = (dict(
 
1590
966
                            zip(attribute.func_code.co_freevars,
 
1591
 
                                attribute.__closure__))
 
1592
 
                                          ["func"].cell_contents)
 
1594
 
                        nonmethod_func = (dict(
 
1595
 
                            zip(attribute.__code__.co_freevars,
 
1596
 
                                attribute.__closure__))
 
1597
 
                                          ["func"].cell_contents)
 
 
967
                                attribute.__closure__))["func"]
 
1598
969
                    # Create a new, but exactly alike, function
 
1599
970
                    # object, and decorate it to be a new D-Bus signal
 
1600
971
                    # with the alternate D-Bus interface name
 
1601
 
                    new_function = copy_function(nonmethod_func)
 
1602
 
                    new_function = (dbus.service.signal(
 
1604
 
                        attribute._dbus_signature)(new_function))
 
1605
 
                    # Copy annotations, if any
 
1607
 
                        new_function._dbus_annotations = dict(
 
1608
 
                            attribute._dbus_annotations)
 
1609
 
                    except AttributeError:
 
 
972
                    new_function = (dbus.service.signal
 
 
974
                                     attribute._dbus_signature)
 
 
976
                                nonmethod_func.func_code,
 
 
977
                                nonmethod_func.func_globals,
 
 
978
                                nonmethod_func.func_name,
 
 
979
                                nonmethod_func.func_defaults,
 
 
980
                                nonmethod_func.func_closure)))
 
1612
981
                    # Define a creator of a function to call both the
 
1613
 
                    # original and alternate functions, so both the
 
1614
 
                    # original and alternate signals gets sent when
 
1615
 
                    # the function is called
 
 
982
                    # old and new functions, so both the old and new
 
 
983
                    # signals gets sent when the function is called
 
1616
984
                    def fixscope(func1, func2):
 
1617
985
                        """This function is a scope container to pass
 
1618
986
                        func1 and func2 to the "call_both" function
 
1619
987
                        outside of its arguments"""
 
1621
 
                        @functools.wraps(func2)
 
1622
988
                        def call_both(*args, **kwargs):
 
1623
989
                            """This function will emit two D-Bus
 
1624
990
                            signals by calling func1 and func2"""
 
1625
991
                            func1(*args, **kwargs)
 
1626
992
                            func2(*args, **kwargs)
 
1627
 
                        # Make wrapper function look like a D-Bus
 
1629
 
                        for name, attr in inspect.getmembers(func2):
 
1630
 
                            if name.startswith("_dbus_"):
 
1631
 
                                setattr(call_both, name, attr)
 
1633
993
                        return call_both
 
1634
994
                    # Create the "call_both" function and add it to
 
1636
 
                    attr[attrname] = fixscope(attribute, new_function)
 
 
996
                    attr[attrname] = fixscope(attribute,
 
1637
998
                # Is this a D-Bus method?
 
1638
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1639
1000
                    # Create a new, but exactly alike, function
 
1640
1001
                    # object.  Decorate it to be a new D-Bus method
 
1641
1002
                    # with the alternate D-Bus interface name.  Add it
 
1642
1003
                    # to the class.
 
1644
 
                        dbus.service.method(
 
1646
 
                            attribute._dbus_in_signature,
 
1647
 
                            attribute._dbus_out_signature)
 
1648
 
                        (copy_function(attribute)))
 
1649
 
                    # Copy annotations, if any
 
1651
 
                        attr[attrname]._dbus_annotations = dict(
 
1652
 
                            attribute._dbus_annotations)
 
1653
 
                    except AttributeError:
 
 
1004
                    attr[attrname] = (dbus.service.method
 
 
1006
                                       attribute._dbus_in_signature,
 
 
1007
                                       attribute._dbus_out_signature)
 
 
1009
                                       (attribute.func_code,
 
 
1010
                                        attribute.func_globals,
 
 
1011
                                        attribute.func_name,
 
 
1012
                                        attribute.func_defaults,
 
 
1013
                                        attribute.func_closure)))
 
1655
1014
                # Is this a D-Bus property?
 
1656
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1657
1016
                    # Create a new, but exactly alike, function
 
1658
1017
                    # object, and decorate it to be a new D-Bus
 
1659
1018
                    # property with the alternate D-Bus interface
 
1660
1019
                    # name.  Add it to the class.
 
1661
 
                    attr[attrname] = (dbus_service_property(
 
1662
 
                        alt_interface, attribute._dbus_signature,
 
1663
 
                        attribute._dbus_access,
 
1664
 
                        attribute._dbus_get_args_options
 
1666
 
                                      (copy_function(attribute)))
 
1667
 
                    # Copy annotations, if any
 
1669
 
                        attr[attrname]._dbus_annotations = dict(
 
1670
 
                            attribute._dbus_annotations)
 
1671
 
                    except AttributeError:
 
1673
 
                # Is this a D-Bus interface?
 
1674
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1675
 
                    # Create a new, but exactly alike, function
 
1676
 
                    # object.  Decorate it to be a new D-Bus interface
 
1677
 
                    # with the alternate D-Bus interface name.  Add it
 
1680
 
                        dbus_interface_annotations(alt_interface)
 
1681
 
                        (copy_function(attribute)))
 
1683
 
                # Deprecate all alternate interfaces
 
1684
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1685
 
                for interface_name in interface_names:
 
1687
 
                    @dbus_interface_annotations(interface_name)
 
1689
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1691
 
                    # Find an unused name
 
1692
 
                    for aname in (iname.format(i)
 
1693
 
                                  for i in itertools.count()):
 
1694
 
                        if aname not in attr:
 
1698
 
                # Replace the class with a new subclass of it with
 
1699
 
                # methods, signals, etc. as created above.
 
1700
 
                if sys.version_info.major == 2:
 
1701
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1704
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1711
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1712
 
                            "se.bsnet.fukt.Mandos"})
 
 
1020
                    attr[attrname] = (dbus_service_property
 
 
1022
                                       attribute._dbus_signature,
 
 
1023
                                       attribute._dbus_access,
 
 
1025
                                       ._dbus_get_args_options
 
 
1028
                                       (attribute.func_code,
 
 
1029
                                        attribute.func_globals,
 
 
1030
                                        attribute.func_name,
 
 
1031
                                        attribute.func_defaults,
 
 
1032
                                        attribute.func_closure)))
 
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1713
1036
class ClientDBus(Client, DBusObjectWithProperties):
 
1714
1037
    """A Client class using D-Bus
 
1717
1040
    dbus_object_path: dbus.ObjectPath
 
1718
1041
    bus: dbus.SystemBus()
 
1721
1044
    runtime_expansions = (Client.runtime_expansions
 
1722
 
                          + ("dbus_object_path", ))
 
1724
 
    _interface = "se.recompile.Mandos.Client"
 
 
1045
                          + ("dbus_object_path",))
 
1726
1047
    # dbus.service.Object doesn't use super(), so we can't either.
 
1728
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
1049
    def __init__(self, bus = None, *args, **kwargs):
 
1730
1051
        Client.__init__(self, *args, **kwargs)
 
 
1052
        self._approvals_pending = 0
 
 
1054
        self._approvals_pending = 0
 
1731
1055
        # Only now, when this client is initialized, can it show up on
 
1733
 
        client_object_name = str(self.name).translate(
 
 
1057
        client_object_name = unicode(self.name).translate(
 
1734
1058
            {ord("."): ord("_"),
 
1735
1059
             ord("-"): ord("_")})
 
1736
 
        self.dbus_object_path = dbus.ObjectPath(
 
1737
 
            "/clients/" + client_object_name)
 
 
1060
        self.dbus_object_path = (dbus.ObjectPath
 
 
1061
                                 ("/clients/" + client_object_name))
 
1738
1062
        DBusObjectWithProperties.__init__(self, self.bus,
 
1739
1063
                                          self.dbus_object_path)
 
1741
 
    def notifychangeproperty(transform_func, dbus_name,
 
1742
 
                             type_func=lambda x: x,
 
1744
 
                             invalidate_only=False,
 
1745
 
                             _interface=_interface):
 
 
1065
    def notifychangeproperty(transform_func,
 
 
1066
                             dbus_name, type_func=lambda x: x,
 
1746
1068
        """ Modify a variable so that it's a property which announces
 
1747
1069
        its changes to DBus.
 
1749
1071
        transform_fun: Function that takes a value and a variant_level
 
1750
1072
                       and transforms it to a D-Bus type.
 
1751
1073
        dbus_name: D-Bus name of the variable
 
 
1753
1075
                   to the D-Bus.  Default: no transform
 
1754
1076
        variant_level: D-Bus variant level.  Default: 1
 
1756
 
        attrname = "_{}".format(dbus_name)
 
 
1078
        attrname = "_{0}".format(dbus_name)
 
1758
1079
        def setter(self, value):
 
1759
1080
            if hasattr(self, "dbus_object_path"):
 
1760
1081
                if (not hasattr(self, attrname) or
 
1761
1082
                    type_func(getattr(self, attrname, None))
 
1762
1083
                    != type_func(value)):
 
1764
 
                        self.PropertiesChanged(
 
1765
 
                            _interface, dbus.Dictionary(),
 
1766
 
                            dbus.Array((dbus_name, )))
 
1768
 
                        dbus_value = transform_func(
 
1770
 
                            variant_level=variant_level)
 
1771
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1773
 
                        self.PropertiesChanged(
 
1775
 
                            dbus.Dictionary({dbus.String(dbus_name):
 
 
1084
                    dbus_value = transform_func(type_func(value),
 
 
1087
                    self.PropertyChanged(dbus.String(dbus_name),
 
1778
1089
            setattr(self, attrname, value)
 
1780
1091
        return property(lambda self: getattr(self, attrname), setter)
 
1782
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1783
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1784
1096
                                             "ApprovalPending",
 
1786
1098
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1787
1099
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1789
 
    checker = notifychangeproperty(
 
1790
 
        dbus.Boolean, "CheckerRunning",
 
1791
 
        type_func=lambda checker: checker is not None)
 
 
1101
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
 
1102
                                   type_func = lambda checker:
 
 
1103
                                       checker is not None)
 
1792
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1793
1105
                                           "LastCheckedOK")
 
1794
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1795
 
                                               "LastCheckerStatus")
 
1796
1106
    last_approval_request = notifychangeproperty(
 
1797
1107
        datetime_to_dbus, "LastApprovalRequest")
 
1798
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1799
1109
                                               "ApprovedByDefault")
 
1800
 
    approval_delay = notifychangeproperty(
 
1801
 
        dbus.UInt64, "ApprovalDelay",
 
1802
 
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
 
1113
                                          timedelta_to_milliseconds)
 
1803
1114
    approval_duration = notifychangeproperty(
 
1804
1115
        dbus.UInt64, "ApprovalDuration",
 
1805
 
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1116
        type_func = timedelta_to_milliseconds)
 
1806
1117
    host = notifychangeproperty(dbus.String, "Host")
 
1807
 
    timeout = notifychangeproperty(
 
1808
 
        dbus.UInt64, "Timeout",
 
1809
 
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
 
1120
                                   timedelta_to_milliseconds)
 
1810
1121
    extended_timeout = notifychangeproperty(
 
1811
1122
        dbus.UInt64, "ExtendedTimeout",
 
1812
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1813
 
    interval = notifychangeproperty(
 
1814
 
        dbus.UInt64, "Interval",
 
1815
 
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1123
        type_func = timedelta_to_milliseconds)
 
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
 
1127
                                    timedelta_to_milliseconds)
 
1816
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1817
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1818
 
                                  invalidate_only=True)
 
1820
1130
    del notifychangeproperty
 
1822
1132
    def __del__(self, *args, **kwargs):
 
1824
1134
            self.remove_from_connection()
 
 
1903
1214
        server to mandos-client
 
1907
1218
    # Rejected - signal
 
1908
1219
    @dbus.service.signal(_interface, signature="s")
 
1909
1220
    def Rejected(self, reason):
 
1913
1224
    # NeedApproval - signal
 
1914
1225
    @dbus.service.signal(_interface, signature="tb")
 
1915
1226
    def NeedApproval(self, timeout, default):
 
1917
1228
        return self.need_approval()
 
 
1230
    # NeRwequest - signal
 
 
1231
    @dbus.service.signal(_interface, signature="s")
 
 
1232
    def NewRequest(self, ip):
 
 
1234
        Is sent after a client request a password.
 
1921
1240
    # Approve - method
 
1922
1241
    @dbus.service.method(_interface, in_signature="b")
 
1923
1242
    def Approve(self, value):
 
1924
1243
        self.approve(value)
 
1926
1245
    # CheckedOK - method
 
1927
1246
    @dbus.service.method(_interface)
 
1928
1247
    def CheckedOK(self):
 
1929
1248
        self.checked_ok()
 
1931
1250
    # Enable - method
 
1932
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1933
1251
    @dbus.service.method(_interface)
 
1934
1252
    def Enable(self):
 
1938
1256
    # StartChecker - method
 
1939
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1940
1257
    @dbus.service.method(_interface)
 
1941
1258
    def StartChecker(self):
 
1943
1260
        self.start_checker()
 
1945
1262
    # Disable - method
 
1946
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1947
1263
    @dbus.service.method(_interface)
 
1948
1264
    def Disable(self):
 
1952
1268
    # StopChecker - method
 
1953
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1954
1269
    @dbus.service.method(_interface)
 
1955
1270
    def StopChecker(self):
 
1956
1271
        self.stop_checker()
 
1960
1275
    # ApprovalPending - property
 
1961
1276
    @dbus_service_property(_interface, signature="b", access="read")
 
1962
1277
    def ApprovalPending_dbus_property(self):
 
1963
1278
        return dbus.Boolean(bool(self.approvals_pending))
 
1965
1280
    # ApprovedByDefault - property
 
1966
 
    @dbus_service_property(_interface,
 
 
1281
    @dbus_service_property(_interface, signature="b",
 
1968
1282
                           access="readwrite")
 
1969
1283
    def ApprovedByDefault_dbus_property(self, value=None):
 
1970
1284
        if value is None:       # get
 
1971
1285
            return dbus.Boolean(self.approved_by_default)
 
1972
1286
        self.approved_by_default = bool(value)
 
1974
1288
    # ApprovalDelay - property
 
1975
 
    @dbus_service_property(_interface,
 
 
1289
    @dbus_service_property(_interface, signature="t",
 
1977
1290
                           access="readwrite")
 
1978
1291
    def ApprovalDelay_dbus_property(self, value=None):
 
1979
1292
        if value is None:       # get
 
1980
 
            return dbus.UInt64(self.approval_delay.total_seconds()
 
 
1293
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1982
1294
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1984
1296
    # ApprovalDuration - property
 
1985
 
    @dbus_service_property(_interface,
 
 
1297
    @dbus_service_property(_interface, signature="t",
 
1987
1298
                           access="readwrite")
 
1988
1299
    def ApprovalDuration_dbus_property(self, value=None):
 
1989
1300
        if value is None:       # get
 
1990
 
            return dbus.UInt64(self.approval_duration.total_seconds()
 
 
1301
            return dbus.UInt64(timedelta_to_milliseconds(
 
 
1302
                    self.approval_duration))
 
1992
1303
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1994
1305
    # Name - property
 
1996
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1997
1306
    @dbus_service_property(_interface, signature="s", access="read")
 
1998
1307
    def Name_dbus_property(self):
 
1999
1308
        return dbus.String(self.name)
 
2001
1310
    # Fingerprint - property
 
2003
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2004
1311
    @dbus_service_property(_interface, signature="s", access="read")
 
2005
1312
    def Fingerprint_dbus_property(self):
 
2006
1313
        return dbus.String(self.fingerprint)
 
2008
1315
    # Host - property
 
2009
 
    @dbus_service_property(_interface,
 
 
1316
    @dbus_service_property(_interface, signature="s",
 
2011
1317
                           access="readwrite")
 
2012
1318
    def Host_dbus_property(self, value=None):
 
2013
1319
        if value is None:       # get
 
2014
1320
            return dbus.String(self.host)
 
2015
 
        self.host = str(value)
 
 
1321
        self.host = unicode(value)
 
2017
1323
    # Created - property
 
2019
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2020
1324
    @dbus_service_property(_interface, signature="s", access="read")
 
2021
1325
    def Created_dbus_property(self):
 
2022
1326
        return datetime_to_dbus(self.created)
 
2024
1328
    # LastEnabled - property
 
2025
1329
    @dbus_service_property(_interface, signature="s", access="read")
 
2026
1330
    def LastEnabled_dbus_property(self):
 
2027
1331
        return datetime_to_dbus(self.last_enabled)
 
2029
1333
    # Enabled - property
 
2030
 
    @dbus_service_property(_interface,
 
 
1334
    @dbus_service_property(_interface, signature="b",
 
2032
1335
                           access="readwrite")
 
2033
1336
    def Enabled_dbus_property(self, value=None):
 
2034
1337
        if value is None:       # get
 
 
2041
1344
    # LastCheckedOK - property
 
2042
 
    @dbus_service_property(_interface,
 
 
1345
    @dbus_service_property(_interface, signature="s",
 
2044
1346
                           access="readwrite")
 
2045
1347
    def LastCheckedOK_dbus_property(self, value=None):
 
2046
1348
        if value is not None:
 
2047
1349
            self.checked_ok()
 
2049
1351
        return datetime_to_dbus(self.last_checked_ok)
 
2051
 
    # LastCheckerStatus - property
 
2052
 
    @dbus_service_property(_interface, signature="n", access="read")
 
2053
 
    def LastCheckerStatus_dbus_property(self):
 
2054
 
        return dbus.Int16(self.last_checker_status)
 
2056
1353
    # Expires - property
 
2057
1354
    @dbus_service_property(_interface, signature="s", access="read")
 
2058
1355
    def Expires_dbus_property(self):
 
2059
1356
        return datetime_to_dbus(self.expires)
 
2061
1358
    # LastApprovalRequest - property
 
2062
1359
    @dbus_service_property(_interface, signature="s", access="read")
 
2063
1360
    def LastApprovalRequest_dbus_property(self):
 
2064
1361
        return datetime_to_dbus(self.last_approval_request)
 
2066
1363
    # Timeout - property
 
2067
 
    @dbus_service_property(_interface,
 
 
1364
    @dbus_service_property(_interface, signature="t",
 
2069
1365
                           access="readwrite")
 
2070
1366
    def Timeout_dbus_property(self, value=None):
 
2071
1367
        if value is None:       # get
 
2072
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
2073
 
        old_timeout = self.timeout
 
 
1368
            return dbus.UInt64(self.timeout_milliseconds())
 
2074
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
2075
 
        # Reschedule disabling
 
 
1370
        # Reschedule timeout
 
2076
1371
        if self.enabled:
 
2077
1372
            now = datetime.datetime.utcnow()
 
2078
 
            self.expires += self.timeout - old_timeout
 
2079
 
            if self.expires <= now:
 
 
1373
            time_to_die = timedelta_to_milliseconds(
 
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
 
1375
            if time_to_die <= 0:
 
2080
1376
                # The timeout has passed
 
 
1379
                self.expires = (now +
 
 
1380
                                datetime.timedelta(milliseconds =
 
2083
1382
                if (getattr(self, "disable_initiator_tag", None)
 
2086
 
                GLib.source_remove(self.disable_initiator_tag)
 
2087
 
                self.disable_initiator_tag = GLib.timeout_add(
 
2088
 
                    int((self.expires - now).total_seconds() * 1000),
 
 
1385
                gobject.source_remove(self.disable_initiator_tag)
 
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
2091
1390
    # ExtendedTimeout - property
 
2092
 
    @dbus_service_property(_interface,
 
 
1391
    @dbus_service_property(_interface, signature="t",
 
2094
1392
                           access="readwrite")
 
2095
1393
    def ExtendedTimeout_dbus_property(self, value=None):
 
2096
1394
        if value is None:       # get
 
2097
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
 
1395
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
2099
1396
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
2101
1398
    # Interval - property
 
2102
 
    @dbus_service_property(_interface,
 
 
1399
    @dbus_service_property(_interface, signature="t",
 
2104
1400
                           access="readwrite")
 
2105
1401
    def Interval_dbus_property(self, value=None):
 
2106
1402
        if value is None:       # get
 
2107
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
 
1403
            return dbus.UInt64(self.interval_milliseconds())
 
2108
1404
        self.interval = datetime.timedelta(0, 0, 0, value)
 
2109
1405
        if getattr(self, "checker_initiator_tag", None) is None:
 
2111
1407
        if self.enabled:
 
2112
1408
            # Reschedule checker run
 
2113
 
            GLib.source_remove(self.checker_initiator_tag)
 
2114
 
            self.checker_initiator_tag = GLib.timeout_add(
 
2115
 
                value, self.start_checker)
 
2116
 
            self.start_checker()  # Start one now, too
 
 
1409
            gobject.source_remove(self.checker_initiator_tag)
 
 
1410
            self.checker_initiator_tag = (gobject.timeout_add
 
 
1411
                                          (value, self.start_checker))
 
 
1412
            self.start_checker()    # Start one now, too
 
2118
1414
    # Checker - property
 
2119
 
    @dbus_service_property(_interface,
 
 
1415
    @dbus_service_property(_interface, signature="s",
 
2121
1416
                           access="readwrite")
 
2122
1417
    def Checker_dbus_property(self, value=None):
 
2123
1418
        if value is None:       # get
 
2124
1419
            return dbus.String(self.checker_command)
 
2125
 
        self.checker_command = str(value)
 
 
1420
        self.checker_command = unicode(value)
 
2127
1422
    # CheckerRunning - property
 
2128
 
    @dbus_service_property(_interface,
 
 
1423
    @dbus_service_property(_interface, signature="b",
 
2130
1424
                           access="readwrite")
 
2131
1425
    def CheckerRunning_dbus_property(self, value=None):
 
2132
1426
        if value is None:       # get
 
 
2173
1459
        if data[0] == 'data':
 
2175
1461
        if data[0] == 'function':
 
2177
1462
            def func(*args, **kwargs):
 
2178
1463
                self._pipe.send(('funcall', name, args, kwargs))
 
2179
1464
                return self._pipe.recv()[1]
 
2183
1467
    def __setattr__(self, name, value):
 
2184
1468
        if name == '_pipe':
 
2185
1469
            return super(ProxyClient, self).__setattr__(name, value)
 
2186
1470
        self._pipe.send(('setattr', name, value))
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
2189
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2190
1478
    """A class to handle client connections.
 
2192
1480
    Instantiated once for each connection to handle it.
 
2193
1481
    Note: This will run in its own forked process."""
 
2195
1483
    def handle(self):
 
2196
1484
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2197
1485
            logger.info("TCP connection from: %s",
 
2198
 
                        str(self.client_address))
 
 
1486
                        unicode(self.client_address))
 
2199
1487
            logger.debug("Pipe FD: %d",
 
2200
1488
                         self.server.child_pipe.fileno())
 
2202
 
            session = gnutls.ClientSession(self.request)
 
2204
 
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2205
 
            #                       "+AES-256-CBC", "+SHA1",
 
2206
 
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
1490
            session = (gnutls.connection
 
 
1491
                       .ClientSession(self.request,
 
 
1493
                                      .X509Credentials()))
 
 
1495
            # Note: gnutls.connection.X509Credentials is really a
 
 
1496
            # generic GnuTLS certificate credentials object so long as
 
 
1497
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1498
            # here despite using OpenPGP certificates.
 
 
1500
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
1501
            #                      "+AES-256-CBC", "+SHA1",
 
 
1502
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
2208
1504
            # Use a fallback default, since this MUST be set.
 
2209
1505
            priority = self.server.gnutls_priority
 
2210
1506
            if priority is None:
 
2211
1507
                priority = "NORMAL"
 
2212
 
            gnutls.priority_set_direct(session._c_object,
 
2213
 
                                       priority.encode("utf-8"),
 
 
1508
            (gnutls.library.functions
 
 
1509
             .gnutls_priority_set_direct(session._c_object,
 
2216
1512
            # Start communication using the Mandos protocol
 
2217
1513
            # Get protocol number
 
2218
1514
            line = self.request.makefile().readline()
 
2219
1515
            logger.debug("Protocol version: %r", line)
 
2221
1517
                if int(line.strip().split()[0]) > 1:
 
2222
 
                    raise RuntimeError(line)
 
2223
1519
            except (ValueError, IndexError, RuntimeError) as error:
 
2224
1520
                logger.error("Unknown protocol version: %s", error)
 
2227
1523
            # Start GnuTLS connection
 
2229
1525
                session.handshake()
 
2230
 
            except gnutls.Error as error:
 
 
1526
            except gnutls.errors.GNUTLSError as error:
 
2231
1527
                logger.warning("Handshake failed: %s", error)
 
2232
1528
                # Do not run session.bye() here: the session is not
 
2233
1529
                # established.  Just abandon the request.
 
2235
1531
            logger.debug("Handshake succeeded")
 
2237
1533
            approval_required = False
 
2240
 
                    fpr = self.fingerprint(
 
2241
 
                        self.peer_certificate(session))
 
2242
 
                except (TypeError, gnutls.Error) as error:
 
 
1536
                    fpr = self.fingerprint(self.peer_certificate
 
 
1539
                        gnutls.errors.GNUTLSError) as error:
 
2243
1540
                    logger.warning("Bad certificate: %s", error)
 
2245
1542
                logger.debug("Fingerprint: %s", fpr)
 
2248
1545
                    client = ProxyClient(child_pipe, fpr,
 
2249
1546
                                         self.client_address)
 
2250
1547
                except KeyError:
 
 
1550
                if self.server.use_dbus:
 
 
1552
                    client.NewRequest(str(self.client_address))
 
2253
1554
                if client.approval_delay:
 
2254
1555
                    delay = client.approval_delay
 
2255
1556
                    client.approvals_pending += 1
 
2256
1557
                    approval_required = True
 
2259
1560
                    if not client.enabled:
 
2260
1561
                        logger.info("Client %s is disabled",
 
2262
1563
                        if self.server.use_dbus:
 
2263
1564
                            # Emit D-Bus signal
 
2264
1565
                            client.Rejected("Disabled")
 
2267
1568
                    if client.approved or not client.approval_delay:
 
2268
 
                        # We are approved or approval is disabled
 
 
1569
                        #We are approved or approval is disabled
 
2270
1571
                    elif client.approved is None:
 
2271
1572
                        logger.info("Client %s needs approval",
 
 
2304
1607
                        delay -= time2 - time
 
2307
 
                    session.send(client.secret)
 
2308
 
                except gnutls.Error as error:
 
2309
 
                    logger.warning("gnutls send failed",
 
 
1610
                while sent_size < len(client.secret):
 
 
1612
                        sent = session.send(client.secret[sent_size:])
 
 
1613
                    except gnutls.errors.GNUTLSError as error:
 
 
1614
                        logger.warning("gnutls send failed")
 
 
1616
                    logger.debug("Sent: %d, remaining: %d",
 
 
1617
                                 sent, len(client.secret)
 
 
1618
                                 - (sent_size + sent))
 
2313
1621
                logger.info("Sending secret to %s", client.name)
 
2314
1622
                # bump the timeout using extended_timeout
 
2315
 
                client.bump_timeout(client.extended_timeout)
 
 
1623
                client.checked_ok(client.extended_timeout)
 
2316
1624
                if self.server.use_dbus:
 
2317
1625
                    # Emit D-Bus signal
 
2318
1626
                    client.GotSecret()
 
2321
1629
                if approval_required:
 
2322
1630
                    client.approvals_pending -= 1
 
2325
 
                except gnutls.Error as error:
 
2326
 
                    logger.warning("GnuTLS bye failed",
 
 
1633
                except gnutls.errors.GNUTLSError as error:
 
 
1634
                    logger.warning("GnuTLS bye failed")
 
2330
1637
    def peer_certificate(session):
 
2331
1638
        "Return the peer's OpenPGP certificate as a bytestring"
 
2332
1639
        # If not an OpenPGP certificate...
 
2333
 
        if (gnutls.certificate_type_get(session._c_object)
 
2334
 
            != gnutls.CRT_OPENPGP):
 
2335
 
            # ...return invalid data
 
 
1640
        if (gnutls.library.functions
 
 
1641
            .gnutls_certificate_type_get(session._c_object)
 
 
1642
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1643
            # ...do the normal thing
 
 
1644
            return session.peer_certificate
 
2337
1645
        list_size = ctypes.c_uint(1)
 
2338
 
        cert_list = (gnutls.certificate_get_peers
 
 
1646
        cert_list = (gnutls.library.functions
 
 
1647
                     .gnutls_certificate_get_peers
 
2339
1648
                     (session._c_object, ctypes.byref(list_size)))
 
2340
1649
        if not bool(cert_list) and list_size.value != 0:
 
2341
 
            raise gnutls.Error("error getting peer certificate")
 
 
1650
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2342
1652
        if list_size.value == 0:
 
2344
1654
        cert = cert_list[0]
 
2345
1655
        return ctypes.string_at(cert.data, cert.size)
 
2348
1658
    def fingerprint(openpgp):
 
2349
1659
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2350
1660
        # New GnuTLS "datum" with the OpenPGP public key
 
2351
 
        datum = gnutls.datum_t(
 
2352
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2353
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2354
 
            ctypes.c_uint(len(openpgp)))
 
 
1661
        datum = (gnutls.library.types
 
 
1662
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1665
                                 ctypes.c_uint(len(openpgp))))
 
2355
1666
        # New empty GnuTLS certificate
 
2356
 
        crt = gnutls.openpgp_crt_t()
 
2357
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1667
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1668
        (gnutls.library.functions
 
 
1669
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2358
1670
        # Import the OpenPGP public key into the certificate
 
2359
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2360
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1671
        (gnutls.library.functions
 
 
1672
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1673
                                    gnutls.library.constants
 
 
1674
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2361
1675
        # Verify the self signature in the key
 
2362
1676
        crtverify = ctypes.c_uint()
 
2363
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2364
 
                                       ctypes.byref(crtverify))
 
 
1677
        (gnutls.library.functions
 
 
1678
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1679
                                         ctypes.byref(crtverify)))
 
2365
1680
        if crtverify.value != 0:
 
2366
 
            gnutls.openpgp_crt_deinit(crt)
 
2367
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
 
1681
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1682
            raise (gnutls.errors.CertificateSecurityError
 
2368
1684
        # New buffer for the fingerprint
 
2369
1685
        buf = ctypes.create_string_buffer(20)
 
2370
1686
        buf_len = ctypes.c_size_t()
 
2371
1687
        # Get the fingerprint from the certificate into the buffer
 
2372
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2373
 
                                           ctypes.byref(buf_len))
 
 
1688
        (gnutls.library.functions
 
 
1689
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1690
                                             ctypes.byref(buf_len)))
 
2374
1691
        # Deinit the certificate
 
2375
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1692
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2376
1693
        # Convert the buffer to a Python bytestring
 
2377
1694
        fpr = ctypes.string_at(buf, buf_len.value)
 
2378
1695
        # Convert the bytestring to hexadecimal notation
 
 
2383
1700
class MultiprocessingMixIn(object):
 
2384
1701
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2386
1702
    def sub_process_main(self, request, address):
 
2388
1704
            self.finish_request(request, address)
 
2389
1705
        except Exception:
 
2390
1706
            self.handle_error(request, address)
 
2391
1707
        self.close_request(request)
 
2393
1709
    def process_request(self, request, address):
 
2394
1710
        """Start a new process to process the request."""
 
2395
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2396
 
                                       args=(request, address))
 
 
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
 
2401
1718
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2402
1719
    """ adds a pipe to the MixIn """
 
2404
1720
    def process_request(self, request, client_address):
 
2405
1721
        """Overrides and wraps the original process_request().
 
2407
1723
        This function creates a new pipe in self.pipe
 
2409
1725
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2411
1727
        proc = MultiprocessingMixIn.process_request(self, request,
 
2412
1728
                                                    client_address)
 
2413
1729
        self.child_pipe.close()
 
2414
1730
        self.add_pipe(parent_pipe, proc)
 
2416
1732
    def add_pipe(self, parent_pipe, proc):
 
2417
1733
        """Dummy function; override as necessary"""
 
2418
 
        raise NotImplementedError()
 
 
1734
        raise NotImplementedError
 
2421
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2422
1738
                     socketserver.TCPServer, object):
 
2423
1739
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2426
1742
        enabled:        Boolean; whether this server is activated yet
 
2427
1743
        interface:      None or a network interface name (string)
 
2428
1744
        use_ipv6:       Boolean; to use IPv6 or not
 
2431
1746
    def __init__(self, server_address, RequestHandlerClass,
 
2435
 
        """If socketfd is set, use that file descriptor instead of
 
2436
 
        creating a new one with socket.socket().
 
 
1747
                 interface=None, use_ipv6=True):
 
2438
1748
        self.interface = interface
 
2440
1750
            self.address_family = socket.AF_INET6
 
2441
 
        if socketfd is not None:
 
2442
 
            # Save the file descriptor
 
2443
 
            self.socketfd = socketfd
 
2444
 
            # Save the original socket.socket() function
 
2445
 
            self.socket_socket = socket.socket
 
2447
 
            # To implement --socket, we monkey patch socket.socket.
 
2449
 
            # (When socketserver.TCPServer is a new-style class, we
 
2450
 
            # could make self.socket into a property instead of monkey
 
2451
 
            # patching socket.socket.)
 
2453
 
            # Create a one-time-only replacement for socket.socket()
 
2454
 
            @functools.wraps(socket.socket)
 
2455
 
            def socket_wrapper(*args, **kwargs):
 
2456
 
                # Restore original function so subsequent calls are
 
2458
 
                socket.socket = self.socket_socket
 
2459
 
                del self.socket_socket
 
2460
 
                # This time only, return a new socket object from the
 
2461
 
                # saved file descriptor.
 
2462
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2463
 
            # Replace socket.socket() function with wrapper
 
2464
 
            socket.socket = socket_wrapper
 
2465
 
        # The socketserver.TCPServer.__init__ will call
 
2466
 
        # socket.socket(), which might be our replacement,
 
2467
 
        # socket_wrapper(), if socketfd was set.
 
2468
1751
        socketserver.TCPServer.__init__(self, server_address,
 
2469
1752
                                        RequestHandlerClass)
 
2471
1753
    def server_bind(self):
 
2472
1754
        """This overrides the normal server_bind() function
 
2473
1755
        to bind to an interface if one was specified, and also NOT to
 
2474
1756
        bind to an address or port if they were not specified."""
 
2475
 
        global SO_BINDTODEVICE
 
2476
1757
        if self.interface is not None:
 
2477
1758
            if SO_BINDTODEVICE is None:
 
2478
 
                # Fall back to a hard-coded value which seems to be
 
2480
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2481
 
                SO_BINDTODEVICE = 25
 
2483
 
                self.socket.setsockopt(
 
2484
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2485
 
                    (self.interface + "\0").encode("utf-8"))
 
2486
 
            except socket.error as error:
 
2487
 
                if error.errno == errno.EPERM:
 
2488
 
                    logger.error("No permission to bind to"
 
2489
 
                                 " interface %s", self.interface)
 
2490
 
                elif error.errno == errno.ENOPROTOOPT:
 
2491
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2492
 
                                 " cannot bind to interface %s",
 
2494
 
                elif error.errno == errno.ENODEV:
 
2495
 
                    logger.error("Interface %s does not exist,"
 
2496
 
                                 " cannot bind", self.interface)
 
 
1759
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1760
                             " cannot bind to interface %s",
 
 
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1768
                except socket.error as error:
 
 
1769
                    if error[0] == errno.EPERM:
 
 
1770
                        logger.error("No permission to"
 
 
1771
                                     " bind to interface %s",
 
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1774
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1775
                                     " cannot bind to interface %s",
 
2499
1779
        # Only bind(2) the socket if we really need to.
 
2500
1780
        if self.server_address[0] or self.server_address[1]:
 
2501
1781
            if not self.server_address[0]:
 
2502
1782
                if self.address_family == socket.AF_INET6:
 
2503
 
                    any_address = "::"  # in6addr_any
 
 
1783
                    any_address = "::" # in6addr_any
 
2505
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1785
                    any_address = socket.INADDR_ANY
 
2506
1786
                self.server_address = (any_address,
 
2507
1787
                                       self.server_address[1])
 
2508
1788
            elif not self.server_address[1]:
 
2509
 
                self.server_address = (self.server_address[0], 0)
 
 
1789
                self.server_address = (self.server_address[0],
 
2510
1791
#                 if self.interface:
 
2511
1792
#                     self.server_address = (self.server_address[0],
 
 
2609
1896
            funcname = request[1]
 
2610
1897
            args = request[2]
 
2611
1898
            kwargs = request[3]
 
2613
1900
            parent_pipe.send(('data', getattr(client_object,
 
2614
1901
                                              funcname)(*args,
 
2617
1904
        if command == 'getattr':
 
2618
1905
            attrname = request[1]
 
2619
 
            if isinstance(client_object.__getattribute__(attrname),
 
2620
 
                          collections.Callable):
 
2621
 
                parent_pipe.send(('function', ))
 
 
1906
            if callable(client_object.__getattribute__(attrname)):
 
 
1907
                parent_pipe.send(('function',))
 
2624
 
                    'data', client_object.__getattribute__(attrname)))
 
 
1909
                parent_pipe.send(('data', client_object
 
 
1910
                                  .__getattribute__(attrname)))
 
2626
1912
        if command == 'setattr':
 
2627
1913
            attrname = request[1]
 
2628
1914
            value = request[2]
 
2629
1915
            setattr(client_object, attrname, value)
 
2634
 
def rfc3339_duration_to_delta(duration):
 
2635
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2637
 
    >>> rfc3339_duration_to_delta("P7D")
 
2638
 
    datetime.timedelta(7)
 
2639
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2640
 
    datetime.timedelta(0, 60)
 
2641
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2642
 
    datetime.timedelta(0, 3600)
 
2643
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2644
 
    datetime.timedelta(1)
 
2645
 
    >>> rfc3339_duration_to_delta("P1W")
 
2646
 
    datetime.timedelta(7)
 
2647
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2648
 
    datetime.timedelta(0, 330)
 
2649
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2650
 
    datetime.timedelta(1, 200)
 
2653
 
    # Parsing an RFC 3339 duration with regular expressions is not
 
2654
 
    # possible - there would have to be multiple places for the same
 
2655
 
    # values, like seconds.  The current code, while more esoteric, is
 
2656
 
    # cleaner without depending on a parsing library.  If Python had a
 
2657
 
    # built-in library for parsing we would use it, but we'd like to
 
2658
 
    # avoid excessive use of external libraries.
 
2660
 
    # New type for defining tokens, syntax, and semantics all-in-one
 
2661
 
    Token = collections.namedtuple("Token", (
 
2662
 
        "regexp",  # To match token; if "value" is not None, must have
 
2663
 
                   # a "group" containing digits
 
2664
 
        "value",   # datetime.timedelta or None
 
2665
 
        "followers"))           # Tokens valid after this token
 
2666
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2667
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2668
 
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2669
 
    token_second = Token(re.compile(r"(\d+)S"),
 
2670
 
                         datetime.timedelta(seconds=1),
 
2671
 
                         frozenset((token_end, )))
 
2672
 
    token_minute = Token(re.compile(r"(\d+)M"),
 
2673
 
                         datetime.timedelta(minutes=1),
 
2674
 
                         frozenset((token_second, token_end)))
 
2675
 
    token_hour = Token(re.compile(r"(\d+)H"),
 
2676
 
                       datetime.timedelta(hours=1),
 
2677
 
                       frozenset((token_minute, token_end)))
 
2678
 
    token_time = Token(re.compile(r"T"),
 
2680
 
                       frozenset((token_hour, token_minute,
 
2682
 
    token_day = Token(re.compile(r"(\d+)D"),
 
2683
 
                      datetime.timedelta(days=1),
 
2684
 
                      frozenset((token_time, token_end)))
 
2685
 
    token_month = Token(re.compile(r"(\d+)M"),
 
2686
 
                        datetime.timedelta(weeks=4),
 
2687
 
                        frozenset((token_day, token_end)))
 
2688
 
    token_year = Token(re.compile(r"(\d+)Y"),
 
2689
 
                       datetime.timedelta(weeks=52),
 
2690
 
                       frozenset((token_month, token_end)))
 
2691
 
    token_week = Token(re.compile(r"(\d+)W"),
 
2692
 
                       datetime.timedelta(weeks=1),
 
2693
 
                       frozenset((token_end, )))
 
2694
 
    token_duration = Token(re.compile(r"P"), None,
 
2695
 
                           frozenset((token_year, token_month,
 
2696
 
                                      token_day, token_time,
 
2698
 
    # Define starting values:
 
2700
 
    value = datetime.timedelta()
 
2702
 
    # Following valid tokens
 
2703
 
    followers = frozenset((token_duration, ))
 
2704
 
    # String left to parse
 
2706
 
    # Loop until end token is found
 
2707
 
    while found_token is not token_end:
 
2708
 
        # Search for any currently valid tokens
 
2709
 
        for token in followers:
 
2710
 
            match = token.regexp.match(s)
 
2711
 
            if match is not None:
 
2713
 
                if token.value is not None:
 
2714
 
                    # Value found, parse digits
 
2715
 
                    factor = int(match.group(1), 10)
 
2716
 
                    # Add to value so far
 
2717
 
                    value += factor * token.value
 
2718
 
                # Strip token from string
 
2719
 
                s = token.regexp.sub("", s, 1)
 
2722
 
                # Set valid next tokens
 
2723
 
                followers = found_token.followers
 
2726
 
            # No currently valid tokens were found
 
2727
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2733
1920
def string_to_delta(interval):
 
2734
1921
    """Parse a string and return a datetime.timedelta
 
2736
1923
    >>> string_to_delta('7d')
 
2737
1924
    datetime.timedelta(7)
 
2738
1925
    >>> string_to_delta('60s')
 
 
2833
2014
    parser.add_argument("--no-dbus", action="store_false",
 
2834
2015
                        dest="use_dbus", help="Do not provide D-Bus"
 
2835
 
                        " system bus interface", default=None)
 
 
2016
                        " system bus interface")
 
2836
2017
    parser.add_argument("--no-ipv6", action="store_false",
 
2837
 
                        dest="use_ipv6", help="Do not use IPv6",
 
 
2018
                        dest="use_ipv6", help="Do not use IPv6")
 
2839
2019
    parser.add_argument("--no-restore", action="store_false",
 
2840
2020
                        dest="restore", help="Do not restore stored"
 
2841
 
                        " state", default=None)
 
2842
 
    parser.add_argument("--socket", type=int,
 
2843
 
                        help="Specify a file descriptor to a network"
 
2844
 
                        " socket to use instead of creating one")
 
2845
2022
    parser.add_argument("--statedir", metavar="DIR",
 
2846
2023
                        help="Directory to save/restore state in")
 
2847
 
    parser.add_argument("--foreground", action="store_true",
 
2848
 
                        help="Run in foreground", default=None)
 
2849
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
2850
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
2853
2025
    options = parser.parse_args()
 
2855
2027
    if options.check:
 
2857
 
        fail_count, test_count = doctest.testmod()
 
2858
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2860
2032
    # Default values for config file for server-global settings
 
2861
 
    server_defaults = {"interface": "",
 
2866
 
                       "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2867
 
                       ":+SIGN-DSA-SHA256",
 
2868
 
                       "servicename": "Mandos",
 
2874
 
                       "statedir": "/var/lib/mandos",
 
2875
 
                       "foreground": "False",
 
 
2033
    server_defaults = { "interface": "",
 
 
2038
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
2039
                        "servicename": "Mandos",
 
 
2044
                        "statedir": "/var/lib/mandos"
 
2879
2047
    # Parse config file for server-global settings
 
2880
2048
    server_config = configparser.SafeConfigParser(server_defaults)
 
2881
2049
    del server_defaults
 
2882
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
2050
    server_config.read(os.path.join(options.configdir,
 
2883
2052
    # Convert the SafeConfigParser object to a dict
 
2884
2053
    server_settings = server_config.defaults()
 
2885
2054
    # Use the appropriate methods on the non-string config options
 
2886
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2887
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2889
2058
    if server_settings["port"]:
 
2890
2059
        server_settings["port"] = server_config.getint("DEFAULT",
 
2892
 
    if server_settings["socket"]:
 
2893
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2895
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2896
 
        # over with an opened os.devnull.  But we don't want this to
 
2897
 
        # happen with a supplied network socket.
 
2898
 
        if 0 <= server_settings["socket"] <= 2:
 
2899
 
            server_settings["socket"] = os.dup(server_settings
 
2901
2061
    del server_config
 
2903
2063
    # Override the settings from the config file with command line
 
2904
2064
    # options, if set.
 
2905
2065
    for option in ("interface", "address", "port", "debug",
 
2906
 
                   "priority", "servicename", "configdir", "use_dbus",
 
2907
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2908
 
                   "socket", "foreground", "zeroconf"):
 
 
2066
                   "priority", "servicename", "configdir",
 
 
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2909
2069
        value = getattr(options, option)
 
2910
2070
        if value is not None:
 
2911
2071
            server_settings[option] = value
 
2913
2073
    # Force all strings to be unicode
 
2914
2074
    for option in server_settings.keys():
 
2915
 
        if isinstance(server_settings[option], bytes):
 
2916
 
            server_settings[option] = (server_settings[option]
 
2918
 
    # Force all boolean options to be boolean
 
2919
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2920
 
                   "foreground", "zeroconf"):
 
2921
 
        server_settings[option] = bool(server_settings[option])
 
2922
 
    # Debug implies foreground
 
2923
 
    if server_settings["debug"]:
 
2924
 
        server_settings["foreground"] = True
 
 
2075
        if type(server_settings[option]) is str:
 
 
2076
            server_settings[option] = unicode(server_settings[option])
 
2925
2077
    # Now we have our good server settings in "server_settings"
 
2927
2079
    ##################################################################
 
2929
 
    if (not server_settings["zeroconf"]
 
2930
 
        and not (server_settings["port"]
 
2931
 
                 or server_settings["socket"] != "")):
 
2932
 
        parser.error("Needs port or socket to work without Zeroconf")
 
2934
2081
    # For convenience
 
2935
2082
    debug = server_settings["debug"]
 
2936
2083
    debuglevel = server_settings["debuglevel"]
 
 
2950
2095
            level = getattr(logging, debuglevel.upper())
 
2951
2096
            initlogger(debug, level)
 
2953
2098
    if server_settings["servicename"] != "Mandos":
 
2954
 
        syslogger.setFormatter(
 
2955
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2956
 
                              ' %(levelname)s: %(message)s'.format(
 
2957
 
                                  server_settings["servicename"])))
 
 
2099
        syslogger.setFormatter(logging.Formatter
 
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
 
2101
                                ' %%(levelname)s: %%(message)s'
 
 
2102
                                % server_settings["servicename"]))
 
2959
2104
    # Parse config file with clients
 
2960
2105
    client_config = configparser.SafeConfigParser(Client
 
2961
2106
                                                  .client_defaults)
 
2962
2107
    client_config.read(os.path.join(server_settings["configdir"],
 
2963
2108
                                    "clients.conf"))
 
2965
2110
    global mandos_dbus_service
 
2966
2111
    mandos_dbus_service = None
 
2969
 
    if server_settings["socket"] != "":
 
2970
 
        socketfd = server_settings["socket"]
 
2971
 
    tcp_server = MandosServer(
 
2972
 
        (server_settings["address"], server_settings["port"]),
 
2974
 
        interface=(server_settings["interface"] or None),
 
2976
 
        gnutls_priority=server_settings["priority"],
 
2980
 
        pidfilename = "/run/mandos.pid"
 
2981
 
        if not os.path.isdir("/run/."):
 
2982
 
            pidfilename = "/var/run/mandos.pid"
 
2985
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2986
 
        except IOError as e:
 
2987
 
            logger.error("Could not open file %r", pidfilename,
 
2990
 
    for name, group in (("_mandos", "_mandos"),
 
2991
 
                        ("mandos", "mandos"),
 
2992
 
                        ("nobody", "nogroup")):
 
2994
 
            uid = pwd.getpwnam(name).pw_uid
 
2995
 
            gid = pwd.getpwnam(group).pw_gid
 
 
2113
    tcp_server = MandosServer((server_settings["address"],
 
 
2114
                               server_settings["port"]),
 
 
2116
                              interface=(server_settings["interface"]
 
 
2120
                              server_settings["priority"],
 
 
2123
        pidfilename = "/var/run/mandos.pid"
 
 
2125
            pidfile = open(pidfilename, "w")
 
 
2127
            logger.error("Could not open file %r", pidfilename)
 
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
 
2997
2136
        except KeyError:
 
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
3006
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3008
2146
    except OSError as error:
 
3009
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3010
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3011
 
        if error.errno != errno.EPERM:
 
 
2147
        if error[0] != errno.EPERM:
 
3015
2151
        # Enable all possible GnuTLS debugging
 
3017
2153
        # "Use a log level over 10 to enable all debugging options."
 
3018
2154
        # - GnuTLS manual
 
3019
 
        gnutls.global_set_log_level(11)
 
 
2155
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2157
        @gnutls.library.types.gnutls_log_func
 
3022
2158
        def debug_gnutls(level, string):
 
3023
2159
            logger.debug("GnuTLS: %s", string[:-1])
 
3025
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
2161
        (gnutls.library.functions
 
 
2162
         .gnutls_global_set_log_function(debug_gnutls))
 
3027
2164
        # Redirect stdin so all checkers get /dev/null
 
3028
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
3029
2166
        os.dup2(null, sys.stdin.fileno())
 
3033
2170
    # Need to fork before connecting to D-Bus
 
3035
2172
        # Close all input and output, do double fork, etc.
 
3038
 
    # multiprocessing will use threads, so before we use GLib we need
 
3039
 
    # to inform GLib that threads will be used.
 
 
2175
    gobject.threads_init()
 
3042
2177
    global main_loop
 
3043
2178
    # From the Avahi example code
 
3044
 
    DBusGMainLoop(set_as_default=True)
 
3045
 
    main_loop = GLib.MainLoop()
 
 
2179
    DBusGMainLoop(set_as_default=True )
 
 
2180
    main_loop = gobject.MainLoop()
 
3046
2181
    bus = dbus.SystemBus()
 
3047
2182
    # End of Avahi example code
 
3050
2185
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3053
 
            old_bus_name = dbus.service.BusName(
 
3054
 
                "se.bsnet.fukt.Mandos", bus,
 
3056
 
        except dbus.exceptions.DBusException as e:
 
3057
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
2186
                                            bus, do_not_queue=True)
 
 
2187
            old_bus_name = (dbus.service.BusName
 
 
2188
                            ("se.bsnet.fukt.Mandos", bus,
 
 
2190
        except dbus.exceptions.NameExistsException as e:
 
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
 
3058
2192
            use_dbus = False
 
3059
2193
            server_settings["use_dbus"] = False
 
3060
2194
            tcp_server.use_dbus = False
 
3062
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3063
 
        service = AvahiServiceToSyslog(
 
3064
 
            name=server_settings["servicename"],
 
3065
 
            servicetype="_mandos._tcp",
 
3068
 
        if server_settings["interface"]:
 
3069
 
            service.interface = if_nametoindex(
 
3070
 
                server_settings["interface"].encode("utf-8"))
 
 
2195
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
2196
    service = AvahiServiceToSyslog(name =
 
 
2197
                                   server_settings["servicename"],
 
 
2198
                                   servicetype = "_mandos._tcp",
 
 
2199
                                   protocol = protocol, bus = bus)
 
 
2200
    if server_settings["interface"]:
 
 
2201
        service.interface = (if_nametoindex
 
 
2202
                             (str(server_settings["interface"])))
 
3072
2204
    global multiprocessing_manager
 
3073
2205
    multiprocessing_manager = multiprocessing.Manager()
 
3075
2207
    client_class = Client
 
3077
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
3079
2212
    client_settings = Client.config_parser(client_config)
 
3080
2213
    old_client_settings = {}
 
3081
2214
    clients_data = {}
 
3083
 
    # This is used to redirect stdout and stderr for checker processes
 
3085
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3086
 
    # Only used if server is running in foreground but not in debug
 
3088
 
    if debug or not foreground:
 
3091
2216
    # Get client data and settings from last running state.
 
3092
2217
    if server_settings["restore"]:
 
3094
2219
            with open(stored_state_path, "rb") as stored_state:
 
3095
 
                if sys.version_info.major == 2:
 
3096
 
                    clients_data, old_client_settings = pickle.load(
 
3099
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3100
 
                        pickle.load(stored_state, encoding="bytes"))
 
3101
 
                    #   Fix bytes to strings
 
3104
 
                    clients_data = {(key.decode("utf-8")
 
3105
 
                                     if isinstance(key, bytes)
 
3108
 
                                    bytes_clients_data.items()}
 
3109
 
                    del bytes_clients_data
 
3110
 
                    for key in clients_data:
 
3111
 
                        value = {(k.decode("utf-8")
 
3112
 
                                  if isinstance(k, bytes) else k): v
 
3114
 
                                 clients_data[key].items()}
 
3115
 
                        clients_data[key] = value
 
3117
 
                        value["client_structure"] = [
 
3119
 
                             if isinstance(s, bytes)
 
3121
 
                            value["client_structure"]]
 
3123
 
                        for k in ("name", "host"):
 
3124
 
                            if isinstance(value[k], bytes):
 
3125
 
                                value[k] = value[k].decode("utf-8")
 
3126
 
                    #  old_client_settings
 
3128
 
                    old_client_settings = {
 
3129
 
                        (key.decode("utf-8")
 
3130
 
                         if isinstance(key, bytes)
 
3133
 
                        bytes_old_client_settings.items()}
 
3134
 
                    del bytes_old_client_settings
 
3136
 
                    for value in old_client_settings.values():
 
3137
 
                        if isinstance(value["host"], bytes):
 
3138
 
                            value["host"] = (value["host"]
 
 
2220
                clients_data, old_client_settings = (pickle.load
 
3140
2222
            os.remove(stored_state_path)
 
3141
2223
        except IOError as e:
 
3142
 
            if e.errno == errno.ENOENT:
 
3143
 
                logger.warning("Could not load persistent state:"
 
3144
 
                               " {}".format(os.strerror(e.errno)))
 
3146
 
                logger.critical("Could not load persistent state:",
 
 
2224
            logger.warning("Could not load persistent state: {0}"
 
 
2226
            if e.errno != errno.ENOENT:
 
3149
2228
        except EOFError as e:
 
3150
2229
            logger.warning("Could not load persistent state: "
 
 
2230
                           "EOFError: {0}".format(e))
 
3154
2232
    with PGPEngine() as pgp:
 
3155
 
        for client_name, client in clients_data.items():
 
3156
 
            # Skip removed clients
 
3157
 
            if client_name not in client_settings:
 
 
2233
        for client_name, client in clients_data.iteritems():
 
3160
2234
            # Decide which value to use after restoring saved state.
 
3161
2235
            # We have three different values: Old config file,
 
3162
2236
            # new config file, and saved state.
 
 
3221
2295
                        - set(old_client_settings)):
 
3222
2296
        clients_data[client_name] = client_settings[client_name]
 
3224
 
    # Create all client objects
 
3225
 
    for client_name, client in clients_data.items():
 
 
2298
    # Create clients all clients
 
 
2299
    for client_name, client in clients_data.iteritems():
 
3226
2300
        tcp_server.clients[client_name] = client_class(
 
3229
 
            server_settings=server_settings)
 
 
2301
            name = client_name, settings = client)
 
3231
2303
    if not tcp_server.clients:
 
3232
2304
        logger.warning("No clients defined")
 
3235
 
        if pidfile is not None:
 
3239
 
                    print(pid, file=pidfile)
 
3241
 
                logger.error("Could not write to file %r with PID %d",
 
 
2310
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
2313
            logger.error("Could not write to file %r with PID %d",
 
 
2316
            # "pidfile" was never created
 
3244
2318
        del pidfilename
 
3246
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3247
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3248
 
                             lambda: main_loop.quit() and False)
 
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3252
 
        @alternate_dbus_interfaces(
 
3253
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3254
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
2325
        class MandosDBusService(dbus.service.Object):
 
3255
2326
            """A D-Bus proxy object"""
 
3257
2327
            def __init__(self):
 
3258
2328
                dbus.service.Object.__init__(self, bus, "/")
 
3260
2329
            _interface = "se.recompile.Mandos"
 
3262
2331
            @dbus.service.signal(_interface, signature="o")
 
3263
2332
            def ClientAdded(self, objpath):
 
3267
2336
            @dbus.service.signal(_interface, signature="ss")
 
3268
2337
            def ClientNotFound(self, fingerprint, address):
 
3272
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3274
2341
            @dbus.service.signal(_interface, signature="os")
 
3275
2342
            def ClientRemoved(self, objpath, name):
 
3279
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3281
2346
            @dbus.service.method(_interface, out_signature="ao")
 
3282
2347
            def GetAllClients(self):
 
3284
 
                return dbus.Array(c.dbus_object_path for c in
 
3285
 
                                  tcp_server.clients.values())
 
3287
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
2349
                return dbus.Array(c.dbus_object_path
 
 
2351
                                  tcp_server.clients.itervalues())
 
3289
2353
            @dbus.service.method(_interface,
 
3290
2354
                                 out_signature="a{oa{sv}}")
 
3291
2355
            def GetAllClientsWithProperties(self):
 
3293
2357
                return dbus.Dictionary(
 
3294
 
                    {c.dbus_object_path: c.GetAll(
 
3295
 
                        "se.recompile.Mandos.Client")
 
3296
 
                     for c in tcp_server.clients.values()},
 
 
2358
                    ((c.dbus_object_path, c.GetAll(""))
 
 
2359
                     for c in tcp_server.clients.itervalues()),
 
3297
2360
                    signature="oa{sv}")
 
3299
2362
            @dbus.service.method(_interface, in_signature="o")
 
3300
2363
            def RemoveClient(self, object_path):
 
3302
 
                for c in tcp_server.clients.values():
 
 
2365
                for c in tcp_server.clients.itervalues():
 
3303
2366
                    if c.dbus_object_path == object_path:
 
3304
2367
                        del tcp_server.clients[c.name]
 
3305
2368
                        c.remove_from_connection()
 
3306
 
                        # Don't signal the disabling
 
 
2369
                        # Don't signal anything except ClientRemoved
 
3307
2370
                        c.disable(quiet=True)
 
3308
 
                        # Emit D-Bus signal for removal
 
3309
 
                        self.client_removed_signal(c)
 
 
2372
                        self.ClientRemoved(object_path, c.name)
 
3311
2374
                raise KeyError(object_path)
 
3315
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3316
 
                                 out_signature="a{oa{sa{sv}}}")
 
3317
 
            def GetManagedObjects(self):
 
3319
 
                return dbus.Dictionary(
 
3320
 
                    {client.dbus_object_path:
 
3322
 
                         {interface: client.GetAll(interface)
 
3324
 
                          client._get_all_interface_names()})
 
3325
 
                     for client in tcp_server.clients.values()})
 
3327
 
            def client_added_signal(self, client):
 
3328
 
                """Send the new standard signal and the old signal"""
 
3330
 
                    # New standard signal
 
3331
 
                    self.InterfacesAdded(
 
3332
 
                        client.dbus_object_path,
 
3334
 
                            {interface: client.GetAll(interface)
 
3336
 
                             client._get_all_interface_names()}))
 
3338
 
                    self.ClientAdded(client.dbus_object_path)
 
3340
 
            def client_removed_signal(self, client):
 
3341
 
                """Send the new standard signal and the old signal"""
 
3343
 
                    # New standard signal
 
3344
 
                    self.InterfacesRemoved(
 
3345
 
                        client.dbus_object_path,
 
3346
 
                        client._get_all_interface_names())
 
3348
 
                    self.ClientRemoved(client.dbus_object_path,
 
3351
 
        mandos_dbus_service = MandosDBusService()
 
3353
 
    # Save modules to variables to exempt the modules from being
 
3354
 
    # unloaded before the function registered with atexit() is run.
 
3355
 
    mp = multiprocessing
 
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
 
3359
2383
        "Cleanup function; run on exit"
 
3363
 
        mp.active_children()
 
 
2386
        multiprocessing.active_children()
 
3365
2387
        if not (tcp_server.clients or client_settings):
 
3368
2390
        # Store client before exiting. Secrets are encrypted with key
 
3369
2391
        # based on what config file has. If config file is
 
3370
2392
        # removed/edited, old secret will thus be unrecovable.
 
3372
2394
        with PGPEngine() as pgp:
 
3373
 
            for client in tcp_server.clients.values():
 
 
2395
            for client in tcp_server.clients.itervalues():
 
3374
2396
                key = client_settings[client.name]["secret"]
 
3375
2397
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3377
2399
                client_dict = {}
 
3379
2401
                # A list of attributes that can not be pickled
 
3381
 
                exclude = {"bus", "changedstate", "secret",
 
3382
 
                           "checker", "server_settings"}
 
3383
 
                for name, typ in inspect.getmembers(dbus.service
 
 
2403
                exclude = set(("bus", "changedstate", "secret",
 
 
2405
                for name, typ in (inspect.getmembers
 
 
2406
                                  (dbus.service.Object)):
 
3385
2407
                    exclude.add(name)
 
3387
2409
                client_dict["encrypted_secret"] = (client
 
3388
2410
                                                   .encrypted_secret)
 
3389
2411
                for attr in client.client_structure:
 
3390
2412
                    if attr not in exclude:
 
3391
2413
                        client_dict[attr] = getattr(client, attr)
 
3393
2415
                clients[client.name] = client_dict
 
3394
2416
                del client_settings[client.name]["secret"]
 
3397
 
            with tempfile.NamedTemporaryFile(
 
3401
 
                    dir=os.path.dirname(stored_state_path),
 
3402
 
                    delete=False) as stored_state:
 
3403
 
                pickle.dump((clients, client_settings), stored_state,
 
3405
 
                tempname = stored_state.name
 
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
 
2422
                                                (stored_state_path))
 
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
 
 
2424
                pickle.dump((clients, client_settings), stored_state)
 
3406
2425
            os.rename(tempname, stored_state_path)
 
3407
2426
        except (IOError, OSError) as e:
 
 
2427
            logger.warning("Could not save persistent state: {0}"
 
3410
2431
                    os.remove(tempname)
 
3411
2432
                except NameError:
 
3413
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3414
 
                logger.warning("Could not save persistent state: {}"
 
3415
 
                               .format(os.strerror(e.errno)))
 
3417
 
                logger.warning("Could not save persistent state:",
 
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
3421
2438
        # Delete all clients, and settings from config
 
3422
2439
        while tcp_server.clients:
 
3423
2440
            name, client = tcp_server.clients.popitem()
 
3425
2442
                client.remove_from_connection()
 
3426
 
            # Don't signal the disabling
 
 
2443
            # Don't signal anything except ClientRemoved
 
3427
2444
            client.disable(quiet=True)
 
3428
 
            # Emit D-Bus signal for removal
 
3430
 
                mandos_dbus_service.client_removed_signal(client)
 
 
2447
                mandos_dbus_service.ClientRemoved(client
 
3431
2450
        client_settings.clear()
 
3433
2452
    atexit.register(cleanup)
 
3435
 
    for client in tcp_server.clients.values():
 
 
2454
    for client in tcp_server.clients.itervalues():
 
3437
 
            # Emit D-Bus signal for adding
 
3438
 
            mandos_dbus_service.client_added_signal(client)
 
 
2457
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3439
2458
        # Need to initiate checking of clients
 
3440
2459
        if client.enabled:
 
3441
2460
            client.init_checker()
 
3443
2462
    tcp_server.enable()
 
3444
2463
    tcp_server.server_activate()
 
3446
2465
    # Find out what port we got
 
3448
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2466
    service.port = tcp_server.socket.getsockname()[1]
 
3450
2468
        logger.info("Now listening on address %r, port %d,"
 
3451
 
                    " flowinfo %d, scope_id %d",
 
3452
 
                    *tcp_server.socket.getsockname())
 
 
2469
                    " flowinfo %d, scope_id %d"
 
 
2470
                    % tcp_server.socket.getsockname())
 
3454
 
        logger.info("Now listening on address %r, port %d",
 
3455
 
                    *tcp_server.socket.getsockname())
 
3457
 
    # service.interface = tcp_server.socket.getsockname()[3]
 
 
2472
        logger.info("Now listening on address %r, port %d"
 
 
2473
                    % tcp_server.socket.getsockname())
 
 
2475
    #service.interface = tcp_server.socket.getsockname()[3]
 
3461
 
            # From the Avahi example code
 
3464
 
            except dbus.exceptions.DBusException as error:
 
3465
 
                logger.critical("D-Bus Exception", exc_info=error)
 
3468
 
            # End of Avahi example code
 
3470
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3471
 
                          lambda *args, **kwargs:
 
3472
 
                          (tcp_server.handle_request
 
3473
 
                           (*args[2:], **kwargs) or True))
 
 
2478
        # From the Avahi example code
 
 
2481
        except dbus.exceptions.DBusException as error:
 
 
2482
            logger.critical("DBusException: %s", error)
 
 
2485
        # End of Avahi example code
 
 
2487
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
 
2488
                             lambda *args, **kwargs:
 
 
2489
                             (tcp_server.handle_request
 
 
2490
                              (*args[2:], **kwargs) or True))
 
3475
2492
        logger.debug("Starting main loop")
 
3476
2493
        main_loop.run()
 
3477
2494
    except AvahiError as error:
 
3478
 
        logger.critical("Avahi Error", exc_info=error)
 
 
2495
        logger.critical("AvahiError: %s", error)
 
3481
2498
    except KeyboardInterrupt: