65
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
66
73
import multiprocessing
 
73
82
import dbus.service
 
 
83
from gi.repository import GLib
 
76
84
from dbus.mainloop.glib import DBusGMainLoop
 
79
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:
 
84
94
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
85
95
except AttributeError:
 
 
97
        # This is where SO_BINDTODEVICE was up to and including Python
 
87
99
        from IN import SO_BINDTODEVICE
 
88
100
    except ImportError:
 
89
 
        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:
 
92
119
stored_state_file = "clients.pickle"
 
94
121
logger = logging.getLogger()
 
95
 
syslogger = (logging.handlers.SysLogHandler
 
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
 
              address = str("/dev/log")))
 
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
 
                      (ctypes.util.find_library("c"))
 
 
125
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
126
        ctypes.util.find_library("c")).if_nametoindex
 
103
127
except (OSError, AttributeError):
 
104
129
    def if_nametoindex(interface):
 
105
130
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
131
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
132
        with contextlib.closing(socket.socket()) as s:
 
108
133
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
 
                                struct.pack(str("16s16x"),
 
111
 
        interface_index = struct.unpack(str("I"),
 
 
134
                                struct.pack(b"16s16x", interface))
 
 
135
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
113
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__,
 
116
155
def initlogger(debug, level=logging.WARNING):
 
117
156
    """init logger and add loglevel"""
 
 
159
    syslogger = (logging.handlers.SysLogHandler(
 
 
160
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
119
162
    syslogger.setFormatter(logging.Formatter
 
120
163
                           ('Mandos [%(process)d]: %(levelname)s:'
 
122
165
    logger.addHandler(syslogger)
 
125
168
        console = logging.StreamHandler()
 
126
169
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
171
226
            os.rmdir(self.tempdir)
 
172
227
            self.tempdir = None
 
174
229
    def password_encode(self, password):
 
175
230
        # Passphrase can not be empty and can not contain newlines or
 
176
231
        # NUL bytes.  So we prefix it and hex encode it.
 
177
 
        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"))
 
179
240
    def encrypt(self, data, password):
 
180
 
        self.gnupg.passphrase = self.password_encode(password)
 
181
 
        with open(os.devnull, "w") as devnull:
 
183
 
                proc = self.gnupg.run(['--symmetric'],
 
184
 
                                      create_fhs=['stdin', 'stdout'],
 
185
 
                                      attach_fhs={'stderr': devnull})
 
186
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
188
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
 
                    ciphertext = f.read()
 
193
 
        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:
 
194
256
        return ciphertext
 
196
258
    def decrypt(self, data, password):
 
197
 
        self.gnupg.passphrase = self.password_encode(password)
 
198
 
        with open(os.devnull, "w") as devnull:
 
200
 
                proc = self.gnupg.run(['--decrypt'],
 
201
 
                                      create_fhs=['stdin', 'stdout'],
 
202
 
                                      attach_fhs={'stderr': devnull})
 
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
205
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
 
                    decrypted_plaintext = f.read()
 
210
 
        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:
 
211
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
 
214
303
class AvahiError(Exception):
 
215
304
    def __init__(self, value, *args, **kwargs):
 
216
305
        self.value = value
 
217
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
218
 
    def __unicode__(self):
 
219
 
        return unicode(repr(self.value))
 
 
306
        return super(AvahiError, self).__init__(value, *args,
 
221
310
class AvahiServiceError(AvahiError):
 
224
314
class AvahiGroupError(AvahiError):
 
228
318
class AvahiService(object):
 
229
319
    """An Avahi (Zeroconf) service.
 
232
322
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
233
323
               Used to optionally bind to the specified interface.
 
234
324
    name: string; Example: 'Mandos'
 
235
325
    type: string; Example: '_mandos._tcp'.
 
236
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
326
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
237
327
    port: integer; what port to announce
 
238
328
    TXT: list of strings; TXT record for the service
 
239
329
    domain: string; Domain to publish on, default to .local if empty.
 
 
376
488
                                    follow_name_owner_changes=True),
 
377
489
                avahi.DBUS_INTERFACE_SERVER)
 
378
490
        self.server.connect_to_signal("StateChanged",
 
379
 
                                 self.server_state_changed)
 
 
491
                                      self.server_state_changed)
 
380
492
        self.server_state_changed(self.server.GetState())
 
382
495
class AvahiServiceToSyslog(AvahiService):
 
 
496
    def rename(self, *args, **kwargs):
 
384
497
        """Add the new name to the syslog messages"""
 
385
 
        ret = AvahiService.rename(self)
 
386
 
        syslogger.setFormatter(logging.Formatter
 
387
 
                               ('Mandos ({0}) [%(process)d]:'
 
388
 
                                ' %(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'
 
392
 
def timedelta_to_milliseconds(td):
 
393
 
    "Convert a datetime.timedelta() to milliseconds"
 
394
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
395
 
            + (td.seconds * 1000)
 
396
 
            + (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))
 
398
817
class Client(object):
 
399
818
    """A representation of a client host served by this server.
 
402
821
    approved:   bool(); 'None' if not yet approved/disapproved
 
403
822
    approval_delay: datetime.timedelta(); Time to wait for approval
 
404
823
    approval_duration: datetime.timedelta(); Duration of one approval
 
405
 
    checker:    subprocess.Popen(); a running checker process used
 
406
 
                                    to see if the client lives.
 
407
 
                                    'None' if no process is running.
 
408
 
    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
 
409
828
    checker_command: string; External command which is run to check
 
410
829
                     if client lives.  %() expansions are done at
 
411
830
                     runtime with vars(self) as dict, so that for
 
412
831
                     instance %(name)s can be used in the command.
 
413
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
832
    checker_initiator_tag: a GLib event source tag, or None
 
414
833
    created:    datetime.datetime(); (UTC) object creation
 
415
834
    client_structure: Object describing what attributes a client has
 
416
835
                      and is used for storing the client at exit
 
417
836
    current_checker_command: string; current running checker_command
 
418
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
837
    disable_initiator_tag: a GLib event source tag, or None
 
420
839
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
421
 
                 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
 
422
843
    host:       string; available for use by the checker command
 
423
844
    interval:   datetime.timedelta(); How often to start a new checker
 
424
845
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
586
1002
            logger.info("Disabling client %s", self.name)
 
587
1003
        if getattr(self, "disable_initiator_tag", None) is not None:
 
588
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1004
            GLib.source_remove(self.disable_initiator_tag)
 
589
1005
            self.disable_initiator_tag = None
 
590
1006
        self.expires = None
 
591
1007
        if getattr(self, "checker_initiator_tag", None) is not None:
 
592
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1008
            GLib.source_remove(self.checker_initiator_tag)
 
593
1009
            self.checker_initiator_tag = None
 
594
1010
        self.stop_checker()
 
595
1011
        self.enabled = False
 
597
1013
            self.send_changedstate()
 
598
 
        # 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
 
601
1017
    def __del__(self):
 
604
1020
    def init_checker(self):
 
605
1021
        # Schedule a new checker to be started an 'interval' from now,
 
606
1022
        # and every interval from then on.
 
607
1023
        if self.checker_initiator_tag is not None:
 
608
 
            gobject.source_remove(self.checker_initiator_tag)
 
609
 
        self.checker_initiator_tag = (gobject.timeout_add
 
610
 
                                      (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),
 
612
1028
        # Schedule a disable() when 'timeout' has passed
 
613
1029
        if self.disable_initiator_tag is not None:
 
614
 
            gobject.source_remove(self.disable_initiator_tag)
 
615
 
        self.disable_initiator_tag = (gobject.timeout_add
 
616
 
                                   (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)
 
618
1033
        # Also start a new checker *right now*.
 
619
1034
        self.start_checker()
 
621
 
    def checker_callback(self, pid, condition, command):
 
 
1036
    def checker_callback(self, source, condition, connection,
 
622
1038
        """The checker has completed, so take appropriate actions."""
 
 
1039
        # Read return code from connection (see call_pipe)
 
 
1040
        returncode = connection.recv()
 
623
1043
        self.checker_callback_tag = None
 
624
1044
        self.checker = None
 
625
 
        if os.WIFEXITED(condition):
 
626
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1047
            self.last_checker_status = returncode
 
 
1048
            self.last_checker_signal = None
 
627
1049
            if self.last_checker_status == 0:
 
628
1050
                logger.info("Checker for %(name)s succeeded",
 
630
1052
                self.checked_ok()
 
632
 
                logger.info("Checker for %(name)s failed",
 
 
1054
                logger.info("Checker for %(name)s failed", vars(self))
 
635
1056
            self.last_checker_status = -1
 
 
1057
            self.last_checker_signal = -returncode
 
636
1058
            logger.warning("Checker for %(name)s crashed?",
 
639
1062
    def checked_ok(self):
 
640
1063
        """Assert that the client has been seen, alive and well."""
 
641
1064
        self.last_checked_ok = datetime.datetime.utcnow()
 
642
1065
        self.last_checker_status = 0
 
 
1066
        self.last_checker_signal = None
 
643
1067
        self.bump_timeout()
 
645
1069
    def bump_timeout(self, timeout=None):
 
646
1070
        """Bump up the timeout for this client."""
 
647
1071
        if timeout is None:
 
648
1072
            timeout = self.timeout
 
649
1073
        if self.disable_initiator_tag is not None:
 
650
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1074
            GLib.source_remove(self.disable_initiator_tag)
 
651
1075
            self.disable_initiator_tag = None
 
652
1076
        if getattr(self, "enabled", False):
 
653
 
            self.disable_initiator_tag = (gobject.timeout_add
 
654
 
                                          (timedelta_to_milliseconds
 
655
 
                                           (timeout), self.disable))
 
 
1077
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1078
                int(timeout.total_seconds() * 1000), self.disable)
 
656
1079
            self.expires = datetime.datetime.utcnow() + timeout
 
658
1081
    def need_approval(self):
 
659
1082
        self.last_approval_request = datetime.datetime.utcnow()
 
661
1084
    def start_checker(self):
 
662
1085
        """Start a new checker subprocess if one is not running.
 
664
1087
        If a checker already exists, leave it running and do
 
666
1089
        # The reason for not killing a running checker is that if we
 
 
671
1094
        # checkers alone, the checker would have to take more time
 
672
1095
        # than 'timeout' for the client to be disabled, which is as it
 
675
 
        # If a checker exists, make sure it is not a zombie
 
677
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
678
 
        except (AttributeError, OSError) as error:
 
679
 
            if (isinstance(error, OSError)
 
680
 
                and error.errno != errno.ECHILD):
 
684
 
                logger.warning("Checker was a zombie")
 
685
 
                gobject.source_remove(self.checker_callback_tag)
 
686
 
                self.checker_callback(pid, status,
 
687
 
                                      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")
 
688
1102
        # Start a new checker if needed
 
689
1103
        if self.checker is None:
 
 
1104
            # Escape attributes for the shell
 
 
1106
                attr: re.escape(str(getattr(self, attr)))
 
 
1107
                for attr in self.runtime_expansions}
 
691
 
                # In case checker_command has exactly one % operator
 
692
 
                command = self.checker_command % self.host
 
694
 
                # Escape attributes for the shell
 
695
 
                escaped_attrs = dict(
 
697
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
701
 
                    self.runtime_expansions)
 
704
 
                    command = self.checker_command % escaped_attrs
 
705
 
                except TypeError as error:
 
706
 
                    logger.error('Could not format string "%s"',
 
707
 
                                 self.checker_command, exc_info=error)
 
708
 
                    return True # Try again later
 
 
1109
                command = self.checker_command % escaped_attrs
 
 
1110
            except TypeError as error:
 
 
1111
                logger.error('Could not format string "%s"',
 
 
1112
                             self.checker_command,
 
 
1114
                return True     # Try again later
 
709
1115
            self.current_checker_command = command
 
711
 
                logger.info("Starting checker %r for %s",
 
713
 
                # We don't need to redirect stdout and stderr, since
 
714
 
                # in normal mode, that is already done by daemon(),
 
715
 
                # and in debug mode we don't want to.  (Stdin is
 
716
 
                # always replaced by /dev/null.)
 
717
 
                self.checker = subprocess.Popen(command,
 
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
 
            except OSError as error:
 
731
 
                logger.error("Failed to start subprocess",
 
733
 
        # 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
 
736
1144
    def stop_checker(self):
 
737
1145
        """Force the checker process, if any, to stop."""
 
738
1146
        if self.checker_callback_tag:
 
739
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1147
            GLib.source_remove(self.checker_callback_tag)
 
740
1148
            self.checker_callback_tag = None
 
741
1149
        if getattr(self, "checker", None) is None:
 
743
1151
        logger.debug("Stopping checker for %(name)s", vars(self))
 
745
 
            self.checker.terminate()
 
747
 
            #if self.checker.poll() is None:
 
748
 
            #    self.checker.kill()
 
749
 
        except OSError as error:
 
750
 
            if error.errno != errno.ESRCH: # No such process
 
 
1152
        self.checker.terminate()
 
752
1153
        self.checker = None
 
755
 
def dbus_service_property(dbus_interface, signature="v",
 
756
 
                          access="readwrite", byte_arrays=False):
 
 
1156
def dbus_service_property(dbus_interface,
 
757
1160
    """Decorators for marking methods of a DBusObjectWithProperties to
 
758
1161
    become properties on the D-Bus.
 
760
1163
    The decorated method will be called with no arguments by "Get"
 
761
1164
    and with one argument by "Set".
 
763
1166
    The parameters, where they are supported, are the same as
 
764
1167
    dbus.service.method, except there is only "signature", since the
 
765
1168
    type from Get() and the type sent to Set() is the same.
 
 
841
 
class DBusObjectWithProperties(dbus.service.Object):
 
842
 
    """A D-Bus object with properties.
 
844
 
    Classes inheriting from this can use the dbus_service_property
 
845
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
846
 
    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.
 
850
1259
    def _is_dbus_thing(thing):
 
851
1260
        """Returns a function testing if an attribute is a D-Bus thing
 
853
1262
        If called like _is_dbus_thing("method") it returns a function
 
854
1263
        suitable for use as predicate to inspect.getmembers().
 
856
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1265
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
859
1268
    def _get_all_dbus_things(self, thing):
 
860
1269
        """Returns a generator of (name, attribute) pairs
 
862
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1271
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
864
1272
                 athing.__get__(self))
 
865
1273
                for cls in self.__class__.__mro__
 
866
1274
                for name, athing in
 
867
 
                inspect.getmembers(cls,
 
868
 
                                   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.
 
870
1348
    def _get_dbus_property(self, interface_name, property_name):
 
871
1349
        """Returns a bound method if one exists which is a D-Bus
 
872
1350
        property with the specified name and interface.
 
874
 
        for cls in  self.__class__.__mro__:
 
875
 
            for name, value in (inspect.getmembers
 
877
 
                                 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")):
 
878
1355
                if (value._dbus_name == property_name
 
879
1356
                    and value._dbus_interface == interface_name):
 
880
1357
                    return value.__get__(self)
 
882
1359
        # No such property
 
883
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
884
 
                                   + interface_name + "."
 
887
 
    @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,
 
888
1374
                         out_signature="v")
 
889
1375
    def Get(self, interface_name, property_name):
 
890
1376
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1020
1505
        return xmlstring
 
1023
 
def datetime_to_dbus (dt, variant_level=0):
 
 
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",
 
 
1579
def datetime_to_dbus(dt, variant_level=0):
 
1024
1580
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1026
 
        return dbus.String("", variant_level = variant_level)
 
1027
 
    return dbus.String(dt.isoformat(),
 
1028
 
                       variant_level=variant_level)
 
 
1582
        return dbus.String("", variant_level=variant_level)
 
 
1583
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1031
1586
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1384
1947
        server to mandos-client
 
1388
1951
    # Rejected - signal
 
1389
1952
    @dbus.service.signal(_interface, signature="s")
 
1390
1953
    def Rejected(self, reason):
 
1394
1957
    # NeedApproval - signal
 
1395
1958
    @dbus.service.signal(_interface, signature="tb")
 
1396
1959
    def NeedApproval(self, timeout, default):
 
1398
1961
        return self.need_approval()
 
1402
1965
    # Approve - method
 
1403
1966
    @dbus.service.method(_interface, in_signature="b")
 
1404
1967
    def Approve(self, value):
 
1405
1968
        self.approve(value)
 
1407
1970
    # CheckedOK - method
 
1408
1971
    @dbus.service.method(_interface)
 
1409
1972
    def CheckedOK(self):
 
1410
1973
        self.checked_ok()
 
1412
1975
    # Enable - method
 
 
1976
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1413
1977
    @dbus.service.method(_interface)
 
1414
1978
    def Enable(self):
 
1418
1982
    # StartChecker - method
 
 
1983
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1419
1984
    @dbus.service.method(_interface)
 
1420
1985
    def StartChecker(self):
 
1422
1987
        self.start_checker()
 
1424
1989
    # Disable - method
 
 
1990
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1425
1991
    @dbus.service.method(_interface)
 
1426
1992
    def Disable(self):
 
1430
1996
    # StopChecker - method
 
 
1997
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1431
1998
    @dbus.service.method(_interface)
 
1432
1999
    def StopChecker(self):
 
1433
2000
        self.stop_checker()
 
1437
2004
    # ApprovalPending - property
 
1438
2005
    @dbus_service_property(_interface, signature="b", access="read")
 
1439
2006
    def ApprovalPending_dbus_property(self):
 
1440
2007
        return dbus.Boolean(bool(self.approvals_pending))
 
1442
2009
    # ApprovedByDefault - property
 
1443
 
    @dbus_service_property(_interface, signature="b",
 
 
2010
    @dbus_service_property(_interface,
 
1444
2012
                           access="readwrite")
 
1445
2013
    def ApprovedByDefault_dbus_property(self, value=None):
 
1446
2014
        if value is None:       # get
 
1447
2015
            return dbus.Boolean(self.approved_by_default)
 
1448
2016
        self.approved_by_default = bool(value)
 
1450
2018
    # ApprovalDelay - property
 
1451
 
    @dbus_service_property(_interface, signature="t",
 
 
2019
    @dbus_service_property(_interface,
 
1452
2021
                           access="readwrite")
 
1453
2022
    def ApprovalDelay_dbus_property(self, value=None):
 
1454
2023
        if value is None:       # get
 
1455
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2024
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1456
2026
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1458
2028
    # ApprovalDuration - property
 
1459
 
    @dbus_service_property(_interface, signature="t",
 
 
2029
    @dbus_service_property(_interface,
 
1460
2031
                           access="readwrite")
 
1461
2032
    def ApprovalDuration_dbus_property(self, value=None):
 
1462
2033
        if value is None:       # get
 
1463
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1464
 
                    self.approval_duration))
 
 
2034
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1465
2036
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1467
2038
    # Name - property
 
 
2040
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1468
2041
    @dbus_service_property(_interface, signature="s", access="read")
 
1469
2042
    def Name_dbus_property(self):
 
1470
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)
 
1472
2052
    # Fingerprint - property
 
 
2054
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1473
2055
    @dbus_service_property(_interface, signature="s", access="read")
 
1474
2056
    def Fingerprint_dbus_property(self):
 
1475
2057
        return dbus.String(self.fingerprint)
 
1477
2059
    # Host - property
 
1478
 
    @dbus_service_property(_interface, signature="s",
 
 
2060
    @dbus_service_property(_interface,
 
1479
2062
                           access="readwrite")
 
1480
2063
    def Host_dbus_property(self, value=None):
 
1481
2064
        if value is None:       # get
 
1482
2065
            return dbus.String(self.host)
 
1483
 
        self.host = unicode(value)
 
 
2066
        self.host = str(value)
 
1485
2068
    # Created - property
 
 
2070
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1486
2071
    @dbus_service_property(_interface, signature="s", access="read")
 
1487
2072
    def Created_dbus_property(self):
 
1488
2073
        return datetime_to_dbus(self.created)
 
1490
2075
    # LastEnabled - property
 
1491
2076
    @dbus_service_property(_interface, signature="s", access="read")
 
1492
2077
    def LastEnabled_dbus_property(self):
 
1493
2078
        return datetime_to_dbus(self.last_enabled)
 
1495
2080
    # Enabled - property
 
1496
 
    @dbus_service_property(_interface, signature="b",
 
 
2081
    @dbus_service_property(_interface,
 
1497
2083
                           access="readwrite")
 
1498
2084
    def Enabled_dbus_property(self, value=None):
 
1499
2085
        if value is None:       # get
 
 
1547
2134
                if (getattr(self, "disable_initiator_tag", None)
 
1550
 
                gobject.source_remove(self.disable_initiator_tag)
 
1551
 
                self.disable_initiator_tag = (
 
1552
 
                    gobject.timeout_add(
 
1553
 
                        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),
 
1556
2142
    # ExtendedTimeout - property
 
1557
 
    @dbus_service_property(_interface, signature="t",
 
 
2143
    @dbus_service_property(_interface,
 
1558
2145
                           access="readwrite")
 
1559
2146
    def ExtendedTimeout_dbus_property(self, value=None):
 
1560
2147
        if value is None:       # get
 
1561
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2148
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1562
2150
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1564
2152
    # Interval - property
 
1565
 
    @dbus_service_property(_interface, signature="t",
 
 
2153
    @dbus_service_property(_interface,
 
1566
2155
                           access="readwrite")
 
1567
2156
    def Interval_dbus_property(self, value=None):
 
1568
2157
        if value is None:       # get
 
1569
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2158
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1570
2159
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1571
2160
        if getattr(self, "checker_initiator_tag", None) is None:
 
1573
2162
        if self.enabled:
 
1574
2163
            # Reschedule checker run
 
1575
 
            gobject.source_remove(self.checker_initiator_tag)
 
1576
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1577
 
                                          (value, self.start_checker))
 
1578
 
            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
 
1580
2169
    # Checker - property
 
1581
 
    @dbus_service_property(_interface, signature="s",
 
 
2170
    @dbus_service_property(_interface,
 
1582
2172
                           access="readwrite")
 
1583
2173
    def Checker_dbus_property(self, value=None):
 
1584
2174
        if value is None:       # get
 
1585
2175
            return dbus.String(self.checker_command)
 
1586
 
        self.checker_command = unicode(value)
 
 
2176
        self.checker_command = str(value)
 
1588
2178
    # CheckerRunning - property
 
1589
 
    @dbus_service_property(_interface, signature="b",
 
 
2179
    @dbus_service_property(_interface,
 
1590
2181
                           access="readwrite")
 
1591
2182
    def CheckerRunning_dbus_property(self, value=None):
 
1592
2183
        if value is None:       # get
 
 
1639
2240
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1640
2241
    """A class to handle client connections.
 
1642
2243
    Instantiated once for each connection to handle it.
 
1643
2244
    Note: This will run in its own forked process."""
 
1645
2246
    def handle(self):
 
1646
2247
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1647
2248
            logger.info("TCP connection from: %s",
 
1648
 
                        unicode(self.client_address))
 
 
2249
                        str(self.client_address))
 
1649
2250
            logger.debug("Pipe FD: %d",
 
1650
2251
                         self.server.child_pipe.fileno())
 
1652
 
            session = (gnutls.connection
 
1653
 
                       .ClientSession(self.request,
 
1655
 
                                      .X509Credentials()))
 
1657
 
            # Note: gnutls.connection.X509Credentials is really a
 
1658
 
            # generic GnuTLS certificate credentials object so long as
 
1659
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1660
 
            # here despite using OpenPGP certificates.
 
1662
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1663
 
            #                      "+AES-256-CBC", "+SHA1",
 
1664
 
            #                      "+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",
 
1666
2259
            # Use a fallback default, since this MUST be set.
 
1667
2260
            priority = self.server.gnutls_priority
 
1668
2261
            if priority is None:
 
1669
2262
                priority = "NORMAL"
 
1670
 
            (gnutls.library.functions
 
1671
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2263
            gnutls.priority_set_direct(session._c_object,
 
 
2264
                                       priority.encode("utf-8"),
 
1674
2267
            # Start communication using the Mandos protocol
 
1675
2268
            # Get protocol number
 
1676
2269
            line = self.request.makefile().readline()
 
1677
2270
            logger.debug("Protocol version: %r", line)
 
1679
2272
                if int(line.strip().split()[0]) > 1:
 
 
2273
                    raise RuntimeError(line)
 
1681
2274
            except (ValueError, IndexError, RuntimeError) as error:
 
1682
2275
                logger.error("Unknown protocol version: %s", error)
 
1685
2278
            # Start GnuTLS connection
 
1687
2280
                session.handshake()
 
1688
 
            except gnutls.errors.GNUTLSError as error:
 
 
2281
            except gnutls.Error as error:
 
1689
2282
                logger.warning("Handshake failed: %s", error)
 
1690
2283
                # Do not run session.bye() here: the session is not
 
1691
2284
                # established.  Just abandon the request.
 
1693
2286
            logger.debug("Handshake succeeded")
 
1695
2288
            approval_required = False
 
1698
 
                    fpr = self.fingerprint(self.peer_certificate
 
1701
 
                        gnutls.errors.GNUTLSError) as error:
 
1702
 
                    logger.warning("Bad certificate: %s", error)
 
1704
 
                logger.debug("Fingerprint: %s", fpr)
 
1707
 
                    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,
 
1708
2312
                                         self.client_address)
 
1709
2313
                except KeyError:
 
1712
2316
                if client.approval_delay:
 
1713
2317
                    delay = client.approval_delay
 
1714
2318
                    client.approvals_pending += 1
 
1715
2319
                    approval_required = True
 
1718
2322
                    if not client.enabled:
 
1719
2323
                        logger.info("Client %s is disabled",
 
1721
2325
                        if self.server.use_dbus:
 
1722
2326
                            # Emit D-Bus signal
 
1723
2327
                            client.Rejected("Disabled")
 
1726
2330
                    if client.approved or not client.approval_delay:
 
1727
 
                        #We are approved or approval is disabled
 
 
2331
                        # We are approved or approval is disabled
 
1729
2333
                    elif client.approved is None:
 
1730
2334
                        logger.info("Client %s needs approval",
 
 
1765
2367
                        delay -= time2 - time
 
1768
 
                while sent_size < len(client.secret):
 
1770
 
                        sent = session.send(client.secret[sent_size:])
 
1771
 
                    except gnutls.errors.GNUTLSError as error:
 
1772
 
                        logger.warning("gnutls send failed",
 
1775
 
                    logger.debug("Sent: %d, remaining: %d",
 
1776
 
                                 sent, len(client.secret)
 
1777
 
                                 - (sent_size + sent))
 
 
2370
                    session.send(client.secret)
 
 
2371
                except gnutls.Error as error:
 
 
2372
                    logger.warning("gnutls send failed",
 
1780
2376
                logger.info("Sending secret to %s", client.name)
 
1781
2377
                # bump the timeout using extended_timeout
 
1782
2378
                client.bump_timeout(client.extended_timeout)
 
1783
2379
                if self.server.use_dbus:
 
1784
2380
                    # Emit D-Bus signal
 
1785
2381
                    client.GotSecret()
 
1788
2384
                if approval_required:
 
1789
2385
                    client.approvals_pending -= 1
 
1792
 
                except gnutls.errors.GNUTLSError as error:
 
 
2388
                except gnutls.Error as error:
 
1793
2389
                    logger.warning("GnuTLS bye failed",
 
1794
2390
                                   exc_info=error)
 
1797
2393
    def peer_certificate(session):
 
1798
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1799
 
        # If not an OpenPGP certificate...
 
1800
 
        if (gnutls.library.functions
 
1801
 
            .gnutls_certificate_type_get(session._c_object)
 
1802
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1803
 
            # ...do the normal thing
 
1804
 
            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
 
1805
2410
        list_size = ctypes.c_uint(1)
 
1806
 
        cert_list = (gnutls.library.functions
 
1807
 
                     .gnutls_certificate_get_peers
 
 
2411
        cert_list = (gnutls.certificate_get_peers
 
1808
2412
                     (session._c_object, ctypes.byref(list_size)))
 
1809
2413
        if not bool(cert_list) and list_size.value != 0:
 
1810
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2414
            raise gnutls.Error("error getting peer certificate")
 
1812
2415
        if list_size.value == 0:
 
1814
2417
        cert = cert_list[0]
 
1815
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()
 
1818
2455
    def fingerprint(openpgp):
 
1819
2456
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1820
2457
        # New GnuTLS "datum" with the OpenPGP public key
 
1821
 
        datum = (gnutls.library.types
 
1822
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1825
 
                                 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)))
 
1826
2462
        # New empty GnuTLS certificate
 
1827
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1828
 
        (gnutls.library.functions
 
1829
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2463
        crt = gnutls.openpgp_crt_t()
 
 
2464
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1830
2465
        # Import the OpenPGP public key into the certificate
 
1831
 
        (gnutls.library.functions
 
1832
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1833
 
                                    gnutls.library.constants
 
1834
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2466
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2467
                                  gnutls.OPENPGP_FMT_RAW)
 
1835
2468
        # Verify the self signature in the key
 
1836
2469
        crtverify = ctypes.c_uint()
 
1837
 
        (gnutls.library.functions
 
1838
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1839
 
                                         ctypes.byref(crtverify)))
 
 
2470
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2471
                                       ctypes.byref(crtverify))
 
1840
2472
        if crtverify.value != 0:
 
1841
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1842
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2473
            gnutls.openpgp_crt_deinit(crt)
 
 
2474
            raise gnutls.CertificateSecurityError(code
 
1844
2476
        # New buffer for the fingerprint
 
1845
2477
        buf = ctypes.create_string_buffer(20)
 
1846
2478
        buf_len = ctypes.c_size_t()
 
1847
2479
        # Get the fingerprint from the certificate into the buffer
 
1848
 
        (gnutls.library.functions
 
1849
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1850
 
                                             ctypes.byref(buf_len)))
 
 
2480
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2481
                                           ctypes.byref(buf_len))
 
1851
2482
        # Deinit the certificate
 
1852
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2483
        gnutls.openpgp_crt_deinit(crt)
 
1853
2484
        # Convert the buffer to a Python bytestring
 
1854
2485
        fpr = ctypes.string_at(buf, buf_len.value)
 
1855
2486
        # Convert the bytestring to hexadecimal notation
 
 
1860
2491
class MultiprocessingMixIn(object):
 
1861
2492
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1862
2494
    def sub_process_main(self, request, address):
 
1864
2496
            self.finish_request(request, address)
 
1865
2497
        except Exception:
 
1866
2498
            self.handle_error(request, address)
 
1867
2499
        self.close_request(request)
 
1869
2501
    def process_request(self, request, address):
 
1870
2502
        """Start a new process to process the request."""
 
1871
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1872
 
                                       args = (request, address))
 
 
2503
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2504
                                       args=(request, address))
 
1877
2509
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1878
2510
    """ adds a pipe to the MixIn """
 
1879
2512
    def process_request(self, request, client_address):
 
1880
2513
        """Overrides and wraps the original process_request().
 
1882
2515
        This function creates a new pipe in self.pipe
 
1884
2517
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1886
2519
        proc = MultiprocessingMixIn.process_request(self, request,
 
1887
2520
                                                    client_address)
 
1888
2521
        self.child_pipe.close()
 
1889
2522
        self.add_pipe(parent_pipe, proc)
 
1891
2524
    def add_pipe(self, parent_pipe, proc):
 
1892
2525
        """Dummy function; override as necessary"""
 
1893
 
        raise NotImplementedError
 
 
2526
        raise NotImplementedError()
 
1896
2529
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1897
2530
                     socketserver.TCPServer, object):
 
1898
2531
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1901
2534
        enabled:        Boolean; whether this server is activated yet
 
1902
2535
        interface:      None or a network interface name (string)
 
1903
2536
        use_ipv6:       Boolean; to use IPv6 or not
 
1905
2539
    def __init__(self, server_address, RequestHandlerClass,
 
1906
 
                 interface=None, use_ipv6=True):
 
 
2543
        """If socketfd is set, use that file descriptor instead of
 
 
2544
        creating a new one with socket.socket().
 
1907
2546
        self.interface = interface
 
1909
2548
            self.address_family = socket.AF_INET6
 
 
2549
        if socketfd is not None:
 
 
2550
            # Save the file descriptor
 
 
2551
            self.socketfd = socketfd
 
 
2552
            # Save the original socket.socket() function
 
 
2553
            self.socket_socket = socket.socket
 
 
2555
            # To implement --socket, we monkey patch socket.socket.
 
 
2557
            # (When socketserver.TCPServer is a new-style class, we
 
 
2558
            # could make self.socket into a property instead of monkey
 
 
2559
            # patching socket.socket.)
 
 
2561
            # Create a one-time-only replacement for socket.socket()
 
 
2562
            @functools.wraps(socket.socket)
 
 
2563
            def socket_wrapper(*args, **kwargs):
 
 
2564
                # Restore original function so subsequent calls are
 
 
2566
                socket.socket = self.socket_socket
 
 
2567
                del self.socket_socket
 
 
2568
                # This time only, return a new socket object from the
 
 
2569
                # saved file descriptor.
 
 
2570
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
2571
            # Replace socket.socket() function with wrapper
 
 
2572
            socket.socket = socket_wrapper
 
 
2573
        # The socketserver.TCPServer.__init__ will call
 
 
2574
        # socket.socket(), which might be our replacement,
 
 
2575
        # socket_wrapper(), if socketfd was set.
 
1910
2576
        socketserver.TCPServer.__init__(self, server_address,
 
1911
2577
                                        RequestHandlerClass)
 
1912
2579
    def server_bind(self):
 
1913
2580
        """This overrides the normal server_bind() function
 
1914
2581
        to bind to an interface if one was specified, and also NOT to
 
1915
2582
        bind to an address or port if they were not specified."""
 
 
2583
        global SO_BINDTODEVICE
 
1916
2584
        if self.interface is not None:
 
1917
2585
            if SO_BINDTODEVICE is None:
 
1918
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1919
 
                             " cannot bind to interface %s",
 
1923
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1927
 
                except socket.error as error:
 
1928
 
                    if error[0] == errno.EPERM:
 
1929
 
                        logger.error("No permission to"
 
1930
 
                                     " bind to interface %s",
 
1932
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1933
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1934
 
                                     " cannot bind to interface %s",
 
 
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)
 
1938
2607
        # Only bind(2) the socket if we really need to.
 
1939
2608
        if self.server_address[0] or self.server_address[1]:
 
 
2609
            if self.server_address[1]:
 
 
2610
                self.allow_reuse_address = True
 
1940
2611
            if not self.server_address[0]:
 
1941
2612
                if self.address_family == socket.AF_INET6:
 
1942
 
                    any_address = "::" # in6addr_any
 
 
2613
                    any_address = "::"  # in6addr_any
 
1944
 
                    any_address = socket.INADDR_ANY
 
 
2615
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1945
2616
                self.server_address = (any_address,
 
1946
2617
                                       self.server_address[1])
 
1947
2618
            elif not self.server_address[1]:
 
1948
 
                self.server_address = (self.server_address[0],
 
 
2619
                self.server_address = (self.server_address[0], 0)
 
1950
2620
#                 if self.interface:
 
1951
2621
#                     self.server_address = (self.server_address[0],
 
 
1977
2652
        self.gnutls_priority = gnutls_priority
 
1978
2653
        IPv6_TCPServer.__init__(self, server_address,
 
1979
2654
                                RequestHandlerClass,
 
1980
 
                                interface = interface,
 
1981
 
                                use_ipv6 = use_ipv6)
 
 
2655
                                interface=interface,
 
1982
2659
    def server_activate(self):
 
1983
2660
        if self.enabled:
 
1984
2661
            return socketserver.TCPServer.server_activate(self)
 
1986
2663
    def enable(self):
 
1987
2664
        self.enabled = True
 
1989
2666
    def add_pipe(self, parent_pipe, proc):
 
1990
2667
        # Call "handle_ipc" for both data and EOF events
 
1991
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1992
 
                             gobject.IO_IN | gobject.IO_HUP,
 
1993
 
                             functools.partial(self.handle_ipc,
 
1998
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1999
 
                   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):
 
2000
2679
        # error, or the other end of multiprocessing.Pipe has closed
 
2001
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2680
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2002
2681
            # Wait for other process to exit
 
2006
2685
        # Read a request from the child
 
2007
2686
        request = parent_pipe.recv()
 
2008
2687
        command = request[0]
 
2010
2689
        if command == 'init':
 
2012
 
            address = request[2]
 
2014
 
            for c in self.clients.itervalues():
 
2015
 
                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:
 
2019
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2020
 
                            "dress: %s", fpr, address)
 
 
2704
                logger.info("Client not found for key ID: %s, address"
 
 
2705
                            ": %s", key_id or fpr, address)
 
2021
2706
                if self.use_dbus:
 
2022
2707
                    # Emit D-Bus signal
 
2023
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2708
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2025
2710
                parent_pipe.send(False)
 
2028
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
2029
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
2030
 
                                 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))
 
2036
2720
            parent_pipe.send(True)
 
2037
2721
            # remove the old hook in favor of the new above hook on
 
 
2041
2725
            funcname = request[1]
 
2042
2726
            args = request[2]
 
2043
2727
            kwargs = request[3]
 
2045
2729
            parent_pipe.send(('data', getattr(client_object,
 
2046
2730
                                              funcname)(*args,
 
2049
2733
        if command == 'getattr':
 
2050
2734
            attrname = request[1]
 
2051
 
            if callable(client_object.__getattribute__(attrname)):
 
2052
 
                parent_pipe.send(('function',))
 
 
2735
            if isinstance(client_object.__getattribute__(attrname),
 
 
2736
                          collections.Callable):
 
 
2737
                parent_pipe.send(('function', ))
 
2054
 
                parent_pipe.send(('data', client_object
 
2055
 
                                  .__getattribute__(attrname)))
 
 
2740
                    'data', client_object.__getattribute__(attrname)))
 
2057
2742
        if command == 'setattr':
 
2058
2743
            attrname = request[1]
 
2059
2744
            value = request[2]
 
2060
2745
            setattr(client_object, attrname, value)
 
 
2750
def rfc3339_duration_to_delta(duration):
 
 
2751
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2753
    >>> rfc3339_duration_to_delta("P7D")
 
 
2754
    datetime.timedelta(7)
 
 
2755
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2756
    datetime.timedelta(0, 60)
 
 
2757
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2758
    datetime.timedelta(0, 3600)
 
 
2759
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2760
    datetime.timedelta(1)
 
 
2761
    >>> rfc3339_duration_to_delta("P1W")
 
 
2762
    datetime.timedelta(7)
 
 
2763
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2764
    datetime.timedelta(0, 330)
 
 
2765
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2766
    datetime.timedelta(1, 200)
 
 
2769
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2770
    # possible - there would have to be multiple places for the same
 
 
2771
    # values, like seconds.  The current code, while more esoteric, is
 
 
2772
    # cleaner without depending on a parsing library.  If Python had a
 
 
2773
    # built-in library for parsing we would use it, but we'd like to
 
 
2774
    # avoid excessive use of external libraries.
 
 
2776
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2777
    Token = collections.namedtuple("Token", (
 
 
2778
        "regexp",  # To match token; if "value" is not None, must have
 
 
2779
                   # a "group" containing digits
 
 
2780
        "value",   # datetime.timedelta or None
 
 
2781
        "followers"))           # Tokens valid after this token
 
 
2782
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2783
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2784
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2785
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2786
                         datetime.timedelta(seconds=1),
 
 
2787
                         frozenset((token_end, )))
 
 
2788
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2789
                         datetime.timedelta(minutes=1),
 
 
2790
                         frozenset((token_second, token_end)))
 
 
2791
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2792
                       datetime.timedelta(hours=1),
 
 
2793
                       frozenset((token_minute, token_end)))
 
 
2794
    token_time = Token(re.compile(r"T"),
 
 
2796
                       frozenset((token_hour, token_minute,
 
 
2798
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2799
                      datetime.timedelta(days=1),
 
 
2800
                      frozenset((token_time, token_end)))
 
 
2801
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2802
                        datetime.timedelta(weeks=4),
 
 
2803
                        frozenset((token_day, token_end)))
 
 
2804
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2805
                       datetime.timedelta(weeks=52),
 
 
2806
                       frozenset((token_month, token_end)))
 
 
2807
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2808
                       datetime.timedelta(weeks=1),
 
 
2809
                       frozenset((token_end, )))
 
 
2810
    token_duration = Token(re.compile(r"P"), None,
 
 
2811
                           frozenset((token_year, token_month,
 
 
2812
                                      token_day, token_time,
 
 
2814
    # Define starting values:
 
 
2816
    value = datetime.timedelta()
 
 
2818
    # Following valid tokens
 
 
2819
    followers = frozenset((token_duration, ))
 
 
2820
    # String left to parse
 
 
2822
    # Loop until end token is found
 
 
2823
    while found_token is not token_end:
 
 
2824
        # Search for any currently valid tokens
 
 
2825
        for token in followers:
 
 
2826
            match = token.regexp.match(s)
 
 
2827
            if match is not None:
 
 
2829
                if token.value is not None:
 
 
2830
                    # Value found, parse digits
 
 
2831
                    factor = int(match.group(1), 10)
 
 
2832
                    # Add to value so far
 
 
2833
                    value += factor * token.value
 
 
2834
                # Strip token from string
 
 
2835
                s = token.regexp.sub("", s, 1)
 
 
2838
                # Set valid next tokens
 
 
2839
                followers = found_token.followers
 
 
2842
            # No currently valid tokens were found
 
 
2843
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2065
2849
def string_to_delta(interval):
 
2066
2850
    """Parse a string and return a datetime.timedelta
 
2068
2852
    >>> string_to_delta('7d')
 
2069
2853
    datetime.timedelta(7)
 
2070
2854
    >>> string_to_delta('60s')
 
 
2160
2949
    parser.add_argument("--no-dbus", action="store_false",
 
2161
2950
                        dest="use_dbus", help="Do not provide D-Bus"
 
2162
 
                        " system bus interface")
 
 
2951
                        " system bus interface", default=None)
 
2163
2952
    parser.add_argument("--no-ipv6", action="store_false",
 
2164
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2953
                        dest="use_ipv6", help="Do not use IPv6",
 
2165
2955
    parser.add_argument("--no-restore", action="store_false",
 
2166
2956
                        dest="restore", help="Do not restore stored"
 
 
2957
                        " state", default=None)
 
 
2958
    parser.add_argument("--socket", type=int,
 
 
2959
                        help="Specify a file descriptor to a network"
 
 
2960
                        " socket to use instead of creating one")
 
2168
2961
    parser.add_argument("--statedir", metavar="DIR",
 
2169
2962
                        help="Directory to save/restore state in")
 
 
2963
    parser.add_argument("--foreground", action="store_true",
 
 
2964
                        help="Run in foreground", default=None)
 
 
2965
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2966
                        dest="zeroconf", help="Do not use Zeroconf",
 
2171
2969
    options = parser.parse_args()
 
2173
2971
    if options.check:
 
 
2973
        fail_count, test_count = doctest.testmod()
 
 
2974
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2178
2976
    # Default values for config file for server-global settings
 
2179
 
    server_defaults = { "interface": "",
 
2184
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2185
 
                        "servicename": "Mandos",
 
2190
 
                        "statedir": "/var/lib/mandos"
 
 
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",
 
2193
3000
    # Parse config file for server-global settings
 
2194
3001
    server_config = configparser.SafeConfigParser(server_defaults)
 
2195
3002
    del server_defaults
 
2196
 
    server_config.read(os.path.join(options.configdir,
 
 
3003
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2198
3004
    # Convert the SafeConfigParser object to a dict
 
2199
3005
    server_settings = server_config.defaults()
 
2200
3006
    # Use the appropriate methods on the non-string config options
 
2201
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3007
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3008
                   "foreground", "zeroconf"):
 
2202
3009
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2204
3011
    if server_settings["port"]:
 
2205
3012
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
3014
    if server_settings["socket"]:
 
 
3015
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
3017
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
3018
        # over with an opened os.devnull.  But we don't want this to
 
 
3019
        # happen with a supplied network socket.
 
 
3020
        if 0 <= server_settings["socket"] <= 2:
 
 
3021
            server_settings["socket"] = os.dup(server_settings
 
2207
3023
    del server_config
 
2209
3025
    # Override the settings from the config file with command line
 
2210
3026
    # options, if set.
 
2211
3027
    for option in ("interface", "address", "port", "debug",
 
2212
 
                   "priority", "servicename", "configdir",
 
2213
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
 
3028
                   "priority", "servicename", "configdir", "use_dbus",
 
 
3029
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
3030
                   "socket", "foreground", "zeroconf"):
 
2215
3031
        value = getattr(options, option)
 
2216
3032
        if value is not None:
 
2217
3033
            server_settings[option] = value
 
2219
3035
    # Force all strings to be unicode
 
2220
3036
    for option in server_settings.keys():
 
2221
 
        if type(server_settings[option]) is str:
 
2222
 
            server_settings[option] = unicode(server_settings[option])
 
 
3037
        if isinstance(server_settings[option], bytes):
 
 
3038
            server_settings[option] = (server_settings[option]
 
 
3040
    # Force all boolean options to be boolean
 
 
3041
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3042
                   "foreground", "zeroconf"):
 
 
3043
        server_settings[option] = bool(server_settings[option])
 
 
3044
    # Debug implies foreground
 
 
3045
    if server_settings["debug"]:
 
 
3046
        server_settings["foreground"] = True
 
2223
3047
    # Now we have our good server settings in "server_settings"
 
2225
3049
    ##################################################################
 
 
3051
    if (not server_settings["zeroconf"]
 
 
3052
        and not (server_settings["port"]
 
 
3053
                 or server_settings["socket"] != "")):
 
 
3054
        parser.error("Needs port or socket to work without Zeroconf")
 
2227
3056
    # For convenience
 
2228
3057
    debug = server_settings["debug"]
 
2229
3058
    debuglevel = server_settings["debuglevel"]
 
 
 
3128
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2290
3130
    except OSError as error:
 
2291
 
        if error[0] != errno.EPERM:
 
 
3131
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3132
                       .format(uid, gid, os.strerror(error.errno)))
 
 
3133
        if error.errno != errno.EPERM:
 
2295
3137
        # Enable all possible GnuTLS debugging
 
2297
3139
        # "Use a log level over 10 to enable all debugging options."
 
2298
3140
        # - GnuTLS manual
 
2299
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2301
 
        @gnutls.library.types.gnutls_log_func
 
 
3141
        gnutls.global_set_log_level(11)
 
2302
3144
        def debug_gnutls(level, string):
 
2303
3145
            logger.debug("GnuTLS: %s", string[:-1])
 
2305
 
        (gnutls.library.functions
 
2306
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3147
        gnutls.global_set_log_function(debug_gnutls)
 
2308
3149
        # Redirect stdin so all checkers get /dev/null
 
2309
3150
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2310
3151
        os.dup2(null, sys.stdin.fileno())
 
2314
3155
    # Need to fork before connecting to D-Bus
 
2316
3157
        # Close all input and output, do double fork, etc.
 
2319
 
    gobject.threads_init()
 
 
3160
    # multiprocessing will use threads, so before we use GLib we need
 
 
3161
    # to inform GLib that threads will be used.
 
2321
3164
    global main_loop
 
2322
3165
    # From the Avahi example code
 
2323
3166
    DBusGMainLoop(set_as_default=True)
 
2324
 
    main_loop = gobject.MainLoop()
 
 
3167
    main_loop = GLib.MainLoop()
 
2325
3168
    bus = dbus.SystemBus()
 
2326
3169
    # End of Avahi example code
 
2329
3172
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2330
 
                                            bus, do_not_queue=True)
 
2331
 
            old_bus_name = (dbus.service.BusName
 
2332
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2334
 
        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:
 
2335
3179
            logger.error("Disabling D-Bus:", exc_info=e)
 
2336
3180
            use_dbus = False
 
2337
3181
            server_settings["use_dbus"] = False
 
2338
3182
            tcp_server.use_dbus = False
 
2339
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2340
 
    service = AvahiServiceToSyslog(name =
 
2341
 
                                   server_settings["servicename"],
 
2342
 
                                   servicetype = "_mandos._tcp",
 
2343
 
                                   protocol = protocol, bus = bus)
 
2344
 
    if server_settings["interface"]:
 
2345
 
        service.interface = (if_nametoindex
 
2346
 
                             (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"))
 
2348
3194
    global multiprocessing_manager
 
2349
3195
    multiprocessing_manager = multiprocessing.Manager()
 
2351
3197
    client_class = Client
 
2353
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3199
        client_class = functools.partial(ClientDBus, bus=bus)
 
2355
3201
    client_settings = Client.config_parser(client_config)
 
2356
3202
    old_client_settings = {}
 
2357
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:
 
2359
3213
    # Get client data and settings from last running state.
 
2360
3214
    if server_settings["restore"]:
 
2362
3216
            with open(stored_state_path, "rb") as stored_state:
 
2363
 
                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"]
 
2365
3266
            os.remove(stored_state_path)
 
2366
3267
        except IOError as e:
 
2367
3268
            if e.errno == errno.ENOENT:
 
2368
 
                logger.warning("Could not load persistent state: {0}"
 
2369
 
                                .format(os.strerror(e.errno)))
 
 
3269
                logger.warning("Could not load persistent state:"
 
 
3270
                               " {}".format(os.strerror(e.errno)))
 
2371
3272
                logger.critical("Could not load persistent state:",
 
2374
3275
        except EOFError as e:
 
2375
3276
            logger.warning("Could not load persistent state: "
 
2376
 
                           "EOFError:", exc_info=e)
 
2378
3280
    with PGPEngine() as pgp:
 
2379
 
        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:
 
2380
3286
            # Decide which value to use after restoring saved state.
 
2381
3287
            # We have three different values: Old config file,
 
2382
3288
            # new config file, and saved state.
 
 
2440
3346
    for client_name in (set(client_settings)
 
2441
3347
                        - set(old_client_settings)):
 
2442
3348
        clients_data[client_name] = client_settings[client_name]
 
2444
3350
    # Create all client objects
 
2445
 
    for client_name, client in clients_data.iteritems():
 
 
3351
    for client_name, client in clients_data.items():
 
2446
3352
        tcp_server.clients[client_name] = client_class(
 
2447
 
            name = client_name, settings = client)
 
 
3355
            server_settings=server_settings)
 
2449
3357
    if not tcp_server.clients:
 
2450
3358
        logger.warning("No clients defined")
 
2456
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2459
 
            logger.error("Could not write to file %r with PID %d",
 
2462
 
            # "pidfile" was never created
 
 
3361
        if pidfile is not None:
 
 
3365
                    print(pid, file=pidfile)
 
 
3367
                logger.error("Could not write to file %r with PID %d",
 
2464
3370
        del pidfilename
 
2465
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2467
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2468
 
    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)
 
2471
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2472
 
                                        "se.bsnet.fukt.Mandos"})
 
2473
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3378
        @alternate_dbus_interfaces(
 
 
3379
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3380
        class MandosDBusService(DBusObjectWithObjectManager):
 
2474
3381
            """A D-Bus proxy object"""
 
2475
3383
            def __init__(self):
 
2476
3384
                dbus.service.Object.__init__(self, bus, "/")
 
2477
3386
            _interface = "se.recompile.Mandos"
 
2479
 
            @dbus_interface_annotations(_interface)
 
2481
 
                return { "org.freedesktop.DBus.Property"
 
2482
 
                         ".EmitsChangedSignal":
 
2485
3388
            @dbus.service.signal(_interface, signature="o")
 
2486
3389
            def ClientAdded(self, objpath):
 
2490
3393
            @dbus.service.signal(_interface, signature="ss")
 
2491
 
            def ClientNotFound(self, fingerprint, address):
 
 
3394
            def ClientNotFound(self, key_id, address):
 
 
3398
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2495
3400
            @dbus.service.signal(_interface, signature="os")
 
2496
3401
            def ClientRemoved(self, objpath, name):
 
 
3405
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2500
3407
            @dbus.service.method(_interface, out_signature="ao")
 
2501
3408
            def GetAllClients(self):
 
2503
 
                return dbus.Array(c.dbus_object_path
 
2505
 
                                  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":
 
2507
3415
            @dbus.service.method(_interface,
 
2508
3416
                                 out_signature="a{oa{sv}}")
 
2509
3417
            def GetAllClientsWithProperties(self):
 
2511
3419
                return dbus.Dictionary(
 
2512
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2513
 
                     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()},
 
2514
3423
                    signature="oa{sv}")
 
2516
3425
            @dbus.service.method(_interface, in_signature="o")
 
2517
3426
            def RemoveClient(self, object_path):
 
2519
 
                for c in tcp_server.clients.itervalues():
 
 
3428
                for c in tcp_server.clients.values():
 
2520
3429
                    if c.dbus_object_path == object_path:
 
2521
3430
                        del tcp_server.clients[c.name]
 
2522
3431
                        c.remove_from_connection()
 
2523
 
                        # Don't signal anything except ClientRemoved
 
 
3432
                        # Don't signal the disabling
 
2524
3433
                        c.disable(quiet=True)
 
2526
 
                        self.ClientRemoved(object_path, c.name)
 
 
3434
                        # Emit D-Bus signal for removal
 
 
3435
                        self.client_removed_signal(c)
 
2528
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,
 
2532
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
 
2535
3485
        "Cleanup function; run on exit"
 
2538
 
        multiprocessing.active_children()
 
 
3489
        mp.active_children()
 
2539
3491
        if not (tcp_server.clients or client_settings):
 
2542
3494
        # Store client before exiting. Secrets are encrypted with key
 
2543
3495
        # based on what config file has. If config file is
 
2544
3496
        # removed/edited, old secret will thus be unrecovable.
 
2546
3498
        with PGPEngine() as pgp:
 
2547
 
            for client in tcp_server.clients.itervalues():
 
 
3499
            for client in tcp_server.clients.values():
 
2548
3500
                key = client_settings[client.name]["secret"]
 
2549
3501
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2551
3503
                client_dict = {}
 
2553
3505
                # A list of attributes that can not be pickled
 
2555
 
                exclude = set(("bus", "changedstate", "secret",
 
2557
 
                for name, typ in (inspect.getmembers
 
2558
 
                                  (dbus.service.Object)):
 
 
3507
                exclude = {"bus", "changedstate", "secret",
 
 
3508
                           "checker", "server_settings"}
 
 
3509
                for name, typ in inspect.getmembers(dbus.service
 
2559
3511
                    exclude.add(name)
 
2561
3513
                client_dict["encrypted_secret"] = (client
 
2562
3514
                                                   .encrypted_secret)
 
2563
3515
                for attr in client.client_structure:
 
2564
3516
                    if attr not in exclude:
 
2565
3517
                        client_dict[attr] = getattr(client, attr)
 
2567
3519
                clients[client.name] = client_dict
 
2568
3520
                del client_settings[client.name]["secret"]
 
2571
 
            with (tempfile.NamedTemporaryFile
 
2572
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2573
 
                   dir=os.path.dirname(stored_state_path),
 
2574
 
                   delete=False)) as stored_state:
 
2575
 
                pickle.dump((clients, client_settings), stored_state)
 
2576
 
                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
 
2577
3532
            os.rename(tempname, stored_state_path)
 
2578
3533
        except (IOError, OSError) as e: