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