65
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
66
73
import multiprocessing
 
74
82
import dbus.service
 
 
83
from gi.repository import GLib
 
77
84
from dbus.mainloop.glib import DBusGMainLoop
 
80
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:
 
85
94
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
86
95
except AttributeError:
 
 
97
        # This is where SO_BINDTODEVICE was up to and including Python
 
88
99
        from IN import SO_BINDTODEVICE
 
89
100
    except ImportError:
 
90
 
        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:
 
93
119
stored_state_file = "clients.pickle"
 
95
121
logger = logging.getLogger()
 
96
 
syslogger = (logging.handlers.SysLogHandler
 
97
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
98
 
              address = str("/dev/log")))
 
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
102
 
                      (ctypes.util.find_library("c"))
 
 
125
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
126
        ctypes.util.find_library("c")).if_nametoindex
 
104
127
except (OSError, AttributeError):
 
105
129
    def if_nametoindex(interface):
 
106
130
        "Get an interface index the hard way, i.e. using fcntl()"
 
107
131
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
108
132
        with contextlib.closing(socket.socket()) as s:
 
109
133
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
110
 
                                struct.pack(str("16s16x"),
 
112
 
        interface_index = struct.unpack(str("I"),
 
 
134
                                struct.pack(b"16s16x", interface))
 
 
135
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
114
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__,
 
117
155
def initlogger(debug, level=logging.WARNING):
 
118
156
    """init logger and add loglevel"""
 
 
159
    syslogger = (logging.handlers.SysLogHandler(
 
 
160
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
120
162
    syslogger.setFormatter(logging.Formatter
 
121
163
                           ('Mandos [%(process)d]: %(levelname)s:'
 
123
165
    logger.addHandler(syslogger)
 
126
168
        console = logging.StreamHandler()
 
127
169
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
172
226
            os.rmdir(self.tempdir)
 
173
227
            self.tempdir = None
 
175
229
    def password_encode(self, password):
 
176
230
        # Passphrase can not be empty and can not contain newlines or
 
177
231
        # NUL bytes.  So we prefix it and hex encode it.
 
178
 
        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"))
 
180
240
    def encrypt(self, data, password):
 
181
 
        self.gnupg.passphrase = self.password_encode(password)
 
182
 
        with open(os.devnull, "w") as devnull:
 
184
 
                proc = self.gnupg.run(['--symmetric'],
 
185
 
                                      create_fhs=['stdin', 'stdout'],
 
186
 
                                      attach_fhs={'stderr': devnull})
 
187
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
189
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
190
 
                    ciphertext = f.read()
 
194
 
        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:
 
195
256
        return ciphertext
 
197
258
    def decrypt(self, data, password):
 
198
 
        self.gnupg.passphrase = self.password_encode(password)
 
199
 
        with open(os.devnull, "w") as devnull:
 
201
 
                proc = self.gnupg.run(['--decrypt'],
 
202
 
                                      create_fhs=['stdin', 'stdout'],
 
203
 
                                      attach_fhs={'stderr': devnull})
 
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
206
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
207
 
                    decrypted_plaintext = f.read()
 
211
 
        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:
 
212
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
 
215
303
class AvahiError(Exception):
 
216
304
    def __init__(self, value, *args, **kwargs):
 
217
305
        self.value = value
 
218
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
 
    def __unicode__(self):
 
220
 
        return unicode(repr(self.value))
 
 
306
        return super(AvahiError, self).__init__(value, *args,
 
222
310
class AvahiServiceError(AvahiError):
 
225
314
class AvahiGroupError(AvahiError):
 
229
318
class AvahiService(object):
 
230
319
    """An Avahi (Zeroconf) service.
 
233
322
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
234
323
               Used to optionally bind to the specified interface.
 
235
324
    name: string; Example: 'Mandos'
 
236
325
    type: string; Example: '_mandos._tcp'.
 
237
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
326
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
238
327
    port: integer; what port to announce
 
239
328
    TXT: list of strings; TXT record for the service
 
240
329
    domain: string; Domain to publish on, default to .local if empty.
 
 
377
488
                                    follow_name_owner_changes=True),
 
378
489
                avahi.DBUS_INTERFACE_SERVER)
 
379
490
        self.server.connect_to_signal("StateChanged",
 
380
 
                                 self.server_state_changed)
 
 
491
                                      self.server_state_changed)
 
381
492
        self.server_state_changed(self.server.GetState())
 
384
495
class AvahiServiceToSyslog(AvahiService):
 
 
496
    def rename(self, *args, **kwargs):
 
386
497
        """Add the new name to the syslog messages"""
 
387
 
        ret = AvahiService.rename(self)
 
388
 
        syslogger.setFormatter(logging.Formatter
 
389
 
                               ('Mandos ({0}) [%(process)d]:'
 
390
 
                                ' %(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'
 
395
 
def timedelta_to_milliseconds(td):
 
396
 
    "Convert a datetime.timedelta() to milliseconds"
 
397
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
 
            + (td.seconds * 1000)
 
399
 
            + (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(b"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(b"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))
 
402
817
class Client(object):
 
403
818
    """A representation of a client host served by this server.
 
406
821
    approved:   bool(); 'None' if not yet approved/disapproved
 
407
822
    approval_delay: datetime.timedelta(); Time to wait for approval
 
408
823
    approval_duration: datetime.timedelta(); Duration of one approval
 
409
 
    checker:    subprocess.Popen(); a running checker process used
 
410
 
                                    to see if the client lives.
 
411
 
                                    'None' if no process is running.
 
412
 
    checker_callback_tag: a gobject event source tag, or None
 
 
824
    checker: multiprocessing.Process(); a running checker process used
 
 
825
             to see if the client lives. 'None' if no process is
 
 
827
    checker_callback_tag: a GLib event source tag, or None
 
413
828
    checker_command: string; External command which is run to check
 
414
829
                     if client lives.  %() expansions are done at
 
415
830
                     runtime with vars(self) as dict, so that for
 
416
831
                     instance %(name)s can be used in the command.
 
417
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
832
    checker_initiator_tag: a GLib event source tag, or None
 
418
833
    created:    datetime.datetime(); (UTC) object creation
 
419
834
    client_structure: Object describing what attributes a client has
 
420
835
                      and is used for storing the client at exit
 
421
836
    current_checker_command: string; current running checker_command
 
422
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
837
    disable_initiator_tag: a GLib event source tag, or None
 
424
839
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
425
 
                 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
 
426
843
    host:       string; available for use by the checker command
 
427
844
    interval:   datetime.timedelta(); How often to start a new checker
 
428
845
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
591
1002
            logger.info("Disabling client %s", self.name)
 
592
1003
        if getattr(self, "disable_initiator_tag", None) is not None:
 
593
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1004
            GLib.source_remove(self.disable_initiator_tag)
 
594
1005
            self.disable_initiator_tag = None
 
595
1006
        self.expires = None
 
596
1007
        if getattr(self, "checker_initiator_tag", None) is not None:
 
597
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1008
            GLib.source_remove(self.checker_initiator_tag)
 
598
1009
            self.checker_initiator_tag = None
 
599
1010
        self.stop_checker()
 
600
1011
        self.enabled = False
 
602
1013
            self.send_changedstate()
 
603
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1014
        # Do not run this again if called by a GLib.timeout_add
 
606
1017
    def __del__(self):
 
609
1020
    def init_checker(self):
 
610
1021
        # Schedule a new checker to be started an 'interval' from now,
 
611
1022
        # and every interval from then on.
 
612
1023
        if self.checker_initiator_tag is not None:
 
613
 
            gobject.source_remove(self.checker_initiator_tag)
 
614
 
        self.checker_initiator_tag = (gobject.timeout_add
 
615
 
                                      (self.interval_milliseconds(),
 
 
1024
            GLib.source_remove(self.checker_initiator_tag)
 
 
1025
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1026
            int(self.interval.total_seconds() * 1000),
 
617
1028
        # Schedule a disable() when 'timeout' has passed
 
618
1029
        if self.disable_initiator_tag is not None:
 
619
 
            gobject.source_remove(self.disable_initiator_tag)
 
620
 
        self.disable_initiator_tag = (gobject.timeout_add
 
621
 
                                   (self.timeout_milliseconds(),
 
 
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)
 
623
1033
        # Also start a new checker *right now*.
 
624
1034
        self.start_checker()
 
626
 
    def checker_callback(self, pid, condition, command):
 
 
1036
    def checker_callback(self, source, condition, connection,
 
627
1038
        """The checker has completed, so take appropriate actions."""
 
 
1039
        # Read return code from connection (see call_pipe)
 
 
1040
        returncode = connection.recv()
 
628
1043
        self.checker_callback_tag = None
 
629
1044
        self.checker = None
 
630
 
        if os.WIFEXITED(condition):
 
631
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1047
            self.last_checker_status = returncode
 
 
1048
            self.last_checker_signal = None
 
632
1049
            if self.last_checker_status == 0:
 
633
1050
                logger.info("Checker for %(name)s succeeded",
 
635
1052
                self.checked_ok()
 
637
 
                logger.info("Checker for %(name)s failed",
 
 
1054
                logger.info("Checker for %(name)s failed", vars(self))
 
640
1056
            self.last_checker_status = -1
 
 
1057
            self.last_checker_signal = -returncode
 
641
1058
            logger.warning("Checker for %(name)s crashed?",
 
644
1062
    def checked_ok(self):
 
645
1063
        """Assert that the client has been seen, alive and well."""
 
646
1064
        self.last_checked_ok = datetime.datetime.utcnow()
 
647
1065
        self.last_checker_status = 0
 
 
1066
        self.last_checker_signal = None
 
648
1067
        self.bump_timeout()
 
650
1069
    def bump_timeout(self, timeout=None):
 
651
1070
        """Bump up the timeout for this client."""
 
652
1071
        if timeout is None:
 
653
1072
            timeout = self.timeout
 
654
1073
        if self.disable_initiator_tag is not None:
 
655
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1074
            GLib.source_remove(self.disable_initiator_tag)
 
656
1075
            self.disable_initiator_tag = None
 
657
1076
        if getattr(self, "enabled", False):
 
658
 
            self.disable_initiator_tag = (gobject.timeout_add
 
659
 
                                          (timedelta_to_milliseconds
 
660
 
                                           (timeout), self.disable))
 
 
1077
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1078
                int(timeout.total_seconds() * 1000), self.disable)
 
661
1079
            self.expires = datetime.datetime.utcnow() + timeout
 
663
1081
    def need_approval(self):
 
664
1082
        self.last_approval_request = datetime.datetime.utcnow()
 
666
1084
    def start_checker(self):
 
667
1085
        """Start a new checker subprocess if one is not running.
 
669
1087
        If a checker already exists, leave it running and do
 
671
1089
        # The reason for not killing a running checker is that if we
 
 
676
1094
        # checkers alone, the checker would have to take more time
 
677
1095
        # than 'timeout' for the client to be disabled, which is as it
 
680
 
        # If a checker exists, make sure it is not a zombie
 
682
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
683
 
        except (AttributeError, OSError) as error:
 
684
 
            if (isinstance(error, OSError)
 
685
 
                and error.errno != errno.ECHILD):
 
689
 
                logger.warning("Checker was a zombie")
 
690
 
                gobject.source_remove(self.checker_callback_tag)
 
691
 
                self.checker_callback(pid, status,
 
692
 
                                      self.current_checker_command)
 
 
1098
        if self.checker is not None and not self.checker.is_alive():
 
 
1099
            logger.warning("Checker was not alive; joining")
 
693
1102
        # Start a new checker if needed
 
694
1103
        if self.checker is None:
 
695
1104
            # Escape attributes for the shell
 
696
 
            escaped_attrs = dict(
 
697
 
                (attr, re.escape(unicode(getattr(self, attr))))
 
699
 
                self.runtime_expansions)
 
 
1106
                attr: re.escape(str(getattr(self, attr)))
 
 
1107
                for attr in self.runtime_expansions}
 
701
1109
                command = self.checker_command % escaped_attrs
 
702
1110
            except TypeError as error:
 
703
1111
                logger.error('Could not format string "%s"',
 
704
 
                             self.checker_command, exc_info=error)
 
705
 
                return True # Try again later
 
 
1112
                             self.checker_command,
 
 
1114
                return True     # Try again later
 
706
1115
            self.current_checker_command = command
 
708
 
                logger.info("Starting checker %r for %s",
 
710
 
                # We don't need to redirect stdout and stderr, since
 
711
 
                # in normal mode, that is already done by daemon(),
 
712
 
                # and in debug mode we don't want to.  (Stdin is
 
713
 
                # always replaced by /dev/null.)
 
714
 
                self.checker = subprocess.Popen(command,
 
717
 
            except OSError as error:
 
718
 
                logger.error("Failed to start subprocess",
 
720
 
            self.checker_callback_tag = (gobject.child_watch_add
 
722
 
                                          self.checker_callback,
 
724
 
            # The checker may have completed before the gobject
 
725
 
            # watch was added.  Check for this.
 
726
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
728
 
                gobject.source_remove(self.checker_callback_tag)
 
729
 
                self.checker_callback(pid, status, command)
 
730
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
1116
            logger.info("Starting checker %r for %s", command,
 
 
1118
            # We don't need to redirect stdout and stderr, since
 
 
1119
            # in normal mode, that is already done by daemon(),
 
 
1120
            # and in debug mode we don't want to.  (Stdin is
 
 
1121
            # always replaced by /dev/null.)
 
 
1122
            # The exception is when not debugging but nevertheless
 
 
1123
            # running in the foreground; use the previously
 
 
1125
            popen_args = {"close_fds": True,
 
 
1128
            if (not self.server_settings["debug"]
 
 
1129
                and self.server_settings["foreground"]):
 
 
1130
                popen_args.update({"stdout": wnull,
 
 
1132
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1133
            self.checker = multiprocessing.Process(
 
 
1135
                args=(pipe[1], subprocess.call, command),
 
 
1137
            self.checker.start()
 
 
1138
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1139
                pipe[0].fileno(), GLib.IO_IN,
 
 
1140
                self.checker_callback, pipe[0], command)
 
 
1141
        # Re-run this periodically if run by GLib.timeout_add
 
733
1144
    def stop_checker(self):
 
734
1145
        """Force the checker process, if any, to stop."""
 
735
1146
        if self.checker_callback_tag:
 
736
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1147
            GLib.source_remove(self.checker_callback_tag)
 
737
1148
            self.checker_callback_tag = None
 
738
1149
        if getattr(self, "checker", None) is None:
 
740
1151
        logger.debug("Stopping checker for %(name)s", vars(self))
 
742
 
            self.checker.terminate()
 
744
 
            #if self.checker.poll() is None:
 
745
 
            #    self.checker.kill()
 
746
 
        except OSError as error:
 
747
 
            if error.errno != errno.ESRCH: # No such process
 
 
1152
        self.checker.terminate()
 
749
1153
        self.checker = None
 
752
 
def dbus_service_property(dbus_interface, signature="v",
 
753
 
                          access="readwrite", byte_arrays=False):
 
 
1156
def dbus_service_property(dbus_interface,
 
754
1160
    """Decorators for marking methods of a DBusObjectWithProperties to
 
755
1161
    become properties on the D-Bus.
 
757
1163
    The decorated method will be called with no arguments by "Get"
 
758
1164
    and with one argument by "Set".
 
760
1166
    The parameters, where they are supported, are the same as
 
761
1167
    dbus.service.method, except there is only "signature", since the
 
762
1168
    type from Get() and the type sent to Set() is the same.
 
 
838
 
class DBusObjectWithProperties(dbus.service.Object):
 
839
 
    """A D-Bus object with properties.
 
841
 
    Classes inheriting from this can use the dbus_service_property
 
842
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
843
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
1251
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1252
    """A D-Bus object with annotations.
 
 
1254
    Classes inheriting from this can use the dbus_annotations
 
 
1255
    decorator to add annotations to methods or signals.
 
847
1259
    def _is_dbus_thing(thing):
 
848
1260
        """Returns a function testing if an attribute is a D-Bus thing
 
850
1262
        If called like _is_dbus_thing("method") it returns a function
 
851
1263
        suitable for use as predicate to inspect.getmembers().
 
853
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1265
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
856
1268
    def _get_all_dbus_things(self, thing):
 
857
1269
        """Returns a generator of (name, attribute) pairs
 
859
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1271
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
861
1272
                 athing.__get__(self))
 
862
1273
                for cls in self.__class__.__mro__
 
863
1274
                for name, athing in
 
864
 
                inspect.getmembers(cls,
 
865
 
                                   self._is_dbus_thing(thing)))
 
 
1275
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1277
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1279
                         path_keyword='object_path',
 
 
1280
                         connection_keyword='connection')
 
 
1281
    def Introspect(self, object_path, connection):
 
 
1282
        """Overloading of standard D-Bus method.
 
 
1284
        Inserts annotation tags on methods and signals.
 
 
1286
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1289
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1291
            for if_tag in document.getElementsByTagName("interface"):
 
 
1292
                # Add annotation tags
 
 
1293
                for typ in ("method", "signal"):
 
 
1294
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1296
                        for name, prop in (self.
 
 
1297
                                           _get_all_dbus_things(typ)):
 
 
1298
                            if (name == tag.getAttribute("name")
 
 
1299
                                and prop._dbus_interface
 
 
1300
                                == if_tag.getAttribute("name")):
 
 
1301
                                annots.update(getattr(
 
 
1302
                                    prop, "_dbus_annotations", {}))
 
 
1303
                        for name, value in annots.items():
 
 
1304
                            ann_tag = document.createElement(
 
 
1306
                            ann_tag.setAttribute("name", name)
 
 
1307
                            ann_tag.setAttribute("value", value)
 
 
1308
                            tag.appendChild(ann_tag)
 
 
1309
                # Add interface annotation tags
 
 
1310
                for annotation, value in dict(
 
 
1311
                    itertools.chain.from_iterable(
 
 
1312
                        annotations().items()
 
 
1313
                        for name, annotations
 
 
1314
                        in self._get_all_dbus_things("interface")
 
 
1315
                        if name == if_tag.getAttribute("name")
 
 
1317
                    ann_tag = document.createElement("annotation")
 
 
1318
                    ann_tag.setAttribute("name", annotation)
 
 
1319
                    ann_tag.setAttribute("value", value)
 
 
1320
                    if_tag.appendChild(ann_tag)
 
 
1321
                # Fix argument name for the Introspect method itself
 
 
1322
                if (if_tag.getAttribute("name")
 
 
1323
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1324
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1325
                        if cn.getAttribute("name") == "Introspect":
 
 
1326
                            for arg in cn.getElementsByTagName("arg"):
 
 
1327
                                if (arg.getAttribute("direction")
 
 
1329
                                    arg.setAttribute("name",
 
 
1331
            xmlstring = document.toxml("utf-8")
 
 
1333
        except (AttributeError, xml.dom.DOMException,
 
 
1334
                xml.parsers.expat.ExpatError) as error:
 
 
1335
            logger.error("Failed to override Introspection method",
 
 
1340
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1341
    """A D-Bus object with properties.
 
 
1343
    Classes inheriting from this can use the dbus_service_property
 
 
1344
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1345
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
867
1348
    def _get_dbus_property(self, interface_name, property_name):
 
868
1349
        """Returns a bound method if one exists which is a D-Bus
 
869
1350
        property with the specified name and interface.
 
871
 
        for cls in  self.__class__.__mro__:
 
872
 
            for name, value in (inspect.getmembers
 
874
 
                                 self._is_dbus_thing("property"))):
 
 
1352
        for cls in self.__class__.__mro__:
 
 
1353
            for name, value in inspect.getmembers(
 
 
1354
                    cls, self._is_dbus_thing("property")):
 
875
1355
                if (value._dbus_name == property_name
 
876
1356
                    and value._dbus_interface == interface_name):
 
877
1357
                    return value.__get__(self)
 
879
1359
        # No such property
 
880
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
881
 
                                   + interface_name + "."
 
884
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1360
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1361
            self.dbus_object_path, interface_name, property_name))
 
 
1364
    def _get_all_interface_names(cls):
 
 
1365
        """Get a sequence of all interfaces supported by an object"""
 
 
1366
        return (name for name in set(getattr(getattr(x, attr),
 
 
1367
                                             "_dbus_interface", None)
 
 
1368
                                     for x in (inspect.getmro(cls))
 
 
1370
                if name is not None)
 
 
1372
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
885
1374
                         out_signature="v")
 
886
1375
    def Get(self, interface_name, property_name):
 
887
1376
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1017
1505
        return xmlstring
 
 
1509
    dbus.OBJECT_MANAGER_IFACE
 
 
1510
except AttributeError:
 
 
1511
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1514
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1515
    """A D-Bus object with an ObjectManager.
 
 
1517
    Classes inheriting from this exposes the standard
 
 
1518
    GetManagedObjects call and the InterfacesAdded and
 
 
1519
    InterfacesRemoved signals on the standard
 
 
1520
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1522
    Note: No signals are sent automatically; they must be sent
 
 
1525
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1526
                         out_signature="a{oa{sa{sv}}}")
 
 
1527
    def GetManagedObjects(self):
 
 
1528
        """This function must be overridden"""
 
 
1529
        raise NotImplementedError()
 
 
1531
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1532
                         signature="oa{sa{sv}}")
 
 
1533
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1536
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1537
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1540
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1542
                         path_keyword='object_path',
 
 
1543
                         connection_keyword='connection')
 
 
1544
    def Introspect(self, object_path, connection):
 
 
1545
        """Overloading of standard D-Bus method.
 
 
1547
        Override return argument name of GetManagedObjects to be
 
 
1548
        "objpath_interfaces_and_properties"
 
 
1550
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1554
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1556
            for if_tag in document.getElementsByTagName("interface"):
 
 
1557
                # Fix argument name for the GetManagedObjects method
 
 
1558
                if (if_tag.getAttribute("name")
 
 
1559
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1560
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1561
                        if (cn.getAttribute("name")
 
 
1562
                            == "GetManagedObjects"):
 
 
1563
                            for arg in cn.getElementsByTagName("arg"):
 
 
1564
                                if (arg.getAttribute("direction")
 
 
1568
                                        "objpath_interfaces"
 
 
1570
            xmlstring = document.toxml("utf-8")
 
 
1572
        except (AttributeError, xml.dom.DOMException,
 
 
1573
                xml.parsers.expat.ExpatError) as error:
 
 
1574
            logger.error("Failed to override Introspection method",
 
1020
1579
def datetime_to_dbus(dt, variant_level=0):
 
1021
1580
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1023
 
        return dbus.String("", variant_level = variant_level)
 
1024
 
    return dbus.String(dt.isoformat(),
 
1025
 
                       variant_level=variant_level)
 
 
1582
        return dbus.String("", variant_level=variant_level)
 
 
1583
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1028
1586
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1381
1947
        server to mandos-client
 
1385
1951
    # Rejected - signal
 
1386
1952
    @dbus.service.signal(_interface, signature="s")
 
1387
1953
    def Rejected(self, reason):
 
1391
1957
    # NeedApproval - signal
 
1392
1958
    @dbus.service.signal(_interface, signature="tb")
 
1393
1959
    def NeedApproval(self, timeout, default):
 
1395
1961
        return self.need_approval()
 
1399
1965
    # Approve - method
 
1400
1966
    @dbus.service.method(_interface, in_signature="b")
 
1401
1967
    def Approve(self, value):
 
1402
1968
        self.approve(value)
 
1404
1970
    # CheckedOK - method
 
1405
1971
    @dbus.service.method(_interface)
 
1406
1972
    def CheckedOK(self):
 
1407
1973
        self.checked_ok()
 
1409
1975
    # Enable - method
 
 
1976
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1410
1977
    @dbus.service.method(_interface)
 
1411
1978
    def Enable(self):
 
1415
1982
    # StartChecker - method
 
 
1983
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1416
1984
    @dbus.service.method(_interface)
 
1417
1985
    def StartChecker(self):
 
1419
1987
        self.start_checker()
 
1421
1989
    # Disable - method
 
 
1990
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1422
1991
    @dbus.service.method(_interface)
 
1423
1992
    def Disable(self):
 
1427
1996
    # StopChecker - method
 
 
1997
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1428
1998
    @dbus.service.method(_interface)
 
1429
1999
    def StopChecker(self):
 
1430
2000
        self.stop_checker()
 
1434
2004
    # ApprovalPending - property
 
1435
2005
    @dbus_service_property(_interface, signature="b", access="read")
 
1436
2006
    def ApprovalPending_dbus_property(self):
 
1437
2007
        return dbus.Boolean(bool(self.approvals_pending))
 
1439
2009
    # ApprovedByDefault - property
 
1440
 
    @dbus_service_property(_interface, signature="b",
 
 
2010
    @dbus_service_property(_interface,
 
1441
2012
                           access="readwrite")
 
1442
2013
    def ApprovedByDefault_dbus_property(self, value=None):
 
1443
2014
        if value is None:       # get
 
1444
2015
            return dbus.Boolean(self.approved_by_default)
 
1445
2016
        self.approved_by_default = bool(value)
 
1447
2018
    # ApprovalDelay - property
 
1448
 
    @dbus_service_property(_interface, signature="t",
 
 
2019
    @dbus_service_property(_interface,
 
1449
2021
                           access="readwrite")
 
1450
2022
    def ApprovalDelay_dbus_property(self, value=None):
 
1451
2023
        if value is None:       # get
 
1452
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2024
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1453
2026
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1455
2028
    # ApprovalDuration - property
 
1456
 
    @dbus_service_property(_interface, signature="t",
 
 
2029
    @dbus_service_property(_interface,
 
1457
2031
                           access="readwrite")
 
1458
2032
    def ApprovalDuration_dbus_property(self, value=None):
 
1459
2033
        if value is None:       # get
 
1460
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1461
 
                    self.approval_duration))
 
 
2034
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1462
2036
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1464
2038
    # Name - property
 
 
2040
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1465
2041
    @dbus_service_property(_interface, signature="s", access="read")
 
1466
2042
    def Name_dbus_property(self):
 
1467
2043
        return dbus.String(self.name)
 
 
2047
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2048
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2049
    def KeyID_dbus_property(self):
 
 
2050
        return dbus.String(self.key_id)
 
1469
2052
    # Fingerprint - property
 
 
2054
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1470
2055
    @dbus_service_property(_interface, signature="s", access="read")
 
1471
2056
    def Fingerprint_dbus_property(self):
 
1472
2057
        return dbus.String(self.fingerprint)
 
1474
2059
    # Host - property
 
1475
 
    @dbus_service_property(_interface, signature="s",
 
 
2060
    @dbus_service_property(_interface,
 
1476
2062
                           access="readwrite")
 
1477
2063
    def Host_dbus_property(self, value=None):
 
1478
2064
        if value is None:       # get
 
1479
2065
            return dbus.String(self.host)
 
1480
 
        self.host = unicode(value)
 
 
2066
        self.host = str(value)
 
1482
2068
    # Created - property
 
 
2070
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1483
2071
    @dbus_service_property(_interface, signature="s", access="read")
 
1484
2072
    def Created_dbus_property(self):
 
1485
2073
        return datetime_to_dbus(self.created)
 
1487
2075
    # LastEnabled - property
 
1488
2076
    @dbus_service_property(_interface, signature="s", access="read")
 
1489
2077
    def LastEnabled_dbus_property(self):
 
1490
2078
        return datetime_to_dbus(self.last_enabled)
 
1492
2080
    # Enabled - property
 
1493
 
    @dbus_service_property(_interface, signature="b",
 
 
2081
    @dbus_service_property(_interface,
 
1494
2083
                           access="readwrite")
 
1495
2084
    def Enabled_dbus_property(self, value=None):
 
1496
2085
        if value is None:       # get
 
 
1544
2134
                if (getattr(self, "disable_initiator_tag", None)
 
1547
 
                gobject.source_remove(self.disable_initiator_tag)
 
1548
 
                self.disable_initiator_tag = (
 
1549
 
                    gobject.timeout_add(
 
1550
 
                        timedelta_to_milliseconds(self.expires - now),
 
 
2137
                GLib.source_remove(self.disable_initiator_tag)
 
 
2138
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2139
                    int((self.expires - now).total_seconds() * 1000),
 
1553
2142
    # ExtendedTimeout - property
 
1554
 
    @dbus_service_property(_interface, signature="t",
 
 
2143
    @dbus_service_property(_interface,
 
1555
2145
                           access="readwrite")
 
1556
2146
    def ExtendedTimeout_dbus_property(self, value=None):
 
1557
2147
        if value is None:       # get
 
1558
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2148
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1559
2150
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1561
2152
    # Interval - property
 
1562
 
    @dbus_service_property(_interface, signature="t",
 
 
2153
    @dbus_service_property(_interface,
 
1563
2155
                           access="readwrite")
 
1564
2156
    def Interval_dbus_property(self, value=None):
 
1565
2157
        if value is None:       # get
 
1566
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2158
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1567
2159
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1568
2160
        if getattr(self, "checker_initiator_tag", None) is None:
 
1570
2162
        if self.enabled:
 
1571
2163
            # Reschedule checker run
 
1572
 
            gobject.source_remove(self.checker_initiator_tag)
 
1573
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1574
 
                                          (value, self.start_checker))
 
1575
 
            self.start_checker()    # Start one now, too
 
 
2164
            GLib.source_remove(self.checker_initiator_tag)
 
 
2165
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2166
                value, self.start_checker)
 
 
2167
            self.start_checker()  # Start one now, too
 
1577
2169
    # Checker - property
 
1578
 
    @dbus_service_property(_interface, signature="s",
 
 
2170
    @dbus_service_property(_interface,
 
1579
2172
                           access="readwrite")
 
1580
2173
    def Checker_dbus_property(self, value=None):
 
1581
2174
        if value is None:       # get
 
1582
2175
            return dbus.String(self.checker_command)
 
1583
 
        self.checker_command = unicode(value)
 
 
2176
        self.checker_command = str(value)
 
1585
2178
    # CheckerRunning - property
 
1586
 
    @dbus_service_property(_interface, signature="b",
 
 
2179
    @dbus_service_property(_interface,
 
1587
2181
                           access="readwrite")
 
1588
2182
    def CheckerRunning_dbus_property(self, value=None):
 
1589
2183
        if value is None:       # get
 
 
1636
2240
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1637
2241
    """A class to handle client connections.
 
1639
2243
    Instantiated once for each connection to handle it.
 
1640
2244
    Note: This will run in its own forked process."""
 
1642
2246
    def handle(self):
 
1643
2247
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1644
2248
            logger.info("TCP connection from: %s",
 
1645
 
                        unicode(self.client_address))
 
 
2249
                        str(self.client_address))
 
1646
2250
            logger.debug("Pipe FD: %d",
 
1647
2251
                         self.server.child_pipe.fileno())
 
1649
 
            session = (gnutls.connection
 
1650
 
                       .ClientSession(self.request,
 
1652
 
                                      .X509Credentials()))
 
1654
 
            # Note: gnutls.connection.X509Credentials is really a
 
1655
 
            # generic GnuTLS certificate credentials object so long as
 
1656
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1657
 
            # here despite using OpenPGP certificates.
 
1659
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1660
 
            #                      "+AES-256-CBC", "+SHA1",
 
1661
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2253
            session = gnutls.ClientSession(self.request)
 
 
2255
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2256
            #                       "+AES-256-CBC", "+SHA1",
 
 
2257
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1663
2259
            # Use a fallback default, since this MUST be set.
 
1664
2260
            priority = self.server.gnutls_priority
 
1665
2261
            if priority is None:
 
1666
2262
                priority = "NORMAL"
 
1667
 
            (gnutls.library.functions
 
1668
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2263
            gnutls.priority_set_direct(session._c_object,
 
 
2264
                                       priority.encode("utf-8"),
 
1671
2267
            # Start communication using the Mandos protocol
 
1672
2268
            # Get protocol number
 
1673
2269
            line = self.request.makefile().readline()
 
1674
2270
            logger.debug("Protocol version: %r", line)
 
1676
2272
                if int(line.strip().split()[0]) > 1:
 
 
2273
                    raise RuntimeError(line)
 
1678
2274
            except (ValueError, IndexError, RuntimeError) as error:
 
1679
2275
                logger.error("Unknown protocol version: %s", error)
 
1682
2278
            # Start GnuTLS connection
 
1684
2280
                session.handshake()
 
1685
 
            except gnutls.errors.GNUTLSError as error:
 
 
2281
            except gnutls.Error as error:
 
1686
2282
                logger.warning("Handshake failed: %s", error)
 
1687
2283
                # Do not run session.bye() here: the session is not
 
1688
2284
                # established.  Just abandon the request.
 
1690
2286
            logger.debug("Handshake succeeded")
 
1692
2288
            approval_required = False
 
1695
 
                    fpr = self.fingerprint(self.peer_certificate
 
1698
 
                        gnutls.errors.GNUTLSError) as error:
 
1699
 
                    logger.warning("Bad certificate: %s", error)
 
1701
 
                logger.debug("Fingerprint: %s", fpr)
 
1704
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2290
                if gnutls.has_rawpk:
 
 
2293
                        key_id = self.key_id(
 
 
2294
                            self.peer_certificate(session))
 
 
2295
                    except (TypeError, gnutls.Error) as error:
 
 
2296
                        logger.warning("Bad certificate: %s", error)
 
 
2298
                    logger.debug("Key ID: %s", key_id)
 
 
2303
                        fpr = self.fingerprint(
 
 
2304
                            self.peer_certificate(session))
 
 
2305
                    except (TypeError, gnutls.Error) as error:
 
 
2306
                        logger.warning("Bad certificate: %s", error)
 
 
2308
                    logger.debug("Fingerprint: %s", fpr)
 
 
2311
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1705
2312
                                         self.client_address)
 
1706
2313
                except KeyError:
 
1709
2316
                if client.approval_delay:
 
1710
2317
                    delay = client.approval_delay
 
1711
2318
                    client.approvals_pending += 1
 
1712
2319
                    approval_required = True
 
1715
2322
                    if not client.enabled:
 
1716
2323
                        logger.info("Client %s is disabled",
 
1718
2325
                        if self.server.use_dbus:
 
1719
2326
                            # Emit D-Bus signal
 
1720
2327
                            client.Rejected("Disabled")
 
1723
2330
                    if client.approved or not client.approval_delay:
 
1724
 
                        #We are approved or approval is disabled
 
 
2331
                        # We are approved or approval is disabled
 
1726
2333
                    elif client.approved is None:
 
1727
2334
                        logger.info("Client %s needs approval",
 
 
1762
2367
                        delay -= time2 - time
 
1765
 
                while sent_size < len(client.secret):
 
1767
 
                        sent = session.send(client.secret[sent_size:])
 
1768
 
                    except gnutls.errors.GNUTLSError as error:
 
1769
 
                        logger.warning("gnutls send failed",
 
1772
 
                    logger.debug("Sent: %d, remaining: %d",
 
1773
 
                                 sent, len(client.secret)
 
1774
 
                                 - (sent_size + sent))
 
 
2370
                    session.send(client.secret)
 
 
2371
                except gnutls.Error as error:
 
 
2372
                    logger.warning("gnutls send failed",
 
1777
2376
                logger.info("Sending secret to %s", client.name)
 
1778
2377
                # bump the timeout using extended_timeout
 
1779
2378
                client.bump_timeout(client.extended_timeout)
 
1780
2379
                if self.server.use_dbus:
 
1781
2380
                    # Emit D-Bus signal
 
1782
2381
                    client.GotSecret()
 
1785
2384
                if approval_required:
 
1786
2385
                    client.approvals_pending -= 1
 
1789
 
                except gnutls.errors.GNUTLSError as error:
 
 
2388
                except gnutls.Error as error:
 
1790
2389
                    logger.warning("GnuTLS bye failed",
 
1791
2390
                                   exc_info=error)
 
1794
2393
    def peer_certificate(session):
 
1795
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1796
 
        # If not an OpenPGP certificate...
 
1797
 
        if (gnutls.library.functions
 
1798
 
            .gnutls_certificate_type_get(session._c_object)
 
1799
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1800
 
            # ...do the normal thing
 
1801
 
            return session.peer_certificate
 
 
2394
        "Return the peer's certificate as a bytestring"
 
 
2396
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2398
        except AttributeError:
 
 
2399
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2400
        if gnutls.has_rawpk:
 
 
2401
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2403
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2404
        # If not a valid certificate type...
 
 
2405
        if cert_type not in valid_cert_types:
 
 
2406
            logger.info("Cert type %r not in %r", cert_type,
 
 
2408
            # ...return invalid data
 
1802
2410
        list_size = ctypes.c_uint(1)
 
1803
 
        cert_list = (gnutls.library.functions
 
1804
 
                     .gnutls_certificate_get_peers
 
 
2411
        cert_list = (gnutls.certificate_get_peers
 
1805
2412
                     (session._c_object, ctypes.byref(list_size)))
 
1806
2413
        if not bool(cert_list) and list_size.value != 0:
 
1807
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2414
            raise gnutls.Error("error getting peer certificate")
 
1809
2415
        if list_size.value == 0:
 
1811
2417
        cert = cert_list[0]
 
1812
2418
        return ctypes.string_at(cert.data, cert.size)
 
 
2421
    def key_id(certificate):
 
 
2422
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2423
        # New GnuTLS "datum" with the public key
 
 
2424
        datum = gnutls.datum_t(
 
 
2425
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2426
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2427
            ctypes.c_uint(len(certificate)))
 
 
2428
        # XXX all these need to be created in the gnutls "module"
 
 
2429
        # New empty GnuTLS certificate
 
 
2430
        pubkey = gnutls.pubkey_t()
 
 
2431
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2432
        # Import the raw public key into the certificate
 
 
2433
        gnutls.pubkey_import(pubkey,
 
 
2434
                             ctypes.byref(datum),
 
 
2435
                             gnutls.X509_FMT_DER)
 
 
2436
        # New buffer for the key ID
 
 
2437
        buf = ctypes.create_string_buffer(32)
 
 
2438
        buf_len = ctypes.c_size_t(len(buf))
 
 
2439
        # Get the key ID from the raw public key into the buffer
 
 
2440
        gnutls.pubkey_get_key_id(pubkey,
 
 
2441
                                 gnutls.KEYID_USE_SHA256,
 
 
2442
                                 ctypes.cast(ctypes.byref(buf),
 
 
2443
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2444
                                 ctypes.byref(buf_len))
 
 
2445
        # Deinit the certificate
 
 
2446
        gnutls.pubkey_deinit(pubkey)
 
 
2448
        # Convert the buffer to a Python bytestring
 
 
2449
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2450
        # Convert the bytestring to hexadecimal notation
 
 
2451
        hex_key_id = binascii.hexlify(key_id).upper()
 
1815
2455
    def fingerprint(openpgp):
 
1816
2456
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1817
2457
        # New GnuTLS "datum" with the OpenPGP public key
 
1818
 
        datum = (gnutls.library.types
 
1819
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1822
 
                                 ctypes.c_uint(len(openpgp))))
 
 
2458
        datum = gnutls.datum_t(
 
 
2459
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2460
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2461
            ctypes.c_uint(len(openpgp)))
 
1823
2462
        # New empty GnuTLS certificate
 
1824
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1825
 
        (gnutls.library.functions
 
1826
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2463
        crt = gnutls.openpgp_crt_t()
 
 
2464
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1827
2465
        # Import the OpenPGP public key into the certificate
 
1828
 
        (gnutls.library.functions
 
1829
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1830
 
                                    gnutls.library.constants
 
1831
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2466
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2467
                                  gnutls.OPENPGP_FMT_RAW)
 
1832
2468
        # Verify the self signature in the key
 
1833
2469
        crtverify = ctypes.c_uint()
 
1834
 
        (gnutls.library.functions
 
1835
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1836
 
                                         ctypes.byref(crtverify)))
 
 
2470
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2471
                                       ctypes.byref(crtverify))
 
1837
2472
        if crtverify.value != 0:
 
1838
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1839
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2473
            gnutls.openpgp_crt_deinit(crt)
 
 
2474
            raise gnutls.CertificateSecurityError(code
 
1841
2476
        # New buffer for the fingerprint
 
1842
2477
        buf = ctypes.create_string_buffer(20)
 
1843
2478
        buf_len = ctypes.c_size_t()
 
1844
2479
        # Get the fingerprint from the certificate into the buffer
 
1845
 
        (gnutls.library.functions
 
1846
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1847
 
                                             ctypes.byref(buf_len)))
 
 
2480
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2481
                                           ctypes.byref(buf_len))
 
1848
2482
        # Deinit the certificate
 
1849
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2483
        gnutls.openpgp_crt_deinit(crt)
 
1850
2484
        # Convert the buffer to a Python bytestring
 
1851
2485
        fpr = ctypes.string_at(buf, buf_len.value)
 
1852
2486
        # Convert the bytestring to hexadecimal notation
 
 
1935
2575
        # socket_wrapper(), if socketfd was set.
 
1936
2576
        socketserver.TCPServer.__init__(self, server_address,
 
1937
2577
                                        RequestHandlerClass)
 
1939
2579
    def server_bind(self):
 
1940
2580
        """This overrides the normal server_bind() function
 
1941
2581
        to bind to an interface if one was specified, and also NOT to
 
1942
2582
        bind to an address or port if they were not specified."""
 
 
2583
        global SO_BINDTODEVICE
 
1943
2584
        if self.interface is not None:
 
1944
2585
            if SO_BINDTODEVICE is None:
 
1945
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1946
 
                             " cannot bind to interface %s",
 
1950
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1952
 
                                           str(self.interface + '\0'))
 
1953
 
                except socket.error as error:
 
1954
 
                    if error.errno == errno.EPERM:
 
1955
 
                        logger.error("No permission to bind to"
 
1956
 
                                     " interface %s", self.interface)
 
1957
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1958
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1959
 
                                     " cannot bind to interface %s",
 
1961
 
                    elif error.errno == errno.ENODEV:
 
1962
 
                        logger.error("Interface %s does not exist,"
 
1963
 
                                     " cannot bind", self.interface)
 
 
2586
                # Fall back to a hard-coded value which seems to be
 
 
2588
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2589
                SO_BINDTODEVICE = 25
 
 
2591
                self.socket.setsockopt(
 
 
2592
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2593
                    (self.interface + "\0").encode("utf-8"))
 
 
2594
            except socket.error as error:
 
 
2595
                if error.errno == errno.EPERM:
 
 
2596
                    logger.error("No permission to bind to"
 
 
2597
                                 " interface %s", self.interface)
 
 
2598
                elif error.errno == errno.ENOPROTOOPT:
 
 
2599
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2600
                                 " cannot bind to interface %s",
 
 
2602
                elif error.errno == errno.ENODEV:
 
 
2603
                    logger.error("Interface %s does not exist,"
 
 
2604
                                 " cannot bind", self.interface)
 
1966
2607
        # Only bind(2) the socket if we really need to.
 
1967
2608
        if self.server_address[0] or self.server_address[1]:
 
 
2609
            if self.server_address[1]:
 
 
2610
                self.allow_reuse_address = True
 
1968
2611
            if not self.server_address[0]:
 
1969
2612
                if self.address_family == socket.AF_INET6:
 
1970
 
                    any_address = "::" # in6addr_any
 
 
2613
                    any_address = "::"  # in6addr_any
 
1972
 
                    any_address = socket.INADDR_ANY
 
 
2615
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1973
2616
                self.server_address = (any_address,
 
1974
2617
                                       self.server_address[1])
 
1975
2618
            elif not self.server_address[1]:
 
1976
 
                self.server_address = (self.server_address[0],
 
 
2619
                self.server_address = (self.server_address[0], 0)
 
1978
2620
#                 if self.interface:
 
1979
2621
#                     self.server_address = (self.server_address[0],
 
 
2005
2652
        self.gnutls_priority = gnutls_priority
 
2006
2653
        IPv6_TCPServer.__init__(self, server_address,
 
2007
2654
                                RequestHandlerClass,
 
2008
 
                                interface = interface,
 
2009
 
                                use_ipv6 = use_ipv6,
 
2010
 
                                socketfd = socketfd)
 
 
2655
                                interface=interface,
 
2011
2659
    def server_activate(self):
 
2012
2660
        if self.enabled:
 
2013
2661
            return socketserver.TCPServer.server_activate(self)
 
2015
2663
    def enable(self):
 
2016
2664
        self.enabled = True
 
2018
2666
    def add_pipe(self, parent_pipe, proc):
 
2019
2667
        # Call "handle_ipc" for both data and EOF events
 
2020
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
2021
 
                             gobject.IO_IN | gobject.IO_HUP,
 
2022
 
                             functools.partial(self.handle_ipc,
 
2027
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2028
 
                   proc = None, client_object=None):
 
 
2669
            parent_pipe.fileno(),
 
 
2670
            GLib.IO_IN | GLib.IO_HUP,
 
 
2671
            functools.partial(self.handle_ipc,
 
 
2672
                              parent_pipe=parent_pipe,
 
 
2675
    def handle_ipc(self, source, condition,
 
 
2678
                   client_object=None):
 
2029
2679
        # error, or the other end of multiprocessing.Pipe has closed
 
2030
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2680
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2031
2681
            # Wait for other process to exit
 
2035
2685
        # Read a request from the child
 
2036
2686
        request = parent_pipe.recv()
 
2037
2687
        command = request[0]
 
2039
2689
        if command == 'init':
 
2041
 
            address = request[2]
 
2043
 
            for c in self.clients.itervalues():
 
2044
 
                if c.fingerprint == fpr:
 
 
2690
            key_id = request[1].decode("ascii")
 
 
2691
            fpr = request[2].decode("ascii")
 
 
2692
            address = request[3]
 
 
2694
            for c in self.clients.values():
 
 
2695
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2697
                if key_id and c.key_id == key_id:
 
 
2700
                if fpr and c.fingerprint == fpr:
 
2048
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2049
 
                            "dress: %s", fpr, address)
 
 
2704
                logger.info("Client not found for key ID: %s, address"
 
 
2705
                            ": %s", key_id or fpr, address)
 
2050
2706
                if self.use_dbus:
 
2051
2707
                    # Emit D-Bus signal
 
2052
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2708
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2054
2710
                parent_pipe.send(False)
 
2057
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
2058
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
2059
 
                                 functools.partial(self.handle_ipc,
 
 
2714
                parent_pipe.fileno(),
 
 
2715
                GLib.IO_IN | GLib.IO_HUP,
 
 
2716
                functools.partial(self.handle_ipc,
 
 
2717
                                  parent_pipe=parent_pipe,
 
 
2719
                                  client_object=client))
 
2065
2720
            parent_pipe.send(True)
 
2066
2721
            # remove the old hook in favor of the new above hook on
 
 
2294
2949
    parser.add_argument("--no-dbus", action="store_false",
 
2295
2950
                        dest="use_dbus", help="Do not provide D-Bus"
 
2296
 
                        " system bus interface")
 
 
2951
                        " system bus interface", default=None)
 
2297
2952
    parser.add_argument("--no-ipv6", action="store_false",
 
2298
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2953
                        dest="use_ipv6", help="Do not use IPv6",
 
2299
2955
    parser.add_argument("--no-restore", action="store_false",
 
2300
2956
                        dest="restore", help="Do not restore stored"
 
 
2957
                        " state", default=None)
 
2302
2958
    parser.add_argument("--socket", type=int,
 
2303
2959
                        help="Specify a file descriptor to a network"
 
2304
2960
                        " socket to use instead of creating one")
 
2305
2961
    parser.add_argument("--statedir", metavar="DIR",
 
2306
2962
                        help="Directory to save/restore state in")
 
2307
2963
    parser.add_argument("--foreground", action="store_true",
 
2308
 
                        help="Run in foreground")
 
 
2964
                        help="Run in foreground", default=None)
 
 
2965
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2966
                        dest="zeroconf", help="Do not use Zeroconf",
 
2310
2969
    options = parser.parse_args()
 
2312
2971
    if options.check:
 
 
2973
        fail_count, test_count = doctest.testmod()
 
 
2974
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2317
2976
    # Default values for config file for server-global settings
 
2318
 
    server_defaults = { "interface": "",
 
2323
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2324
 
                        "servicename": "Mandos",
 
2330
 
                        "statedir": "/var/lib/mandos",
 
2331
 
                        "foreground": "False",
 
 
2977
    if gnutls.has_rawpk:
 
 
2978
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2979
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2981
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2982
                    ":+SIGN-DSA-SHA256")
 
 
2983
    server_defaults = {"interface": "",
 
 
2987
                       "priority": priority,
 
 
2988
                       "servicename": "Mandos",
 
 
2994
                       "statedir": "/var/lib/mandos",
 
 
2995
                       "foreground": "False",
 
2334
3000
    # Parse config file for server-global settings
 
2335
3001
    server_config = configparser.SafeConfigParser(server_defaults)
 
2336
3002
    del server_defaults
 
2337
 
    server_config.read(os.path.join(options.configdir,
 
 
3003
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2339
3004
    # Convert the SafeConfigParser object to a dict
 
2340
3005
    server_settings = server_config.defaults()
 
2341
3006
    # Use the appropriate methods on the non-string config options
 
2342
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
3007
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3008
                   "foreground", "zeroconf"):
 
2343
3009
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2345
3011
    if server_settings["port"]:
 
 
 
3128
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2447
3130
    except OSError as error:
 
 
3131
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3132
                       .format(uid, gid, os.strerror(error.errno)))
 
2448
3133
        if error.errno != errno.EPERM:
 
2452
3137
        # Enable all possible GnuTLS debugging
 
2454
3139
        # "Use a log level over 10 to enable all debugging options."
 
2455
3140
        # - GnuTLS manual
 
2456
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2458
 
        @gnutls.library.types.gnutls_log_func
 
 
3141
        gnutls.global_set_log_level(11)
 
2459
3144
        def debug_gnutls(level, string):
 
2460
3145
            logger.debug("GnuTLS: %s", string[:-1])
 
2462
 
        (gnutls.library.functions
 
2463
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3147
        gnutls.global_set_log_function(debug_gnutls)
 
2465
3149
        # Redirect stdin so all checkers get /dev/null
 
2466
3150
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2467
3151
        os.dup2(null, sys.stdin.fileno())
 
2471
3155
    # Need to fork before connecting to D-Bus
 
2472
3156
    if not foreground:
 
2473
3157
        # Close all input and output, do double fork, etc.
 
2476
 
    # multiprocessing will use threads, so before we use gobject we
 
2477
 
    # need to inform gobject that threads will be used.
 
2478
 
    gobject.threads_init()
 
 
3160
    # multiprocessing will use threads, so before we use GLib we need
 
 
3161
    # to inform GLib that threads will be used.
 
2480
3164
    global main_loop
 
2481
3165
    # From the Avahi example code
 
2482
3166
    DBusGMainLoop(set_as_default=True)
 
2483
 
    main_loop = gobject.MainLoop()
 
 
3167
    main_loop = GLib.MainLoop()
 
2484
3168
    bus = dbus.SystemBus()
 
2485
3169
    # End of Avahi example code
 
2488
3172
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2489
 
                                            bus, do_not_queue=True)
 
2490
 
            old_bus_name = (dbus.service.BusName
 
2491
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2493
 
        except dbus.exceptions.NameExistsException as e:
 
 
3175
            old_bus_name = dbus.service.BusName(
 
 
3176
                "se.bsnet.fukt.Mandos", bus,
 
 
3178
        except dbus.exceptions.DBusException as e:
 
2494
3179
            logger.error("Disabling D-Bus:", exc_info=e)
 
2495
3180
            use_dbus = False
 
2496
3181
            server_settings["use_dbus"] = False
 
2497
3182
            tcp_server.use_dbus = False
 
2498
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2499
 
    service = AvahiServiceToSyslog(name =
 
2500
 
                                   server_settings["servicename"],
 
2501
 
                                   servicetype = "_mandos._tcp",
 
2502
 
                                   protocol = protocol, bus = bus)
 
2503
 
    if server_settings["interface"]:
 
2504
 
        service.interface = (if_nametoindex
 
2505
 
                             (str(server_settings["interface"])))
 
 
3184
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3185
        service = AvahiServiceToSyslog(
 
 
3186
            name=server_settings["servicename"],
 
 
3187
            servicetype="_mandos._tcp",
 
 
3190
        if server_settings["interface"]:
 
 
3191
            service.interface = if_nametoindex(
 
 
3192
                server_settings["interface"].encode("utf-8"))
 
2507
3194
    global multiprocessing_manager
 
2508
3195
    multiprocessing_manager = multiprocessing.Manager()
 
2510
3197
    client_class = Client
 
2512
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3199
        client_class = functools.partial(ClientDBus, bus=bus)
 
2514
3201
    client_settings = Client.config_parser(client_config)
 
2515
3202
    old_client_settings = {}
 
2516
3203
    clients_data = {}
 
 
3205
    # This is used to redirect stdout and stderr for checker processes
 
 
3207
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3208
    # Only used if server is running in foreground but not in debug
 
 
3210
    if debug or not foreground:
 
2518
3213
    # Get client data and settings from last running state.
 
2519
3214
    if server_settings["restore"]:
 
2521
3216
            with open(stored_state_path, "rb") as stored_state:
 
2522
 
                clients_data, old_client_settings = (pickle.load
 
 
3217
                if sys.version_info.major == 2:
 
 
3218
                    clients_data, old_client_settings = pickle.load(
 
 
3221
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3222
                        pickle.load(stored_state, encoding="bytes"))
 
 
3223
                    #   Fix bytes to strings
 
 
3226
                    clients_data = {(key.decode("utf-8")
 
 
3227
                                     if isinstance(key, bytes)
 
 
3230
                                    bytes_clients_data.items()}
 
 
3231
                    del bytes_clients_data
 
 
3232
                    for key in clients_data:
 
 
3233
                        value = {(k.decode("utf-8")
 
 
3234
                                  if isinstance(k, bytes) else k): v
 
 
3236
                                 clients_data[key].items()}
 
 
3237
                        clients_data[key] = value
 
 
3239
                        value["client_structure"] = [
 
 
3241
                             if isinstance(s, bytes)
 
 
3243
                            value["client_structure"]]
 
 
3245
                        for k in ("name", "host"):
 
 
3246
                            if isinstance(value[k], bytes):
 
 
3247
                                value[k] = value[k].decode("utf-8")
 
 
3248
                        if "key_id" not in value:
 
 
3249
                            value["key_id"] = ""
 
 
3250
                        elif "fingerprint" not in value:
 
 
3251
                            value["fingerprint"] = ""
 
 
3252
                    #  old_client_settings
 
 
3254
                    old_client_settings = {
 
 
3255
                        (key.decode("utf-8")
 
 
3256
                         if isinstance(key, bytes)
 
 
3259
                        bytes_old_client_settings.items()}
 
 
3260
                    del bytes_old_client_settings
 
 
3262
                    for value in old_client_settings.values():
 
 
3263
                        if isinstance(value["host"], bytes):
 
 
3264
                            value["host"] = (value["host"]
 
2524
3266
            os.remove(stored_state_path)
 
2525
3267
        except IOError as e:
 
2526
3268
            if e.errno == errno.ENOENT:
 
2527
 
                logger.warning("Could not load persistent state: {0}"
 
2528
 
                                .format(os.strerror(e.errno)))
 
 
3269
                logger.warning("Could not load persistent state:"
 
 
3270
                               " {}".format(os.strerror(e.errno)))
 
2530
3272
                logger.critical("Could not load persistent state:",
 
2533
3275
        except EOFError as e:
 
2534
3276
            logger.warning("Could not load persistent state: "
 
2535
 
                           "EOFError:", exc_info=e)
 
2537
3280
    with PGPEngine() as pgp:
 
2538
 
        for client_name, client in clients_data.iteritems():
 
 
3281
        for client_name, client in clients_data.items():
 
 
3282
            # Skip removed clients
 
 
3283
            if client_name not in client_settings:
 
2539
3286
            # Decide which value to use after restoring saved state.
 
2540
3287
            # We have three different values: Old config file,
 
2541
3288
            # new config file, and saved state.
 
 
2599
3346
    for client_name in (set(client_settings)
 
2600
3347
                        - set(old_client_settings)):
 
2601
3348
        clients_data[client_name] = client_settings[client_name]
 
2603
3350
    # Create all client objects
 
2604
 
    for client_name, client in clients_data.iteritems():
 
 
3351
    for client_name, client in clients_data.items():
 
2605
3352
        tcp_server.clients[client_name] = client_class(
 
2606
 
            name = client_name, settings = client)
 
 
3355
            server_settings=server_settings)
 
2608
3357
    if not tcp_server.clients:
 
2609
3358
        logger.warning("No clients defined")
 
2611
3360
    if not foreground:
 
2612
3361
        if pidfile is not None:
 
2616
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
3365
                    print(pid, file=pidfile)
 
2617
3366
            except IOError:
 
2618
3367
                logger.error("Could not write to file %r with PID %d",
 
2619
3368
                             pidfilename, pid)
 
2621
3370
        del pidfilename
 
2623
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2624
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3372
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3373
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3374
                             lambda: main_loop.quit() and False)
 
2627
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2628
 
                                        "se.bsnet.fukt.Mandos"})
 
2629
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3378
        @alternate_dbus_interfaces(
 
 
3379
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3380
        class MandosDBusService(DBusObjectWithObjectManager):
 
2630
3381
            """A D-Bus proxy object"""
 
2631
3383
            def __init__(self):
 
2632
3384
                dbus.service.Object.__init__(self, bus, "/")
 
2633
3386
            _interface = "se.recompile.Mandos"
 
2635
 
            @dbus_interface_annotations(_interface)
 
2637
 
                return { "org.freedesktop.DBus.Property"
 
2638
 
                         ".EmitsChangedSignal":
 
2641
3388
            @dbus.service.signal(_interface, signature="o")
 
2642
3389
            def ClientAdded(self, objpath):
 
2646
3393
            @dbus.service.signal(_interface, signature="ss")
 
2647
 
            def ClientNotFound(self, fingerprint, address):
 
 
3394
            def ClientNotFound(self, key_id, address):
 
 
3398
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2651
3400
            @dbus.service.signal(_interface, signature="os")
 
2652
3401
            def ClientRemoved(self, objpath, name):
 
 
3405
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2656
3407
            @dbus.service.method(_interface, out_signature="ao")
 
2657
3408
            def GetAllClients(self):
 
2659
 
                return dbus.Array(c.dbus_object_path
 
2661
 
                                  tcp_server.clients.itervalues())
 
 
3410
                return dbus.Array(c.dbus_object_path for c in
 
 
3411
                                  tcp_server.clients.values())
 
 
3413
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2663
3415
            @dbus.service.method(_interface,
 
2664
3416
                                 out_signature="a{oa{sv}}")
 
2665
3417
            def GetAllClientsWithProperties(self):
 
2667
3419
                return dbus.Dictionary(
 
2668
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2669
 
                     for c in tcp_server.clients.itervalues()),
 
 
3420
                    {c.dbus_object_path: c.GetAll(
 
 
3421
                        "se.recompile.Mandos.Client")
 
 
3422
                     for c in tcp_server.clients.values()},
 
2670
3423
                    signature="oa{sv}")
 
2672
3425
            @dbus.service.method(_interface, in_signature="o")
 
2673
3426
            def RemoveClient(self, object_path):
 
2675
 
                for c in tcp_server.clients.itervalues():
 
 
3428
                for c in tcp_server.clients.values():
 
2676
3429
                    if c.dbus_object_path == object_path:
 
2677
3430
                        del tcp_server.clients[c.name]
 
2678
3431
                        c.remove_from_connection()
 
2679
 
                        # Don't signal anything except ClientRemoved
 
 
3432
                        # Don't signal the disabling
 
2680
3433
                        c.disable(quiet=True)
 
2682
 
                        self.ClientRemoved(object_path, c.name)
 
 
3434
                        # Emit D-Bus signal for removal
 
 
3435
                        self.client_removed_signal(c)
 
2684
3437
                raise KeyError(object_path)
 
 
3441
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3442
                                 out_signature="a{oa{sa{sv}}}")
 
 
3443
            def GetManagedObjects(self):
 
 
3445
                return dbus.Dictionary(
 
 
3446
                    {client.dbus_object_path:
 
 
3448
                         {interface: client.GetAll(interface)
 
 
3450
                          client._get_all_interface_names()})
 
 
3451
                     for client in tcp_server.clients.values()})
 
 
3453
            def client_added_signal(self, client):
 
 
3454
                """Send the new standard signal and the old signal"""
 
 
3456
                    # New standard signal
 
 
3457
                    self.InterfacesAdded(
 
 
3458
                        client.dbus_object_path,
 
 
3460
                            {interface: client.GetAll(interface)
 
 
3462
                             client._get_all_interface_names()}))
 
 
3464
                    self.ClientAdded(client.dbus_object_path)
 
 
3466
            def client_removed_signal(self, client):
 
 
3467
                """Send the new standard signal and the old signal"""
 
 
3469
                    # New standard signal
 
 
3470
                    self.InterfacesRemoved(
 
 
3471
                        client.dbus_object_path,
 
 
3472
                        client._get_all_interface_names())
 
 
3474
                    self.ClientRemoved(client.dbus_object_path,
 
2688
3477
        mandos_dbus_service = MandosDBusService()
 
 
3479
    # Save modules to variables to exempt the modules from being
 
 
3480
    # unloaded before the function registered with atexit() is run.
 
 
3481
    mp = multiprocessing
 
2691
3485
        "Cleanup function; run on exit"
 
2694
 
        multiprocessing.active_children()
 
 
3489
        mp.active_children()
 
2695
3491
        if not (tcp_server.clients or client_settings):
 
2698
3494
        # Store client before exiting. Secrets are encrypted with key
 
2699
3495
        # based on what config file has. If config file is
 
2700
3496
        # removed/edited, old secret will thus be unrecovable.
 
2702
3498
        with PGPEngine() as pgp:
 
2703
 
            for client in tcp_server.clients.itervalues():
 
 
3499
            for client in tcp_server.clients.values():
 
2704
3500
                key = client_settings[client.name]["secret"]
 
2705
3501
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2707
3503
                client_dict = {}
 
2709
3505
                # A list of attributes that can not be pickled
 
2711
 
                exclude = set(("bus", "changedstate", "secret",
 
2713
 
                for name, typ in (inspect.getmembers
 
2714
 
                                  (dbus.service.Object)):
 
 
3507
                exclude = {"bus", "changedstate", "secret",
 
 
3508
                           "checker", "server_settings"}
 
 
3509
                for name, typ in inspect.getmembers(dbus.service
 
2715
3511
                    exclude.add(name)
 
2717
3513
                client_dict["encrypted_secret"] = (client
 
2718
3514
                                                   .encrypted_secret)
 
2719
3515
                for attr in client.client_structure:
 
2720
3516
                    if attr not in exclude:
 
2721
3517
                        client_dict[attr] = getattr(client, attr)
 
2723
3519
                clients[client.name] = client_dict
 
2724
3520
                del client_settings[client.name]["secret"]
 
2727
 
            with (tempfile.NamedTemporaryFile
 
2728
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2729
 
                   dir=os.path.dirname(stored_state_path),
 
2730
 
                   delete=False)) as stored_state:
 
2731
 
                pickle.dump((clients, client_settings), stored_state)
 
2732
 
                tempname=stored_state.name
 
 
3523
            with tempfile.NamedTemporaryFile(
 
 
3527
                    dir=os.path.dirname(stored_state_path),
 
 
3528
                    delete=False) as stored_state:
 
 
3529
                pickle.dump((clients, client_settings), stored_state,
 
 
3531
                tempname = stored_state.name
 
2733
3532
            os.rename(tempname, stored_state_path)
 
2734
3533
        except (IOError, OSError) as e: