2
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-2019 Teddy Hogeborn
 
15
 
# Copyright © 2008-2019 Björn Påhlsson
 
17
 
# This file is part of Mandos.
 
19
 
# Mandos is free software: you can redistribute it and/or modify it
 
20
 
# under the terms of the GNU General Public License as published by
 
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
 
15
# Copyright © 2008-2014 Björn Påhlsson
 
 
17
# This program is free software: you can redistribute it and/or modify
 
 
18
# it under the terms of the GNU General Public License as published by
 
21
19
# the Free Software Foundation, either version 3 of the License, or
 
22
20
# (at your option) any later version.
 
24
 
#     Mandos is distributed in the hope that it will be useful, but
 
25
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
22
#     This program is distributed in the hope that it will be useful,
 
 
23
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
26
24
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
27
25
#     GNU General Public License for more details.
 
29
27
# You should have received a copy of the GNU General Public License
 
30
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
 
28
# along with this program.  If not, see
 
 
29
# <http://www.gnu.org/licenses/>.
 
32
31
# Contact the authors at <mandos@recompile.se>.
 
35
34
from __future__ import (division, absolute_import, print_function,
 
39
 
    from future_builtins import *
 
 
37
from future_builtins import *
 
44
 
    import SocketServer as socketserver
 
 
39
import SocketServer as socketserver
 
52
 
    import ConfigParser as configparser
 
 
45
import gnutls.connection
 
 
47
import gnutls.library.functions
 
 
48
import gnutls.library.constants
 
 
49
import gnutls.library.types
 
 
50
import ConfigParser as configparser
 
 
70
 
    import cPickle as pickle
 
 
65
import cPickle as pickle
 
73
66
import multiprocessing
 
82
74
import dbus.service
 
83
 
from gi.repository import GLib
 
84
77
from dbus.mainloop.glib import DBusGMainLoop
 
87
80
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:
 
94
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
95
85
except AttributeError:
 
97
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
99
87
        from IN import SO_BINDTODEVICE
 
100
88
    except ImportError:
 
101
 
        # In Python 2.7 it seems to have been removed entirely.
 
102
 
        # Try running the C preprocessor:
 
104
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
106
 
                                  stdin=subprocess.PIPE,
 
107
 
                                  stdout=subprocess.PIPE)
 
108
 
            stdout = cc.communicate(
 
109
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
110
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
111
 
        except (OSError, ValueError, IndexError):
 
113
 
            SO_BINDTODEVICE = None
 
115
 
if sys.version_info.major == 2:
 
 
89
        SO_BINDTODEVICE = None
 
119
92
stored_state_file = "clients.pickle"
 
121
94
logger = logging.getLogger()
 
125
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
126
 
        ctypes.util.find_library("c")).if_nametoindex
 
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
 
99
                      (ctypes.util.find_library("c"))
 
127
101
except (OSError, AttributeError):
 
129
102
    def if_nametoindex(interface):
 
130
103
        "Get an interface index the hard way, i.e. using fcntl()"
 
131
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
132
105
        with contextlib.closing(socket.socket()) as s:
 
133
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
134
 
                                struct.pack(b"16s16x", interface))
 
135
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
 
107
                                struct.pack(str("16s16x"),
 
 
109
        interface_index = struct.unpack(str("I"),
 
136
111
        return interface_index
 
139
 
def copy_function(func):
 
140
 
    """Make a copy of a function"""
 
141
 
    if sys.version_info.major == 2:
 
142
 
        return types.FunctionType(func.func_code,
 
148
 
        return types.FunctionType(func.__code__,
 
155
114
def initlogger(debug, level=logging.WARNING):
 
156
115
    """init logger and add loglevel"""
 
159
 
    syslogger = (logging.handlers.SysLogHandler(
 
160
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
118
    syslogger = (logging.handlers.SysLogHandler
 
 
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
121
                  address = str("/dev/log")))
 
162
122
    syslogger.setFormatter(logging.Formatter
 
163
123
                           ('Mandos [%(process)d]: %(levelname)s:'
 
165
125
    logger.addHandler(syslogger)
 
168
128
        console = logging.StreamHandler()
 
169
129
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
236
182
                       .replace(b"\n", b"\\n")
 
237
183
                       .replace(b"\0", b"\\x00"))
 
240
186
    def encrypt(self, data, password):
 
241
187
        passphrase = self.password_encode(password)
 
242
 
        with tempfile.NamedTemporaryFile(
 
243
 
                dir=self.tempdir) as passfile:
 
 
188
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
244
190
            passfile.write(passphrase)
 
246
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
192
            proc = subprocess.Popen(['gpg', '--symmetric',
 
247
193
                                     '--passphrase-file',
 
249
195
                                    + self.gnupgargs,
 
250
 
                                    stdin=subprocess.PIPE,
 
251
 
                                    stdout=subprocess.PIPE,
 
252
 
                                    stderr=subprocess.PIPE)
 
253
 
            ciphertext, err = proc.communicate(input=data)
 
 
196
                                    stdin = subprocess.PIPE,
 
 
197
                                    stdout = subprocess.PIPE,
 
 
198
                                    stderr = subprocess.PIPE)
 
 
199
            ciphertext, err = proc.communicate(input = data)
 
254
200
        if proc.returncode != 0:
 
255
201
            raise PGPError(err)
 
256
202
        return ciphertext
 
258
204
    def decrypt(self, data, password):
 
259
205
        passphrase = self.password_encode(password)
 
260
 
        with tempfile.NamedTemporaryFile(
 
261
 
                dir=self.tempdir) as passfile:
 
 
206
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
262
208
            passfile.write(passphrase)
 
264
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
210
            proc = subprocess.Popen(['gpg', '--decrypt',
 
265
211
                                     '--passphrase-file',
 
267
213
                                    + self.gnupgargs,
 
268
 
                                    stdin=subprocess.PIPE,
 
269
 
                                    stdout=subprocess.PIPE,
 
270
 
                                    stderr=subprocess.PIPE)
 
271
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
214
                                    stdin = subprocess.PIPE,
 
 
215
                                    stdout = subprocess.PIPE,
 
 
216
                                    stderr = subprocess.PIPE)
 
 
217
            decrypted_plaintext, err = proc.communicate(input
 
272
219
        if proc.returncode != 0:
 
273
220
            raise PGPError(err)
 
274
221
        return decrypted_plaintext
 
277
 
# Pretend that we have an Avahi module
 
279
 
    """This isn't so much a class as it is a module-like namespace.
 
280
 
    It is instantiated once, and simulates having an Avahi module."""
 
281
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
282
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
283
 
    PROTO_INET = 0               # avahi-common/address.h
 
284
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
285
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
286
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
287
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
288
 
    DBUS_PATH_SERVER = "/"
 
290
 
    def string_array_to_txt_array(self, t):
 
291
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
292
 
                           for s in t), signature="ay")
 
293
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
294
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
295
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
296
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
297
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
298
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
299
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
300
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
304
224
class AvahiError(Exception):
 
305
225
    def __init__(self, value, *args, **kwargs):
 
306
226
        self.value = value
 
307
 
        return super(AvahiError, self).__init__(value, *args,
 
 
227
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
228
    def __unicode__(self):
 
 
229
        return unicode(repr(self.value))
 
311
231
class AvahiServiceError(AvahiError):
 
315
234
class AvahiGroupError(AvahiError):
 
319
238
class AvahiService(object):
 
320
239
    """An Avahi (Zeroconf) service.
 
323
242
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
324
243
               Used to optionally bind to the specified interface.
 
 
489
386
                                    follow_name_owner_changes=True),
 
490
387
                avahi.DBUS_INTERFACE_SERVER)
 
491
388
        self.server.connect_to_signal("StateChanged",
 
492
 
                                      self.server_state_changed)
 
 
389
                                 self.server_state_changed)
 
493
390
        self.server_state_changed(self.server.GetState())
 
496
393
class AvahiServiceToSyslog(AvahiService):
 
497
 
    def rename(self, *args, **kwargs):
 
498
395
        """Add the new name to the syslog messages"""
 
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
500
 
        syslogger.setFormatter(logging.Formatter(
 
501
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
 
396
        ret = AvahiService.rename(self)
 
 
397
        syslogger.setFormatter(logging.Formatter
 
 
398
                               ('Mandos ({0}) [%(process)d]:'
 
 
399
                                ' %(levelname)s: %(message)s'
 
506
 
# Pretend that we have a GnuTLS module
 
507
 
class GnuTLS(object):
 
508
 
    """This isn't so much a class as it is a module-like namespace.
 
509
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
511
 
    library = ctypes.util.find_library("gnutls")
 
513
 
        library = ctypes.util.find_library("gnutls-deb0")
 
514
 
    _library = ctypes.cdll.LoadLibrary(library)
 
516
 
    _need_version = b"3.3.0"
 
517
 
    _tls_rawpk_version = b"3.6.6"
 
520
 
        # Need to use "self" here, since this method is called before
 
521
 
        # the assignment to the "gnutls" global variable happens.
 
522
 
        if self.check_version(self._need_version) is None:
 
523
 
            raise self.Error("Needs GnuTLS {} or later"
 
524
 
                             .format(self._need_version))
 
526
 
    # Unless otherwise indicated, the constants and types below are
 
527
 
    # all from the gnutls/gnutls.h C header file.
 
538
 
    E_NO_CERTIFICATE_FOUND = -49
 
543
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
544
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
547
 
    class session_int(ctypes.Structure):
 
549
 
    session_t = ctypes.POINTER(session_int)
 
551
 
    class certificate_credentials_st(ctypes.Structure):
 
553
 
    certificate_credentials_t = ctypes.POINTER(
 
554
 
        certificate_credentials_st)
 
555
 
    certificate_type_t = ctypes.c_int
 
557
 
    class datum_t(ctypes.Structure):
 
558
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
559
 
                    ('size', ctypes.c_uint)]
 
561
 
    class openpgp_crt_int(ctypes.Structure):
 
563
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
564
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
565
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
566
 
    credentials_type_t = ctypes.c_int
 
567
 
    transport_ptr_t = ctypes.c_void_p
 
568
 
    close_request_t = ctypes.c_int
 
571
 
    class Error(Exception):
 
572
 
        # We need to use the class name "GnuTLS" here, since this
 
573
 
        # exception might be raised from within GnuTLS.__init__,
 
574
 
        # which is called before the assignment to the "gnutls"
 
575
 
        # global variable has happened.
 
576
 
        def __init__(self, message=None, code=None, args=()):
 
577
 
            # Default usage is by a message string, but if a return
 
578
 
            # code is passed, convert it to a string with
 
581
 
            if message is None and code is not None:
 
582
 
                message = GnuTLS.strerror(code)
 
583
 
            return super(GnuTLS.Error, self).__init__(
 
586
 
    class CertificateSecurityError(Error):
 
590
 
    class Credentials(object):
 
592
 
            self._c_object = gnutls.certificate_credentials_t()
 
593
 
            gnutls.certificate_allocate_credentials(
 
594
 
                ctypes.byref(self._c_object))
 
595
 
            self.type = gnutls.CRD_CERTIFICATE
 
598
 
            gnutls.certificate_free_credentials(self._c_object)
 
600
 
    class ClientSession(object):
 
601
 
        def __init__(self, socket, credentials=None):
 
602
 
            self._c_object = gnutls.session_t()
 
603
 
            gnutls_flags = gnutls.CLIENT
 
604
 
            if gnutls.check_version("3.5.6"):
 
605
 
                gnutls_flags |= gnutls.NO_TICKETS
 
607
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
608
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
610
 
            gnutls.set_default_priority(self._c_object)
 
611
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
612
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
615
 
            if credentials is None:
 
616
 
                credentials = gnutls.Credentials()
 
617
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
618
 
                                   ctypes.cast(credentials._c_object,
 
620
 
            self.credentials = credentials
 
623
 
            gnutls.deinit(self._c_object)
 
626
 
            return gnutls.handshake(self._c_object)
 
628
 
        def send(self, data):
 
632
 
                data_len -= gnutls.record_send(self._c_object,
 
637
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
639
 
    # Error handling functions
 
640
 
    def _error_code(result):
 
641
 
        """A function to raise exceptions on errors, suitable
 
642
 
        for the 'restype' attribute on ctypes functions"""
 
645
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
646
 
            raise gnutls.CertificateSecurityError(code=result)
 
647
 
        raise gnutls.Error(code=result)
 
649
 
    def _retry_on_error(result, func, arguments):
 
650
 
        """A function to retry on some errors, suitable
 
651
 
        for the 'errcheck' attribute on ctypes functions"""
 
653
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
654
 
                return _error_code(result)
 
655
 
            result = func(*arguments)
 
658
 
    # Unless otherwise indicated, the function declarations below are
 
659
 
    # all from the gnutls/gnutls.h C header file.
 
662
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
663
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
664
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
665
 
    priority_set_direct.restype = _error_code
 
667
 
    init = _library.gnutls_init
 
668
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
669
 
    init.restype = _error_code
 
671
 
    set_default_priority = _library.gnutls_set_default_priority
 
672
 
    set_default_priority.argtypes = [session_t]
 
673
 
    set_default_priority.restype = _error_code
 
675
 
    record_send = _library.gnutls_record_send
 
676
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
678
 
    record_send.restype = ctypes.c_ssize_t
 
679
 
    record_send.errcheck = _retry_on_error
 
681
 
    certificate_allocate_credentials = (
 
682
 
        _library.gnutls_certificate_allocate_credentials)
 
683
 
    certificate_allocate_credentials.argtypes = [
 
684
 
        ctypes.POINTER(certificate_credentials_t)]
 
685
 
    certificate_allocate_credentials.restype = _error_code
 
687
 
    certificate_free_credentials = (
 
688
 
        _library.gnutls_certificate_free_credentials)
 
689
 
    certificate_free_credentials.argtypes = [
 
690
 
        certificate_credentials_t]
 
691
 
    certificate_free_credentials.restype = None
 
693
 
    handshake_set_private_extensions = (
 
694
 
        _library.gnutls_handshake_set_private_extensions)
 
695
 
    handshake_set_private_extensions.argtypes = [session_t,
 
697
 
    handshake_set_private_extensions.restype = None
 
699
 
    credentials_set = _library.gnutls_credentials_set
 
700
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
702
 
    credentials_set.restype = _error_code
 
704
 
    strerror = _library.gnutls_strerror
 
705
 
    strerror.argtypes = [ctypes.c_int]
 
706
 
    strerror.restype = ctypes.c_char_p
 
708
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
709
 
    certificate_type_get.argtypes = [session_t]
 
710
 
    certificate_type_get.restype = _error_code
 
712
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
713
 
    certificate_get_peers.argtypes = [session_t,
 
714
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
715
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
717
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
718
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
719
 
    global_set_log_level.restype = None
 
721
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
722
 
    global_set_log_function.argtypes = [log_func]
 
723
 
    global_set_log_function.restype = None
 
725
 
    deinit = _library.gnutls_deinit
 
726
 
    deinit.argtypes = [session_t]
 
727
 
    deinit.restype = None
 
729
 
    handshake = _library.gnutls_handshake
 
730
 
    handshake.argtypes = [session_t]
 
731
 
    handshake.restype = _error_code
 
732
 
    handshake.errcheck = _retry_on_error
 
734
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
735
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
736
 
    transport_set_ptr.restype = None
 
738
 
    bye = _library.gnutls_bye
 
739
 
    bye.argtypes = [session_t, close_request_t]
 
740
 
    bye.restype = _error_code
 
741
 
    bye.errcheck = _retry_on_error
 
743
 
    check_version = _library.gnutls_check_version
 
744
 
    check_version.argtypes = [ctypes.c_char_p]
 
745
 
    check_version.restype = ctypes.c_char_p
 
747
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
751
 
        class pubkey_st(ctypes.Structure):
 
753
 
        pubkey_t = ctypes.POINTER(pubkey_st)
 
755
 
        x509_crt_fmt_t = ctypes.c_int
 
757
 
        # All the function declarations below are from gnutls/abstract.h
 
758
 
        pubkey_init = _library.gnutls_pubkey_init
 
759
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
760
 
        pubkey_init.restype = _error_code
 
762
 
        pubkey_import = _library.gnutls_pubkey_import
 
763
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
765
 
        pubkey_import.restype = _error_code
 
767
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
768
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
769
 
                                      ctypes.POINTER(ctypes.c_ubyte),
 
770
 
                                      ctypes.POINTER(ctypes.c_size_t)]
 
771
 
        pubkey_get_key_id.restype = _error_code
 
773
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
774
 
        pubkey_deinit.argtypes = [pubkey_t]
 
775
 
        pubkey_deinit.restype = None
 
777
 
        # All the function declarations below are from gnutls/openpgp.h
 
779
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
780
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
781
 
        openpgp_crt_init.restype = _error_code
 
783
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
784
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
785
 
                                       ctypes.POINTER(datum_t),
 
787
 
        openpgp_crt_import.restype = _error_code
 
789
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
790
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
791
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
792
 
        openpgp_crt_verify_self.restype = _error_code
 
794
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
795
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
796
 
        openpgp_crt_deinit.restype = None
 
798
 
        openpgp_crt_get_fingerprint = (
 
799
 
            _library.gnutls_openpgp_crt_get_fingerprint)
 
800
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
804
 
        openpgp_crt_get_fingerprint.restype = _error_code
 
806
 
    if check_version("3.6.4"):
 
807
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
808
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
809
 
        certificate_type_get2.restype = _error_code
 
811
 
    # Remove non-public functions
 
812
 
    del _error_code, _retry_on_error
 
813
 
# Create the global "gnutls" object, simulating a module
 
817
 
def call_pipe(connection,       # : multiprocessing.Connection
 
818
 
              func, *args, **kwargs):
 
819
 
    """This function is meant to be called by multiprocessing.Process
 
821
 
    This function runs func(*args, **kwargs), and writes the resulting
 
822
 
    return value on the provided multiprocessing.Connection.
 
824
 
    connection.send(func(*args, **kwargs))
 
 
404
def timedelta_to_milliseconds(td):
 
 
405
    "Convert a datetime.timedelta() to milliseconds"
 
 
406
    return ((td.days * 24 * 60 * 60 * 1000)
 
 
407
            + (td.seconds * 1000)
 
 
408
            + (td.microseconds // 1000))
 
828
411
class Client(object):
 
829
412
    """A representation of a client host served by this server.
 
832
415
    approved:   bool(); 'None' if not yet approved/disapproved
 
833
416
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
1013
604
            logger.info("Disabling client %s", self.name)
 
1014
605
        if getattr(self, "disable_initiator_tag", None) is not None:
 
1015
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
606
            gobject.source_remove(self.disable_initiator_tag)
 
1016
607
            self.disable_initiator_tag = None
 
1017
608
        self.expires = None
 
1018
609
        if getattr(self, "checker_initiator_tag", None) is not None:
 
1019
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
610
            gobject.source_remove(self.checker_initiator_tag)
 
1020
611
            self.checker_initiator_tag = None
 
1021
612
        self.stop_checker()
 
1022
613
        self.enabled = False
 
1024
615
            self.send_changedstate()
 
1025
 
        # Do not run this again if called by a GLib.timeout_add
 
 
616
        # Do not run this again if called by a gobject.timeout_add
 
1028
619
    def __del__(self):
 
1031
622
    def init_checker(self):
 
1032
623
        # Schedule a new checker to be started an 'interval' from now,
 
1033
624
        # and every interval from then on.
 
1034
625
        if self.checker_initiator_tag is not None:
 
1035
 
            GLib.source_remove(self.checker_initiator_tag)
 
1036
 
        self.checker_initiator_tag = GLib.timeout_add(
 
1037
 
            int(self.interval.total_seconds() * 1000),
 
 
626
            gobject.source_remove(self.checker_initiator_tag)
 
 
627
        self.checker_initiator_tag = (gobject.timeout_add
 
 
628
                                      (self.interval_milliseconds(),
 
1039
630
        # Schedule a disable() when 'timeout' has passed
 
1040
631
        if self.disable_initiator_tag is not None:
 
1041
 
            GLib.source_remove(self.disable_initiator_tag)
 
1042
 
        self.disable_initiator_tag = GLib.timeout_add(
 
1043
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
632
            gobject.source_remove(self.disable_initiator_tag)
 
 
633
        self.disable_initiator_tag = (gobject.timeout_add
 
 
634
                                   (self.timeout_milliseconds(),
 
1044
636
        # Also start a new checker *right now*.
 
1045
637
        self.start_checker()
 
1047
 
    def checker_callback(self, source, condition, connection,
 
 
639
    def checker_callback(self, pid, condition, command):
 
1049
640
        """The checker has completed, so take appropriate actions."""
 
1050
641
        self.checker_callback_tag = None
 
1051
642
        self.checker = None
 
1052
 
        # Read return code from connection (see call_pipe)
 
1053
 
        returncode = connection.recv()
 
1057
 
            self.last_checker_status = returncode
 
1058
 
            self.last_checker_signal = None
 
 
643
        if os.WIFEXITED(condition):
 
 
644
            self.last_checker_status = os.WEXITSTATUS(condition)
 
1059
645
            if self.last_checker_status == 0:
 
1060
646
                logger.info("Checker for %(name)s succeeded",
 
1062
648
                self.checked_ok()
 
1064
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
650
                logger.info("Checker for %(name)s failed",
 
1066
653
            self.last_checker_status = -1
 
1067
 
            self.last_checker_signal = -returncode
 
1068
654
            logger.warning("Checker for %(name)s crashed?",
 
1072
657
    def checked_ok(self):
 
1073
658
        """Assert that the client has been seen, alive and well."""
 
1074
659
        self.last_checked_ok = datetime.datetime.utcnow()
 
1075
660
        self.last_checker_status = 0
 
1076
 
        self.last_checker_signal = None
 
1077
661
        self.bump_timeout()
 
1079
663
    def bump_timeout(self, timeout=None):
 
1080
664
        """Bump up the timeout for this client."""
 
1081
665
        if timeout is None:
 
1082
666
            timeout = self.timeout
 
1083
667
        if self.disable_initiator_tag is not None:
 
1084
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
668
            gobject.source_remove(self.disable_initiator_tag)
 
1085
669
            self.disable_initiator_tag = None
 
1086
670
        if getattr(self, "enabled", False):
 
1087
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1088
 
                int(timeout.total_seconds() * 1000), self.disable)
 
 
671
            self.disable_initiator_tag = (gobject.timeout_add
 
 
672
                                          (timedelta_to_milliseconds
 
 
673
                                           (timeout), self.disable))
 
1089
674
            self.expires = datetime.datetime.utcnow() + timeout
 
1091
676
    def need_approval(self):
 
1092
677
        self.last_approval_request = datetime.datetime.utcnow()
 
1094
679
    def start_checker(self):
 
1095
680
        """Start a new checker subprocess if one is not running.
 
1097
682
        If a checker already exists, leave it running and do
 
1099
684
        # The reason for not killing a running checker is that if we
 
 
1104
689
        # checkers alone, the checker would have to take more time
 
1105
690
        # than 'timeout' for the client to be disabled, which is as it
 
1108
 
        if self.checker is not None and not self.checker.is_alive():
 
1109
 
            logger.warning("Checker was not alive; joining")
 
 
693
        # If a checker exists, make sure it is not a zombie
 
 
695
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
696
        except AttributeError:
 
 
698
        except OSError as error:
 
 
699
            if error.errno != errno.ECHILD:
 
 
703
                logger.warning("Checker was a zombie")
 
 
704
                gobject.source_remove(self.checker_callback_tag)
 
 
705
                self.checker_callback(pid, status,
 
 
706
                                      self.current_checker_command)
 
1112
707
        # Start a new checker if needed
 
1113
708
        if self.checker is None:
 
1114
709
            # Escape attributes for the shell
 
1116
 
                attr: re.escape(str(getattr(self, attr)))
 
1117
 
                for attr in self.runtime_expansions}
 
 
710
            escaped_attrs = dict(
 
 
711
                (attr, re.escape(unicode(getattr(self, attr))))
 
 
713
                self.runtime_expansions)
 
1119
715
                command = self.checker_command % escaped_attrs
 
1120
716
            except TypeError as error:
 
1121
717
                logger.error('Could not format string "%s"',
 
1122
 
                             self.checker_command,
 
 
718
                             self.checker_command, exc_info=error)
 
 
719
                return True # Try again later
 
 
720
            self.current_checker_command = command
 
 
722
                logger.info("Starting checker %r for %s",
 
 
724
                # We don't need to redirect stdout and stderr, since
 
 
725
                # in normal mode, that is already done by daemon(),
 
 
726
                # and in debug mode we don't want to.  (Stdin is
 
 
727
                # always replaced by /dev/null.)
 
 
728
                # The exception is when not debugging but nevertheless
 
 
729
                # running in the foreground; use the previously
 
 
732
                if (not self.server_settings["debug"]
 
 
733
                    and self.server_settings["foreground"]):
 
 
734
                    popen_args.update({"stdout": wnull,
 
 
736
                self.checker = subprocess.Popen(command,
 
 
740
            except OSError as error:
 
 
741
                logger.error("Failed to start subprocess",
 
1124
 
                return True     # Try again later
 
1125
 
            self.current_checker_command = command
 
1126
 
            logger.info("Starting checker %r for %s", command,
 
1128
 
            # We don't need to redirect stdout and stderr, since
 
1129
 
            # in normal mode, that is already done by daemon(),
 
1130
 
            # and in debug mode we don't want to.  (Stdin is
 
1131
 
            # always replaced by /dev/null.)
 
1132
 
            # The exception is when not debugging but nevertheless
 
1133
 
            # running in the foreground; use the previously
 
1135
 
            popen_args = {"close_fds": True,
 
1138
 
            if (not self.server_settings["debug"]
 
1139
 
                and self.server_settings["foreground"]):
 
1140
 
                popen_args.update({"stdout": wnull,
 
1142
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1143
 
            self.checker = multiprocessing.Process(
 
1145
 
                args=(pipe[1], subprocess.call, command),
 
1147
 
            self.checker.start()
 
1148
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1149
 
                pipe[0].fileno(), GLib.IO_IN,
 
1150
 
                self.checker_callback, pipe[0], command)
 
1151
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
744
            self.checker_callback_tag = (gobject.child_watch_add
 
 
746
                                          self.checker_callback,
 
 
748
            # The checker may have completed before the gobject
 
 
749
            # watch was added.  Check for this.
 
 
751
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
752
            except OSError as error:
 
 
753
                if error.errno == errno.ECHILD:
 
 
754
                    # This should never happen
 
 
755
                    logger.error("Child process vanished",
 
 
760
                gobject.source_remove(self.checker_callback_tag)
 
 
761
                self.checker_callback(pid, status, command)
 
 
762
        # Re-run this periodically if run by gobject.timeout_add
 
1154
765
    def stop_checker(self):
 
1155
766
        """Force the checker process, if any, to stop."""
 
1156
767
        if self.checker_callback_tag:
 
1157
 
            GLib.source_remove(self.checker_callback_tag)
 
 
768
            gobject.source_remove(self.checker_callback_tag)
 
1158
769
            self.checker_callback_tag = None
 
1159
770
        if getattr(self, "checker", None) is None:
 
1161
772
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1162
 
        self.checker.terminate()
 
 
774
            self.checker.terminate()
 
 
776
            #if self.checker.poll() is None:
 
 
777
            #    self.checker.kill()
 
 
778
        except OSError as error:
 
 
779
            if error.errno != errno.ESRCH: # No such process
 
1163
781
        self.checker = None
 
1166
 
def dbus_service_property(dbus_interface,
 
 
784
def dbus_service_property(dbus_interface, signature="v",
 
 
785
                          access="readwrite", byte_arrays=False):
 
1170
786
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1171
787
    become properties on the D-Bus.
 
1173
789
    The decorated method will be called with no arguments by "Get"
 
1174
790
    and with one argument by "Set".
 
1176
792
    The parameters, where they are supported, are the same as
 
1177
793
    dbus.service.method, except there is only "signature", since the
 
1178
794
    type from Get() and the type sent to Set() is the same.
 
 
1261
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1262
 
    """A D-Bus object with annotations.
 
1264
 
    Classes inheriting from this can use the dbus_annotations
 
1265
 
    decorator to add annotations to methods or signals.
 
 
870
class DBusObjectWithProperties(dbus.service.Object):
 
 
871
    """A D-Bus object with properties.
 
 
873
    Classes inheriting from this can use the dbus_service_property
 
 
874
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
875
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1269
879
    def _is_dbus_thing(thing):
 
1270
880
        """Returns a function testing if an attribute is a D-Bus thing
 
1272
882
        If called like _is_dbus_thing("method") it returns a function
 
1273
883
        suitable for use as predicate to inspect.getmembers().
 
1275
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
885
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
1278
888
    def _get_all_dbus_things(self, thing):
 
1279
889
        """Returns a generator of (name, attribute) pairs
 
1281
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
891
        return ((getattr(athing.__get__(self), "_dbus_name",
 
1282
893
                 athing.__get__(self))
 
1283
894
                for cls in self.__class__.__mro__
 
1284
895
                for name, athing in
 
1285
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1287
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1289
 
                         path_keyword='object_path',
 
1290
 
                         connection_keyword='connection')
 
1291
 
    def Introspect(self, object_path, connection):
 
1292
 
        """Overloading of standard D-Bus method.
 
1294
 
        Inserts annotation tags on methods and signals.
 
1296
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1299
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1301
 
            for if_tag in document.getElementsByTagName("interface"):
 
1302
 
                # Add annotation tags
 
1303
 
                for typ in ("method", "signal"):
 
1304
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1306
 
                        for name, prop in (self.
 
1307
 
                                           _get_all_dbus_things(typ)):
 
1308
 
                            if (name == tag.getAttribute("name")
 
1309
 
                                and prop._dbus_interface
 
1310
 
                                == if_tag.getAttribute("name")):
 
1311
 
                                annots.update(getattr(
 
1312
 
                                    prop, "_dbus_annotations", {}))
 
1313
 
                        for name, value in annots.items():
 
1314
 
                            ann_tag = document.createElement(
 
1316
 
                            ann_tag.setAttribute("name", name)
 
1317
 
                            ann_tag.setAttribute("value", value)
 
1318
 
                            tag.appendChild(ann_tag)
 
1319
 
                # Add interface annotation tags
 
1320
 
                for annotation, value in dict(
 
1321
 
                    itertools.chain.from_iterable(
 
1322
 
                        annotations().items()
 
1323
 
                        for name, annotations
 
1324
 
                        in self._get_all_dbus_things("interface")
 
1325
 
                        if name == if_tag.getAttribute("name")
 
1327
 
                    ann_tag = document.createElement("annotation")
 
1328
 
                    ann_tag.setAttribute("name", annotation)
 
1329
 
                    ann_tag.setAttribute("value", value)
 
1330
 
                    if_tag.appendChild(ann_tag)
 
1331
 
                # Fix argument name for the Introspect method itself
 
1332
 
                if (if_tag.getAttribute("name")
 
1333
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1334
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1335
 
                        if cn.getAttribute("name") == "Introspect":
 
1336
 
                            for arg in cn.getElementsByTagName("arg"):
 
1337
 
                                if (arg.getAttribute("direction")
 
1339
 
                                    arg.setAttribute("name",
 
1341
 
            xmlstring = document.toxml("utf-8")
 
1343
 
        except (AttributeError, xml.dom.DOMException,
 
1344
 
                xml.parsers.expat.ExpatError) as error:
 
1345
 
            logger.error("Failed to override Introspection method",
 
1350
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1351
 
    """A D-Bus object with properties.
 
1353
 
    Classes inheriting from this can use the dbus_service_property
 
1354
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
1355
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
896
                inspect.getmembers(cls,
 
 
897
                                   self._is_dbus_thing(thing)))
 
1358
899
    def _get_dbus_property(self, interface_name, property_name):
 
1359
900
        """Returns a bound method if one exists which is a D-Bus
 
1360
901
        property with the specified name and interface.
 
1362
 
        for cls in self.__class__.__mro__:
 
1363
 
            for name, value in inspect.getmembers(
 
1364
 
                    cls, self._is_dbus_thing("property")):
 
 
903
        for cls in  self.__class__.__mro__:
 
 
904
            for name, value in (inspect.getmembers
 
 
906
                                 self._is_dbus_thing("property"))):
 
1365
907
                if (value._dbus_name == property_name
 
1366
908
                    and value._dbus_interface == interface_name):
 
1367
909
                    return value.__get__(self)
 
1369
911
        # No such property
 
1370
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1371
 
            self.dbus_object_path, interface_name, property_name))
 
1374
 
    def _get_all_interface_names(cls):
 
1375
 
        """Get a sequence of all interfaces supported by an object"""
 
1376
 
        return (name for name in set(getattr(getattr(x, attr),
 
1377
 
                                             "_dbus_interface", None)
 
1378
 
                                     for x in (inspect.getmro(cls))
 
1380
 
                if name is not None)
 
1382
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
912
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
913
                                   + interface_name + "."
 
 
916
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1384
917
                         out_signature="v")
 
1385
918
    def Get(self, interface_name, property_name):
 
1386
919
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1515
1051
        return xmlstring
 
1519
 
    dbus.OBJECT_MANAGER_IFACE
 
1520
 
except AttributeError:
 
1521
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1524
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1525
 
    """A D-Bus object with an ObjectManager.
 
1527
 
    Classes inheriting from this exposes the standard
 
1528
 
    GetManagedObjects call and the InterfacesAdded and
 
1529
 
    InterfacesRemoved signals on the standard
 
1530
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1532
 
    Note: No signals are sent automatically; they must be sent
 
1535
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1536
 
                         out_signature="a{oa{sa{sv}}}")
 
1537
 
    def GetManagedObjects(self):
 
1538
 
        """This function must be overridden"""
 
1539
 
        raise NotImplementedError()
 
1541
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1542
 
                         signature="oa{sa{sv}}")
 
1543
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1546
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1547
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1550
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1552
 
                         path_keyword='object_path',
 
1553
 
                         connection_keyword='connection')
 
1554
 
    def Introspect(self, object_path, connection):
 
1555
 
        """Overloading of standard D-Bus method.
 
1557
 
        Override return argument name of GetManagedObjects to be
 
1558
 
        "objpath_interfaces_and_properties"
 
1560
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1564
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1566
 
            for if_tag in document.getElementsByTagName("interface"):
 
1567
 
                # Fix argument name for the GetManagedObjects method
 
1568
 
                if (if_tag.getAttribute("name")
 
1569
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1570
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1571
 
                        if (cn.getAttribute("name")
 
1572
 
                            == "GetManagedObjects"):
 
1573
 
                            for arg in cn.getElementsByTagName("arg"):
 
1574
 
                                if (arg.getAttribute("direction")
 
1578
 
                                        "objpath_interfaces"
 
1580
 
            xmlstring = document.toxml("utf-8")
 
1582
 
        except (AttributeError, xml.dom.DOMException,
 
1583
 
                xml.parsers.expat.ExpatError) as error:
 
1584
 
            logger.error("Failed to override Introspection method",
 
1589
1054
def datetime_to_dbus(dt, variant_level=0):
 
1590
1055
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1592
 
        return dbus.String("", variant_level=variant_level)
 
1593
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1057
        return dbus.String("", variant_level = variant_level)
 
 
1058
    return dbus.String(dt.isoformat(),
 
 
1059
                       variant_level=variant_level)
 
1596
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1627
1092
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1628
1093
                # with the wrong interface name
 
1629
1094
                if (not hasattr(attribute, "_dbus_interface")
 
1630
 
                    or not attribute._dbus_interface.startswith(
 
1631
 
                        orig_interface_name)):
 
 
1095
                    or not attribute._dbus_interface
 
 
1096
                    .startswith(orig_interface_name)):
 
1633
1098
                # Create an alternate D-Bus interface name based on
 
1634
1099
                # the current name
 
1635
 
                alt_interface = attribute._dbus_interface.replace(
 
1636
 
                    orig_interface_name, alt_interface_name)
 
 
1100
                alt_interface = (attribute._dbus_interface
 
 
1101
                                 .replace(orig_interface_name,
 
 
1102
                                          alt_interface_name))
 
1637
1103
                interface_names.add(alt_interface)
 
1638
1104
                # Is this a D-Bus signal?
 
1639
1105
                if getattr(attribute, "_dbus_is_signal", False):
 
1640
1106
                    # Extract the original non-method undecorated
 
1641
1107
                    # function by black magic
 
1642
 
                    if sys.version_info.major == 2:
 
1643
 
                        nonmethod_func = (dict(
 
 
1108
                    nonmethod_func = (dict(
 
1644
1109
                            zip(attribute.func_code.co_freevars,
 
1645
 
                                attribute.__closure__))
 
1646
 
                                          ["func"].cell_contents)
 
1648
 
                        nonmethod_func = (dict(
 
1649
 
                            zip(attribute.__code__.co_freevars,
 
1650
 
                                attribute.__closure__))
 
1651
 
                                          ["func"].cell_contents)
 
 
1110
                                attribute.__closure__))["func"]
 
1652
1112
                    # Create a new, but exactly alike, function
 
1653
1113
                    # object, and decorate it to be a new D-Bus signal
 
1654
1114
                    # with the alternate D-Bus interface name
 
1655
 
                    new_function = copy_function(nonmethod_func)
 
1656
 
                    new_function = (dbus.service.signal(
 
1658
 
                        attribute._dbus_signature)(new_function))
 
 
1115
                    new_function = (dbus.service.signal
 
 
1117
                                     attribute._dbus_signature)
 
 
1118
                                    (types.FunctionType(
 
 
1119
                                nonmethod_func.func_code,
 
 
1120
                                nonmethod_func.func_globals,
 
 
1121
                                nonmethod_func.func_name,
 
 
1122
                                nonmethod_func.func_defaults,
 
 
1123
                                nonmethod_func.func_closure)))
 
1659
1124
                    # Copy annotations, if any
 
1661
 
                        new_function._dbus_annotations = dict(
 
1662
 
                            attribute._dbus_annotations)
 
 
1126
                        new_function._dbus_annotations = (
 
 
1127
                            dict(attribute._dbus_annotations))
 
1663
1128
                    except AttributeError:
 
1666
1130
                    # Define a creator of a function to call both the
 
1667
1131
                    # original and alternate functions, so both the
 
1668
1132
                    # original and alternate signals gets sent when
 
 
1957
1411
        server to mandos-client
 
1961
1415
    # Rejected - signal
 
1962
1416
    @dbus.service.signal(_interface, signature="s")
 
1963
1417
    def Rejected(self, reason):
 
1967
1421
    # NeedApproval - signal
 
1968
1422
    @dbus.service.signal(_interface, signature="tb")
 
1969
1423
    def NeedApproval(self, timeout, default):
 
1971
1425
        return self.need_approval()
 
1975
1429
    # Approve - method
 
1976
1430
    @dbus.service.method(_interface, in_signature="b")
 
1977
1431
    def Approve(self, value):
 
1978
1432
        self.approve(value)
 
1980
1434
    # CheckedOK - method
 
1981
1435
    @dbus.service.method(_interface)
 
1982
1436
    def CheckedOK(self):
 
1983
1437
        self.checked_ok()
 
1985
1439
    # Enable - method
 
1986
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1987
1440
    @dbus.service.method(_interface)
 
1988
1441
    def Enable(self):
 
1992
1445
    # StartChecker - method
 
1993
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1994
1446
    @dbus.service.method(_interface)
 
1995
1447
    def StartChecker(self):
 
1997
1449
        self.start_checker()
 
1999
1451
    # Disable - method
 
2000
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2001
1452
    @dbus.service.method(_interface)
 
2002
1453
    def Disable(self):
 
2006
1457
    # StopChecker - method
 
2007
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2008
1458
    @dbus.service.method(_interface)
 
2009
1459
    def StopChecker(self):
 
2010
1460
        self.stop_checker()
 
2014
1464
    # ApprovalPending - property
 
2015
1465
    @dbus_service_property(_interface, signature="b", access="read")
 
2016
1466
    def ApprovalPending_dbus_property(self):
 
2017
1467
        return dbus.Boolean(bool(self.approvals_pending))
 
2019
1469
    # ApprovedByDefault - property
 
2020
 
    @dbus_service_property(_interface,
 
 
1470
    @dbus_service_property(_interface, signature="b",
 
2022
1471
                           access="readwrite")
 
2023
1472
    def ApprovedByDefault_dbus_property(self, value=None):
 
2024
1473
        if value is None:       # get
 
2025
1474
            return dbus.Boolean(self.approved_by_default)
 
2026
1475
        self.approved_by_default = bool(value)
 
2028
1477
    # ApprovalDelay - property
 
2029
 
    @dbus_service_property(_interface,
 
 
1478
    @dbus_service_property(_interface, signature="t",
 
2031
1479
                           access="readwrite")
 
2032
1480
    def ApprovalDelay_dbus_property(self, value=None):
 
2033
1481
        if value is None:       # get
 
2034
 
            return dbus.UInt64(self.approval_delay.total_seconds()
 
 
1482
            return dbus.UInt64(self.approval_delay_milliseconds())
 
2036
1483
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
2038
1485
    # ApprovalDuration - property
 
2039
 
    @dbus_service_property(_interface,
 
 
1486
    @dbus_service_property(_interface, signature="t",
 
2041
1487
                           access="readwrite")
 
2042
1488
    def ApprovalDuration_dbus_property(self, value=None):
 
2043
1489
        if value is None:       # get
 
2044
 
            return dbus.UInt64(self.approval_duration.total_seconds()
 
 
1490
            return dbus.UInt64(timedelta_to_milliseconds(
 
 
1491
                    self.approval_duration))
 
2046
1492
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
2048
1494
    # Name - property
 
2050
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2051
1495
    @dbus_service_property(_interface, signature="s", access="read")
 
2052
1496
    def Name_dbus_property(self):
 
2053
1497
        return dbus.String(self.name)
 
2057
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2058
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2059
 
    def KeyID_dbus_property(self):
 
2060
 
        return dbus.String(self.key_id)
 
2062
1499
    # Fingerprint - property
 
2064
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2065
1500
    @dbus_service_property(_interface, signature="s", access="read")
 
2066
1501
    def Fingerprint_dbus_property(self):
 
2067
1502
        return dbus.String(self.fingerprint)
 
2069
1504
    # Host - property
 
2070
 
    @dbus_service_property(_interface,
 
 
1505
    @dbus_service_property(_interface, signature="s",
 
2072
1506
                           access="readwrite")
 
2073
1507
    def Host_dbus_property(self, value=None):
 
2074
1508
        if value is None:       # get
 
2075
1509
            return dbus.String(self.host)
 
2076
 
        self.host = str(value)
 
 
1510
        self.host = unicode(value)
 
2078
1512
    # Created - property
 
2080
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2081
1513
    @dbus_service_property(_interface, signature="s", access="read")
 
2082
1514
    def Created_dbus_property(self):
 
2083
1515
        return datetime_to_dbus(self.created)
 
2085
1517
    # LastEnabled - property
 
2086
1518
    @dbus_service_property(_interface, signature="s", access="read")
 
2087
1519
    def LastEnabled_dbus_property(self):
 
2088
1520
        return datetime_to_dbus(self.last_enabled)
 
2090
1522
    # Enabled - property
 
2091
 
    @dbus_service_property(_interface,
 
 
1523
    @dbus_service_property(_interface, signature="b",
 
2093
1524
                           access="readwrite")
 
2094
1525
    def Enabled_dbus_property(self, value=None):
 
2095
1526
        if value is None:       # get
 
 
2144
1574
                if (getattr(self, "disable_initiator_tag", None)
 
2147
 
                GLib.source_remove(self.disable_initiator_tag)
 
2148
 
                self.disable_initiator_tag = GLib.timeout_add(
 
2149
 
                    int((self.expires - now).total_seconds() * 1000),
 
 
1577
                gobject.source_remove(self.disable_initiator_tag)
 
 
1578
                self.disable_initiator_tag = (
 
 
1579
                    gobject.timeout_add(
 
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
2152
1583
    # ExtendedTimeout - property
 
2153
 
    @dbus_service_property(_interface,
 
 
1584
    @dbus_service_property(_interface, signature="t",
 
2155
1585
                           access="readwrite")
 
2156
1586
    def ExtendedTimeout_dbus_property(self, value=None):
 
2157
1587
        if value is None:       # get
 
2158
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
 
1588
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
2160
1589
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
2162
1591
    # Interval - property
 
2163
 
    @dbus_service_property(_interface,
 
 
1592
    @dbus_service_property(_interface, signature="t",
 
2165
1593
                           access="readwrite")
 
2166
1594
    def Interval_dbus_property(self, value=None):
 
2167
1595
        if value is None:       # get
 
2168
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
 
1596
            return dbus.UInt64(self.interval_milliseconds())
 
2169
1597
        self.interval = datetime.timedelta(0, 0, 0, value)
 
2170
1598
        if getattr(self, "checker_initiator_tag", None) is None:
 
2172
1600
        if self.enabled:
 
2173
1601
            # Reschedule checker run
 
2174
 
            GLib.source_remove(self.checker_initiator_tag)
 
2175
 
            self.checker_initiator_tag = GLib.timeout_add(
 
2176
 
                value, self.start_checker)
 
2177
 
            self.start_checker()  # Start one now, too
 
 
1602
            gobject.source_remove(self.checker_initiator_tag)
 
 
1603
            self.checker_initiator_tag = (gobject.timeout_add
 
 
1604
                                          (value, self.start_checker))
 
 
1605
            self.start_checker()    # Start one now, too
 
2179
1607
    # Checker - property
 
2180
 
    @dbus_service_property(_interface,
 
 
1608
    @dbus_service_property(_interface, signature="s",
 
2182
1609
                           access="readwrite")
 
2183
1610
    def Checker_dbus_property(self, value=None):
 
2184
1611
        if value is None:       # get
 
2185
1612
            return dbus.String(self.checker_command)
 
2186
 
        self.checker_command = str(value)
 
 
1613
        self.checker_command = unicode(value)
 
2188
1615
    # CheckerRunning - property
 
2189
 
    @dbus_service_property(_interface,
 
 
1616
    @dbus_service_property(_interface, signature="b",
 
2191
1617
                           access="readwrite")
 
2192
1618
    def CheckerRunning_dbus_property(self, value=None):
 
2193
1619
        if value is None:       # get
 
 
2377
1792
                        delay -= time2 - time
 
2380
 
                    session.send(client.secret)
 
2381
 
                except gnutls.Error as error:
 
2382
 
                    logger.warning("gnutls send failed",
 
 
1795
                while sent_size < len(client.secret):
 
 
1797
                        sent = session.send(client.secret[sent_size:])
 
 
1798
                    except gnutls.errors.GNUTLSError as error:
 
 
1799
                        logger.warning("gnutls send failed",
 
 
1802
                    logger.debug("Sent: %d, remaining: %d",
 
 
1803
                                 sent, len(client.secret)
 
 
1804
                                 - (sent_size + sent))
 
2386
1807
                logger.info("Sending secret to %s", client.name)
 
2387
1808
                # bump the timeout using extended_timeout
 
2388
1809
                client.bump_timeout(client.extended_timeout)
 
2389
1810
                if self.server.use_dbus:
 
2390
1811
                    # Emit D-Bus signal
 
2391
1812
                    client.GotSecret()
 
2394
1815
                if approval_required:
 
2395
1816
                    client.approvals_pending -= 1
 
2398
 
                except gnutls.Error as error:
 
 
1819
                except gnutls.errors.GNUTLSError as error:
 
2399
1820
                    logger.warning("GnuTLS bye failed",
 
2400
1821
                                   exc_info=error)
 
2403
1824
    def peer_certificate(session):
 
2404
 
        "Return the peer's certificate as a bytestring"
 
2406
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2408
 
        except AttributeError:
 
2409
 
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2410
 
        if gnutls.has_rawpk:
 
2411
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2413
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2414
 
        # If not a valid certificate type...
 
2415
 
        if cert_type not in valid_cert_types:
 
2416
 
            logger.info("Cert type %r not in %r", cert_type,
 
2418
 
            # ...return invalid data
 
 
1825
        "Return the peer's OpenPGP certificate as a bytestring"
 
 
1826
        # If not an OpenPGP certificate...
 
 
1827
        if (gnutls.library.functions
 
 
1828
            .gnutls_certificate_type_get(session._c_object)
 
 
1829
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1830
            # ...do the normal thing
 
 
1831
            return session.peer_certificate
 
2420
1832
        list_size = ctypes.c_uint(1)
 
2421
 
        cert_list = (gnutls.certificate_get_peers
 
 
1833
        cert_list = (gnutls.library.functions
 
 
1834
                     .gnutls_certificate_get_peers
 
2422
1835
                     (session._c_object, ctypes.byref(list_size)))
 
2423
1836
        if not bool(cert_list) and list_size.value != 0:
 
2424
 
            raise gnutls.Error("error getting peer certificate")
 
 
1837
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2425
1839
        if list_size.value == 0:
 
2427
1841
        cert = cert_list[0]
 
2428
1842
        return ctypes.string_at(cert.data, cert.size)
 
2431
 
    def key_id(certificate):
 
2432
 
        "Convert a certificate bytestring to a hexdigit key ID"
 
2433
 
        # New GnuTLS "datum" with the public key
 
2434
 
        datum = gnutls.datum_t(
 
2435
 
            ctypes.cast(ctypes.c_char_p(certificate),
 
2436
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2437
 
            ctypes.c_uint(len(certificate)))
 
2438
 
        # XXX all these need to be created in the gnutls "module"
 
2439
 
        # New empty GnuTLS certificate
 
2440
 
        pubkey = gnutls.pubkey_t()
 
2441
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2442
 
        # Import the raw public key into the certificate
 
2443
 
        gnutls.pubkey_import(pubkey,
 
2444
 
                             ctypes.byref(datum),
 
2445
 
                             gnutls.X509_FMT_DER)
 
2446
 
        # New buffer for the key ID
 
2447
 
        buf = ctypes.create_string_buffer(32)
 
2448
 
        buf_len = ctypes.c_size_t(len(buf))
 
2449
 
        # Get the key ID from the raw public key into the buffer
 
2450
 
        gnutls.pubkey_get_key_id(pubkey,
 
2451
 
                                 gnutls.KEYID_USE_SHA256,
 
2452
 
                                 ctypes.cast(ctypes.byref(buf),
 
2453
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2454
 
                                 ctypes.byref(buf_len))
 
2455
 
        # Deinit the certificate
 
2456
 
        gnutls.pubkey_deinit(pubkey)
 
2458
 
        # Convert the buffer to a Python bytestring
 
2459
 
        key_id = ctypes.string_at(buf, buf_len.value)
 
2460
 
        # Convert the bytestring to hexadecimal notation
 
2461
 
        hex_key_id = binascii.hexlify(key_id).upper()
 
2465
1845
    def fingerprint(openpgp):
 
2466
1846
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2467
1847
        # New GnuTLS "datum" with the OpenPGP public key
 
2468
 
        datum = gnutls.datum_t(
 
2469
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2470
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2471
 
            ctypes.c_uint(len(openpgp)))
 
 
1848
        datum = (gnutls.library.types
 
 
1849
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1852
                                 ctypes.c_uint(len(openpgp))))
 
2472
1853
        # New empty GnuTLS certificate
 
2473
 
        crt = gnutls.openpgp_crt_t()
 
2474
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1854
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1855
        (gnutls.library.functions
 
 
1856
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2475
1857
        # Import the OpenPGP public key into the certificate
 
2476
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2477
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1858
        (gnutls.library.functions
 
 
1859
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1860
                                    gnutls.library.constants
 
 
1861
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2478
1862
        # Verify the self signature in the key
 
2479
1863
        crtverify = ctypes.c_uint()
 
2480
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2481
 
                                       ctypes.byref(crtverify))
 
 
1864
        (gnutls.library.functions
 
 
1865
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1866
                                         ctypes.byref(crtverify)))
 
2482
1867
        if crtverify.value != 0:
 
2483
 
            gnutls.openpgp_crt_deinit(crt)
 
2484
 
            raise gnutls.CertificateSecurityError(code
 
 
1868
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1869
            raise (gnutls.errors.CertificateSecurityError
 
2486
1871
        # New buffer for the fingerprint
 
2487
1872
        buf = ctypes.create_string_buffer(20)
 
2488
1873
        buf_len = ctypes.c_size_t()
 
2489
1874
        # Get the fingerprint from the certificate into the buffer
 
2490
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2491
 
                                           ctypes.byref(buf_len))
 
 
1875
        (gnutls.library.functions
 
 
1876
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1877
                                             ctypes.byref(buf_len)))
 
2492
1878
        # Deinit the certificate
 
2493
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1879
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2494
1880
        # Convert the buffer to a Python bytestring
 
2495
1881
        fpr = ctypes.string_at(buf, buf_len.value)
 
2496
1882
        # Convert the bytestring to hexadecimal notation
 
 
2585
1965
        # socket_wrapper(), if socketfd was set.
 
2586
1966
        socketserver.TCPServer.__init__(self, server_address,
 
2587
1967
                                        RequestHandlerClass)
 
2589
1969
    def server_bind(self):
 
2590
1970
        """This overrides the normal server_bind() function
 
2591
1971
        to bind to an interface if one was specified, and also NOT to
 
2592
1972
        bind to an address or port if they were not specified."""
 
2593
 
        global SO_BINDTODEVICE
 
2594
1973
        if self.interface is not None:
 
2595
1974
            if SO_BINDTODEVICE is None:
 
2596
 
                # Fall back to a hard-coded value which seems to be
 
2598
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2599
 
                SO_BINDTODEVICE = 25
 
2601
 
                self.socket.setsockopt(
 
2602
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2603
 
                    (self.interface + "\0").encode("utf-8"))
 
2604
 
            except socket.error as error:
 
2605
 
                if error.errno == errno.EPERM:
 
2606
 
                    logger.error("No permission to bind to"
 
2607
 
                                 " interface %s", self.interface)
 
2608
 
                elif error.errno == errno.ENOPROTOOPT:
 
2609
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2610
 
                                 " cannot bind to interface %s",
 
2612
 
                elif error.errno == errno.ENODEV:
 
2613
 
                    logger.error("Interface %s does not exist,"
 
2614
 
                                 " cannot bind", self.interface)
 
 
1975
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1976
                             " cannot bind to interface %s",
 
 
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1982
                                           str(self.interface + '\0'))
 
 
1983
                except socket.error as error:
 
 
1984
                    if error.errno == errno.EPERM:
 
 
1985
                        logger.error("No permission to bind to"
 
 
1986
                                     " interface %s", self.interface)
 
 
1987
                    elif error.errno == errno.ENOPROTOOPT:
 
 
1988
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1989
                                     " cannot bind to interface %s",
 
 
1991
                    elif error.errno == errno.ENODEV:
 
 
1992
                        logger.error("Interface %s does not exist,"
 
 
1993
                                     " cannot bind", self.interface)
 
2617
1996
        # Only bind(2) the socket if we really need to.
 
2618
1997
        if self.server_address[0] or self.server_address[1]:
 
2619
1998
            if not self.server_address[0]:
 
2620
1999
                if self.address_family == socket.AF_INET6:
 
2621
 
                    any_address = "::"  # in6addr_any
 
 
2000
                    any_address = "::" # in6addr_any
 
2623
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
2002
                    any_address = "0.0.0.0" # INADDR_ANY
 
2624
2003
                self.server_address = (any_address,
 
2625
2004
                                       self.server_address[1])
 
2626
2005
            elif not self.server_address[1]:
 
2627
 
                self.server_address = (self.server_address[0], 0)
 
 
2006
                self.server_address = (self.server_address[0],
 
2628
2008
#                 if self.interface:
 
2629
2009
#                     self.server_address = (self.server_address[0],
 
 
2660
2035
        self.gnutls_priority = gnutls_priority
 
2661
2036
        IPv6_TCPServer.__init__(self, server_address,
 
2662
2037
                                RequestHandlerClass,
 
2663
 
                                interface=interface,
 
 
2038
                                interface = interface,
 
 
2039
                                use_ipv6 = use_ipv6,
 
 
2040
                                socketfd = socketfd)
 
2667
2041
    def server_activate(self):
 
2668
2042
        if self.enabled:
 
2669
2043
            return socketserver.TCPServer.server_activate(self)
 
2671
2045
    def enable(self):
 
2672
2046
        self.enabled = True
 
2674
2048
    def add_pipe(self, parent_pipe, proc):
 
2675
2049
        # Call "handle_ipc" for both data and EOF events
 
2677
 
            parent_pipe.fileno(),
 
2678
 
            GLib.IO_IN | GLib.IO_HUP,
 
2679
 
            functools.partial(self.handle_ipc,
 
2680
 
                              parent_pipe=parent_pipe,
 
2683
 
    def handle_ipc(self, source, condition,
 
2686
 
                   client_object=None):
 
 
2050
        gobject.io_add_watch(parent_pipe.fileno(),
 
 
2051
                             gobject.IO_IN | gobject.IO_HUP,
 
 
2052
                             functools.partial(self.handle_ipc,
 
 
2057
    def handle_ipc(self, source, condition, parent_pipe=None,
 
 
2058
                   proc = None, client_object=None):
 
2687
2059
        # error, or the other end of multiprocessing.Pipe has closed
 
2688
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
 
2060
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2689
2061
            # Wait for other process to exit
 
2693
2065
        # Read a request from the child
 
2694
2066
        request = parent_pipe.recv()
 
2695
2067
        command = request[0]
 
2697
2069
        if command == 'init':
 
2698
 
            key_id = request[1].decode("ascii")
 
2699
 
            fpr = request[2].decode("ascii")
 
2700
 
            address = request[3]
 
2702
 
            for c in self.clients.values():
 
2703
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2705
 
                if key_id and c.key_id == key_id:
 
2708
 
                if fpr and c.fingerprint == fpr:
 
 
2071
            address = request[2]
 
 
2073
            for c in self.clients.itervalues():
 
 
2074
                if c.fingerprint == fpr:
 
2712
 
                logger.info("Client not found for key ID: %s, address"
 
2713
 
                            ": %s", key_id or fpr, address)
 
 
2078
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2079
                            "dress: %s", fpr, address)
 
2714
2080
                if self.use_dbus:
 
2715
2081
                    # Emit D-Bus signal
 
2716
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
 
2082
                    mandos_dbus_service.ClientNotFound(fpr,
 
2718
2084
                parent_pipe.send(False)
 
2722
 
                parent_pipe.fileno(),
 
2723
 
                GLib.IO_IN | GLib.IO_HUP,
 
2724
 
                functools.partial(self.handle_ipc,
 
2725
 
                                  parent_pipe=parent_pipe,
 
2727
 
                                  client_object=client))
 
 
2087
            gobject.io_add_watch(parent_pipe.fileno(),
 
 
2088
                                 gobject.IO_IN | gobject.IO_HUP,
 
 
2089
                                 functools.partial(self.handle_ipc,
 
2728
2095
            parent_pipe.send(True)
 
2729
2096
            # remove the old hook in favor of the new above hook on
 
 
3136
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3138
2497
    except OSError as error:
 
3139
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3140
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3141
2498
        if error.errno != errno.EPERM:
 
3145
2502
        # Enable all possible GnuTLS debugging
 
3147
2504
        # "Use a log level over 10 to enable all debugging options."
 
3148
2505
        # - GnuTLS manual
 
3149
 
        gnutls.global_set_log_level(11)
 
 
2506
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2508
        @gnutls.library.types.gnutls_log_func
 
3152
2509
        def debug_gnutls(level, string):
 
3153
2510
            logger.debug("GnuTLS: %s", string[:-1])
 
3155
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
2512
        (gnutls.library.functions
 
 
2513
         .gnutls_global_set_log_function(debug_gnutls))
 
3157
2515
        # Redirect stdin so all checkers get /dev/null
 
3158
2516
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
3159
2517
        os.dup2(null, sys.stdin.fileno())
 
3163
2521
    # Need to fork before connecting to D-Bus
 
3164
2522
    if not foreground:
 
3165
2523
        # Close all input and output, do double fork, etc.
 
3168
 
    # multiprocessing will use threads, so before we use GLib we need
 
3169
 
    # to inform GLib that threads will be used.
 
 
2526
    # multiprocessing will use threads, so before we use gobject we
 
 
2527
    # need to inform gobject that threads will be used.
 
 
2528
    gobject.threads_init()
 
3172
2530
    global main_loop
 
3173
2531
    # From the Avahi example code
 
3174
2532
    DBusGMainLoop(set_as_default=True)
 
3175
 
    main_loop = GLib.MainLoop()
 
 
2533
    main_loop = gobject.MainLoop()
 
3176
2534
    bus = dbus.SystemBus()
 
3177
2535
    # End of Avahi example code
 
3180
2538
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3183
 
            old_bus_name = dbus.service.BusName(
 
3184
 
                "se.bsnet.fukt.Mandos", bus,
 
3186
 
        except dbus.exceptions.DBusException as e:
 
 
2539
                                            bus, do_not_queue=True)
 
 
2540
            old_bus_name = (dbus.service.BusName
 
 
2541
                            ("se.bsnet.fukt.Mandos", bus,
 
 
2543
        except dbus.exceptions.NameExistsException as e:
 
3187
2544
            logger.error("Disabling D-Bus:", exc_info=e)
 
3188
2545
            use_dbus = False
 
3189
2546
            server_settings["use_dbus"] = False
 
3190
2547
            tcp_server.use_dbus = False
 
3192
2549
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3193
 
        service = AvahiServiceToSyslog(
 
3194
 
            name=server_settings["servicename"],
 
3195
 
            servicetype="_mandos._tcp",
 
 
2550
        service = AvahiServiceToSyslog(name =
 
 
2551
                                       server_settings["servicename"],
 
 
2552
                                       servicetype = "_mandos._tcp",
 
 
2553
                                       protocol = protocol, bus = bus)
 
3198
2554
        if server_settings["interface"]:
 
3199
 
            service.interface = if_nametoindex(
 
3200
 
                server_settings["interface"].encode("utf-8"))
 
 
2555
            service.interface = (if_nametoindex
 
 
2556
                                 (str(server_settings["interface"])))
 
3202
2558
    global multiprocessing_manager
 
3203
2559
    multiprocessing_manager = multiprocessing.Manager()
 
3205
2561
    client_class = Client
 
3207
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
2563
        client_class = functools.partial(ClientDBus, bus = bus)
 
3209
2565
    client_settings = Client.config_parser(client_config)
 
3210
2566
    old_client_settings = {}
 
3211
2567
    clients_data = {}
 
3213
2569
    # This is used to redirect stdout and stderr for checker processes
 
3215
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
2571
    wnull = open(os.devnull, "w") # A writable /dev/null
 
3216
2572
    # Only used if server is running in foreground but not in debug
 
3218
2574
    if debug or not foreground:
 
3221
2577
    # Get client data and settings from last running state.
 
3222
2578
    if server_settings["restore"]:
 
3224
2580
            with open(stored_state_path, "rb") as stored_state:
 
3225
 
                if sys.version_info.major == 2:
 
3226
 
                    clients_data, old_client_settings = pickle.load(
 
3229
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3230
 
                        pickle.load(stored_state, encoding="bytes"))
 
3231
 
                    #   Fix bytes to strings
 
3234
 
                    clients_data = {(key.decode("utf-8")
 
3235
 
                                     if isinstance(key, bytes)
 
3238
 
                                    bytes_clients_data.items()}
 
3239
 
                    del bytes_clients_data
 
3240
 
                    for key in clients_data:
 
3241
 
                        value = {(k.decode("utf-8")
 
3242
 
                                  if isinstance(k, bytes) else k): v
 
3244
 
                                 clients_data[key].items()}
 
3245
 
                        clients_data[key] = value
 
3247
 
                        value["client_structure"] = [
 
3249
 
                             if isinstance(s, bytes)
 
3251
 
                            value["client_structure"]]
 
3253
 
                        for k in ("name", "host"):
 
3254
 
                            if isinstance(value[k], bytes):
 
3255
 
                                value[k] = value[k].decode("utf-8")
 
3256
 
                        if not value.has_key("key_id"):
 
3257
 
                            value["key_id"] = ""
 
3258
 
                        elif not value.has_key("fingerprint"):
 
3259
 
                            value["fingerprint"] = ""
 
3260
 
                    #  old_client_settings
 
3262
 
                    old_client_settings = {
 
3263
 
                        (key.decode("utf-8")
 
3264
 
                         if isinstance(key, bytes)
 
3267
 
                        bytes_old_client_settings.items()}
 
3268
 
                    del bytes_old_client_settings
 
3270
 
                    for value in old_client_settings.values():
 
3271
 
                        if isinstance(value["host"], bytes):
 
3272
 
                            value["host"] = (value["host"]
 
 
2581
                clients_data, old_client_settings = (pickle.load
 
3274
2583
            os.remove(stored_state_path)
 
3275
2584
        except IOError as e:
 
3276
2585
            if e.errno == errno.ENOENT:
 
3277
 
                logger.warning("Could not load persistent state:"
 
3278
 
                               " {}".format(os.strerror(e.errno)))
 
 
2586
                logger.warning("Could not load persistent state: {0}"
 
 
2587
                                .format(os.strerror(e.errno)))
 
3280
2589
                logger.critical("Could not load persistent state:",
 
3283
2592
        except EOFError as e:
 
3284
2593
            logger.warning("Could not load persistent state: "
 
 
2594
                           "EOFError:", exc_info=e)
 
3288
2596
    with PGPEngine() as pgp:
 
3289
 
        for client_name, client in clients_data.items():
 
 
2597
        for client_name, client in clients_data.iteritems():
 
3290
2598
            # Skip removed clients
 
3291
2599
            if client_name not in client_settings:
 
3294
2602
            # Decide which value to use after restoring saved state.
 
3295
2603
            # We have three different values: Old config file,
 
3296
2604
            # new config file, and saved state.
 
 
3354
2662
    for client_name in (set(client_settings)
 
3355
2663
                        - set(old_client_settings)):
 
3356
2664
        clients_data[client_name] = client_settings[client_name]
 
3358
2666
    # Create all client objects
 
3359
 
    for client_name, client in clients_data.items():
 
 
2667
    for client_name, client in clients_data.iteritems():
 
3360
2668
        tcp_server.clients[client_name] = client_class(
 
3363
 
            server_settings=server_settings)
 
 
2669
            name = client_name, settings = client,
 
 
2670
            server_settings = server_settings)
 
3365
2672
    if not tcp_server.clients:
 
3366
2673
        logger.warning("No clients defined")
 
3368
2675
    if not foreground:
 
3369
2676
        if pidfile is not None:
 
3373
 
                    print(pid, file=pidfile)
 
 
2680
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
3374
2681
            except IOError:
 
3375
2682
                logger.error("Could not write to file %r with PID %d",
 
3376
2683
                             pidfilename, pid)
 
3378
2685
        del pidfilename
 
3380
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3381
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3382
 
                             lambda: main_loop.quit() and False)
 
 
2687
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
2688
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3386
 
        @alternate_dbus_interfaces(
 
3387
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3388
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
2691
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
2692
                                        "se.bsnet.fukt.Mandos"})
 
 
2693
        class MandosDBusService(DBusObjectWithProperties):
 
3389
2694
            """A D-Bus proxy object"""
 
3391
2695
            def __init__(self):
 
3392
2696
                dbus.service.Object.__init__(self, bus, "/")
 
3394
2697
            _interface = "se.recompile.Mandos"
 
 
2699
            @dbus_interface_annotations(_interface)
 
 
2701
                return { "org.freedesktop.DBus.Property"
 
 
2702
                         ".EmitsChangedSignal":
 
3396
2705
            @dbus.service.signal(_interface, signature="o")
 
3397
2706
            def ClientAdded(self, objpath):
 
3401
2710
            @dbus.service.signal(_interface, signature="ss")
 
3402
 
            def ClientNotFound(self, key_id, address):
 
 
2711
            def ClientNotFound(self, fingerprint, address):
 
3406
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3408
2715
            @dbus.service.signal(_interface, signature="os")
 
3409
2716
            def ClientRemoved(self, objpath, name):
 
3413
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3415
2720
            @dbus.service.method(_interface, out_signature="ao")
 
3416
2721
            def GetAllClients(self):
 
3418
 
                return dbus.Array(c.dbus_object_path for c in
 
3419
 
                                  tcp_server.clients.values())
 
3421
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
2723
                return dbus.Array(c.dbus_object_path
 
 
2725
                                  tcp_server.clients.itervalues())
 
3423
2727
            @dbus.service.method(_interface,
 
3424
2728
                                 out_signature="a{oa{sv}}")
 
3425
2729
            def GetAllClientsWithProperties(self):
 
3427
2731
                return dbus.Dictionary(
 
3428
 
                    {c.dbus_object_path: c.GetAll(
 
3429
 
                        "se.recompile.Mandos.Client")
 
3430
 
                     for c in tcp_server.clients.values()},
 
 
2732
                    ((c.dbus_object_path, c.GetAll(""))
 
 
2733
                     for c in tcp_server.clients.itervalues()),
 
3431
2734
                    signature="oa{sv}")
 
3433
2736
            @dbus.service.method(_interface, in_signature="o")
 
3434
2737
            def RemoveClient(self, object_path):
 
3436
 
                for c in tcp_server.clients.values():
 
 
2739
                for c in tcp_server.clients.itervalues():
 
3437
2740
                    if c.dbus_object_path == object_path:
 
3438
2741
                        del tcp_server.clients[c.name]
 
3439
2742
                        c.remove_from_connection()
 
3440
 
                        # Don't signal the disabling
 
 
2743
                        # Don't signal anything except ClientRemoved
 
3441
2744
                        c.disable(quiet=True)
 
3442
 
                        # Emit D-Bus signal for removal
 
3443
 
                        self.client_removed_signal(c)
 
 
2746
                        self.ClientRemoved(object_path, c.name)
 
3445
2748
                raise KeyError(object_path)
 
3449
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3450
 
                                 out_signature="a{oa{sa{sv}}}")
 
3451
 
            def GetManagedObjects(self):
 
3453
 
                return dbus.Dictionary(
 
3454
 
                    {client.dbus_object_path:
 
3456
 
                         {interface: client.GetAll(interface)
 
3458
 
                          client._get_all_interface_names()})
 
3459
 
                     for client in tcp_server.clients.values()})
 
3461
 
            def client_added_signal(self, client):
 
3462
 
                """Send the new standard signal and the old signal"""
 
3464
 
                    # New standard signal
 
3465
 
                    self.InterfacesAdded(
 
3466
 
                        client.dbus_object_path,
 
3468
 
                            {interface: client.GetAll(interface)
 
3470
 
                             client._get_all_interface_names()}))
 
3472
 
                    self.ClientAdded(client.dbus_object_path)
 
3474
 
            def client_removed_signal(self, client):
 
3475
 
                """Send the new standard signal and the old signal"""
 
3477
 
                    # New standard signal
 
3478
 
                    self.InterfacesRemoved(
 
3479
 
                        client.dbus_object_path,
 
3480
 
                        client._get_all_interface_names())
 
3482
 
                    self.ClientRemoved(client.dbus_object_path,
 
3485
2752
        mandos_dbus_service = MandosDBusService()
 
3487
 
    # Save modules to variables to exempt the modules from being
 
3488
 
    # unloaded before the function registered with atexit() is run.
 
3489
 
    mp = multiprocessing
 
3493
2755
        "Cleanup function; run on exit"
 
3495
2757
            service.cleanup()
 
3497
 
        mp.active_children()
 
 
2759
        multiprocessing.active_children()
 
3499
2761
        if not (tcp_server.clients or client_settings):
 
3502
2764
        # Store client before exiting. Secrets are encrypted with key
 
3503
2765
        # based on what config file has. If config file is
 
3504
2766
        # removed/edited, old secret will thus be unrecovable.
 
3506
2768
        with PGPEngine() as pgp:
 
3507
 
            for client in tcp_server.clients.values():
 
 
2769
            for client in tcp_server.clients.itervalues():
 
3508
2770
                key = client_settings[client.name]["secret"]
 
3509
2771
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3511
2773
                client_dict = {}
 
3513
2775
                # A list of attributes that can not be pickled
 
3515
 
                exclude = {"bus", "changedstate", "secret",
 
3516
 
                           "checker", "server_settings"}
 
3517
 
                for name, typ in inspect.getmembers(dbus.service
 
 
2777
                exclude = set(("bus", "changedstate", "secret",
 
 
2778
                               "checker", "server_settings"))
 
 
2779
                for name, typ in (inspect.getmembers
 
 
2780
                                  (dbus.service.Object)):
 
3519
2781
                    exclude.add(name)
 
3521
2783
                client_dict["encrypted_secret"] = (client
 
3522
2784
                                                   .encrypted_secret)
 
3523
2785
                for attr in client.client_structure:
 
3524
2786
                    if attr not in exclude:
 
3525
2787
                        client_dict[attr] = getattr(client, attr)
 
3527
2789
                clients[client.name] = client_dict
 
3528
2790
                del client_settings[client.name]["secret"]
 
3531
 
            with tempfile.NamedTemporaryFile(
 
3535
 
                    dir=os.path.dirname(stored_state_path),
 
3536
 
                    delete=False) as stored_state:
 
3537
 
                pickle.dump((clients, client_settings), stored_state,
 
3539
 
                tempname = stored_state.name
 
 
2793
            with (tempfile.NamedTemporaryFile
 
 
2794
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
 
2795
                   dir=os.path.dirname(stored_state_path),
 
 
2796
                   delete=False)) as stored_state:
 
 
2797
                pickle.dump((clients, client_settings), stored_state)
 
 
2798
                tempname=stored_state.name
 
3540
2799
            os.rename(tempname, stored_state_path)
 
3541
2800
        except (IOError, OSError) as e: