2
 
# -*- coding: utf-8; lexical-binding: t -*-
 
 
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-2022 Teddy Hogeborn
 
15
 
# Copyright © 2008-2022 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-2011 Teddy Hogeborn
 
 
15
# Copyright © 2008-2011 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/>.
 
32
 
# Contact the authors at <mandos@recompile.se>.
 
 
28
# along with this program.  If not, see
 
 
29
# <http://www.gnu.org/licenses/>.
 
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
 
34
34
from __future__ import (division, absolute_import, print_function,
 
38
 
    from future_builtins import *
 
 
37
import SocketServer as socketserver
 
48
 
    import SocketServer as socketserver
 
55
 
    import ConfigParser as configparser
 
 
43
import gnutls.connection
 
 
45
import gnutls.library.functions
 
 
46
import gnutls.library.constants
 
 
47
import gnutls.library.types
 
 
48
import ConfigParser as configparser
 
63
57
import logging.handlers
 
70
 
    import cPickle as pickle
 
 
63
import cPickle as pickle
 
73
64
import multiprocessing
 
84
67
import dbus.service
 
86
 
from gi.repository import GLib
 
87
70
from dbus.mainloop.glib import DBusGMainLoop
 
90
73
import xml.dom.minidom
 
93
 
if sys.version_info.major == 2:
 
98
 
# Add collections.abc.Callable if it does not exist
 
100
 
    collections.abc.Callable
 
101
 
except AttributeError:
 
103
 
        Callable = collections.Callable
 
104
 
    collections.abc = abc
 
107
 
# Add shlex.quote if it does not exist
 
110
 
except AttributeError:
 
111
 
    shlex.quote = re.escape
 
113
 
# Show warnings by default
 
114
 
if not sys.warnoptions:
 
116
 
    warnings.simplefilter("default")
 
118
 
# Try to find the value of SO_BINDTODEVICE:
 
120
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
121
 
    # newer, and it is also the most natural place for it:
 
122
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
123
78
except AttributeError:
 
125
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
127
80
        from IN import SO_BINDTODEVICE
 
128
81
    except ImportError:
 
129
 
        # In Python 2.7 it seems to have been removed entirely.
 
130
 
        # Try running the C preprocessor:
 
132
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
134
 
                                  stdin=subprocess.PIPE,
 
135
 
                                  stdout=subprocess.PIPE)
 
136
 
            stdout = cc.communicate(
 
137
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
138
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
139
 
        except (OSError, ValueError, IndexError):
 
141
 
            SO_BINDTODEVICE = None
 
143
 
if sys.version_info < (3, 2):
 
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
147
 
stored_state_file = "clients.pickle"
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
 
154
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
155
 
        ctypes.util.find_library("c")).if_nametoindex
 
156
 
except (OSError, AttributeError):
 
158
 
    def if_nametoindex(interface):
 
159
 
        "Get an interface index the hard way, i.e. using fcntl()"
 
160
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
161
 
        with contextlib.closing(socket.socket()) as s:
 
162
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
163
 
                                struct.pack(b"16s16x", interface))
 
164
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
165
 
        return interface_index
 
168
 
def copy_function(func):
 
169
 
    """Make a copy of a function"""
 
170
 
    if sys.version_info.major == 2:
 
171
 
        return types.FunctionType(func.func_code,
 
177
 
        return types.FunctionType(func.__code__,
 
184
 
def initlogger(debug, level=logging.WARNING):
 
185
 
    """init logger and add loglevel"""
 
188
 
    syslogger = (logging.handlers.SysLogHandler(
 
189
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
191
 
    syslogger.setFormatter(logging.Formatter
 
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
 
194
 
    log.addHandler(syslogger)
 
197
 
        console = logging.StreamHandler()
 
198
 
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
 
202
 
        log.addHandler(console)
 
206
 
class PGPError(Exception):
 
207
 
    """Exception if encryption/decryption fails"""
 
212
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
215
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
218
 
            output = subprocess.check_output(["gpgconf"])
 
219
 
            for line in output.splitlines():
 
220
 
                name, text, path = line.split(b":")
 
225
 
            if e.errno != errno.ENOENT:
 
227
 
        self.gnupgargs = ["--batch",
 
228
 
                          "--homedir", self.tempdir,
 
231
 
        # Only GPG version 1 has the --no-use-agent option.
 
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
233
 
            self.gnupgargs.append("--no-use-agent")
 
238
 
    def __exit__(self, exc_type, exc_value, traceback):
 
246
 
        if self.tempdir is not None:
 
247
 
            # Delete contents of tempdir
 
248
 
            for root, dirs, files in os.walk(self.tempdir,
 
250
 
                for filename in files:
 
251
 
                    os.remove(os.path.join(root, filename))
 
253
 
                    os.rmdir(os.path.join(root, dirname))
 
255
 
            os.rmdir(self.tempdir)
 
258
 
    def password_encode(self, password):
 
259
 
        # Passphrase can not be empty and can not contain newlines or
 
260
 
        # NUL bytes.  So we prefix it and hex encode it.
 
261
 
        encoded = b"mandos" + binascii.hexlify(password)
 
262
 
        if len(encoded) > 2048:
 
263
 
            # GnuPG can't handle long passwords, so encode differently
 
264
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
265
 
                       .replace(b"\n", b"\\n")
 
266
 
                       .replace(b"\0", b"\\x00"))
 
269
 
    def encrypt(self, data, password):
 
270
 
        passphrase = self.password_encode(password)
 
271
 
        with tempfile.NamedTemporaryFile(
 
272
 
                dir=self.tempdir) as passfile:
 
273
 
            passfile.write(passphrase)
 
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
 
279
 
                                    stdin=subprocess.PIPE,
 
280
 
                                    stdout=subprocess.PIPE,
 
281
 
                                    stderr=subprocess.PIPE)
 
282
 
            ciphertext, err = proc.communicate(input=data)
 
283
 
        if proc.returncode != 0:
 
287
 
    def decrypt(self, data, password):
 
288
 
        passphrase = self.password_encode(password)
 
289
 
        with tempfile.NamedTemporaryFile(
 
290
 
                dir=self.tempdir) as passfile:
 
291
 
            passfile.write(passphrase)
 
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
 
297
 
                                    stdin=subprocess.PIPE,
 
298
 
                                    stdout=subprocess.PIPE,
 
299
 
                                    stderr=subprocess.PIPE)
 
300
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
301
 
        if proc.returncode != 0:
 
303
 
        return decrypted_plaintext
 
306
 
# Pretend that we have an Avahi module
 
308
 
    """This isn't so much a class as it is a module-like namespace."""
 
309
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
310
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
311
 
    PROTO_INET = 0               # avahi-common/address.h
 
312
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
313
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
314
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
315
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
316
 
    DBUS_PATH_SERVER = "/"
 
319
 
    def string_array_to_txt_array(t):
 
320
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
321
 
                           for s in t), signature="ay")
 
322
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
323
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
324
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
325
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
326
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
327
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
328
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
329
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
 
82
        SO_BINDTODEVICE = None
 
 
87
#logger = logging.getLogger('mandos')
 
 
88
logger = logging.Logger('mandos')
 
 
89
syslogger = (logging.handlers.SysLogHandler
 
 
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
 
91
              address = str("/dev/log")))
 
 
92
syslogger.setFormatter(logging.Formatter
 
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
 
95
logger.addHandler(syslogger)
 
 
97
console = logging.StreamHandler()
 
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
 
101
logger.addHandler(console)
 
332
103
class AvahiError(Exception):
 
333
104
    def __init__(self, value, *args, **kwargs):
 
334
105
        self.value = value
 
335
 
        return super(AvahiError, self).__init__(value, *args,
 
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
107
    def __unicode__(self):
 
 
108
        return unicode(repr(self.value))
 
339
110
class AvahiServiceError(AvahiError):
 
343
113
class AvahiGroupError(AvahiError):
 
 
117
class AvahiService(object):
 
348
118
    """An Avahi (Zeroconf) service.
 
351
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
352
122
               Used to optionally bind to the specified interface.
 
353
 
    name: string; Example: "Mandos"
 
354
 
    type: string; Example: "_mandos._tcp".
 
355
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
 
123
    name: string; Example: 'Mandos'
 
 
124
    type: string; Example: '_mandos._tcp'.
 
 
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
356
126
    port: integer; what port to announce
 
357
127
    TXT: list of strings; TXT record for the service
 
358
128
    domain: string; Domain to publish on, default to .local if empty.
 
 
516
260
                                    follow_name_owner_changes=True),
 
517
261
                avahi.DBUS_INTERFACE_SERVER)
 
518
262
        self.server.connect_to_signal("StateChanged",
 
519
 
                                      self.server_state_changed)
 
 
263
                                 self.server_state_changed)
 
520
264
        self.server_state_changed(self.server.GetState())
 
523
 
class AvahiServiceToSyslog(AvahiService):
 
524
 
    def rename(self, *args, **kwargs):
 
525
 
        """Add the new name to the syslog messages"""
 
526
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
528
 
        syslogger.setFormatter(logging.Formatter(
 
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
534
 
# Pretend that we have a GnuTLS module
 
536
 
    """This isn't so much a class as it is a module-like namespace."""
 
538
 
    library = ctypes.util.find_library("gnutls")
 
540
 
        library = ctypes.util.find_library("gnutls-deb0")
 
541
 
    _library = ctypes.cdll.LoadLibrary(library)
 
544
 
    # Unless otherwise indicated, the constants and types below are
 
545
 
    # all from the gnutls/gnutls.h C header file.
 
556
 
    E_NO_CERTIFICATE_FOUND = -49
 
561
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
562
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
565
 
    class _session_int(ctypes.Structure):
 
567
 
    session_t = ctypes.POINTER(_session_int)
 
569
 
    class certificate_credentials_st(ctypes.Structure):
 
571
 
    certificate_credentials_t = ctypes.POINTER(
 
572
 
        certificate_credentials_st)
 
573
 
    certificate_type_t = ctypes.c_int
 
575
 
    class datum_t(ctypes.Structure):
 
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
 
577
 
                    ("size", ctypes.c_uint)]
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
 
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
582
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
583
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
584
 
    credentials_type_t = ctypes.c_int
 
585
 
    transport_ptr_t = ctypes.c_void_p
 
586
 
    close_request_t = ctypes.c_int
 
589
 
    class Error(Exception):
 
590
 
        def __init__(self, message=None, code=None, args=()):
 
591
 
            # Default usage is by a message string, but if a return
 
592
 
            # code is passed, convert it to a string with
 
595
 
            if message is None and code is not None:
 
596
 
                message = gnutls.strerror(code).decode(
 
597
 
                    "utf-8", errors="replace")
 
598
 
            return super(gnutls.Error, self).__init__(
 
601
 
    class CertificateSecurityError(Error):
 
605
 
        def __init__(self, cls):
 
608
 
        def from_param(self, obj):
 
609
 
            if not isinstance(obj, self.cls):
 
610
 
                raise TypeError("Not of type {}: {!r}"
 
611
 
                                .format(self.cls.__name__, obj))
 
612
 
            return ctypes.byref(obj.from_param(obj))
 
614
 
    class CastToVoidPointer:
 
615
 
        def __init__(self, cls):
 
618
 
        def from_param(self, obj):
 
619
 
            if not isinstance(obj, self.cls):
 
620
 
                raise TypeError("Not of type {}: {!r}"
 
621
 
                                .format(self.cls.__name__, obj))
 
622
 
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
 
624
 
    class With_from_param:
 
626
 
        def from_param(cls, obj):
 
627
 
            return obj._as_parameter_
 
630
 
    class Credentials(With_from_param):
 
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
633
 
            gnutls.certificate_allocate_credentials(self)
 
634
 
            self.type = gnutls.CRD_CERTIFICATE
 
637
 
            gnutls.certificate_free_credentials(self)
 
639
 
    class ClientSession(With_from_param):
 
640
 
        def __init__(self, socket, credentials=None):
 
641
 
            self._as_parameter_ = gnutls.session_t()
 
642
 
            gnutls_flags = gnutls.CLIENT
 
643
 
            if gnutls.check_version(b"3.5.6"):
 
644
 
                gnutls_flags |= gnutls.NO_TICKETS
 
646
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
647
 
            gnutls.init(self, gnutls_flags)
 
649
 
            gnutls.set_default_priority(self)
 
650
 
            gnutls.transport_set_ptr(self, socket.fileno())
 
651
 
            gnutls.handshake_set_private_extensions(self, True)
 
653
 
            if credentials is None:
 
654
 
                credentials = gnutls.Credentials()
 
655
 
            gnutls.credentials_set(self, credentials.type,
 
657
 
            self.credentials = credentials
 
663
 
            return gnutls.handshake(self)
 
665
 
        def send(self, data):
 
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
675
 
    # Error handling functions
 
676
 
    def _error_code(result):
 
677
 
        """A function to raise exceptions on errors, suitable
 
678
 
        for the "restype" attribute on ctypes functions"""
 
679
 
        if result >= gnutls.E_SUCCESS:
 
681
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
682
 
            raise gnutls.CertificateSecurityError(code=result)
 
683
 
        raise gnutls.Error(code=result)
 
685
 
    def _retry_on_error(result, func, arguments,
 
686
 
                        _error_code=_error_code):
 
687
 
        """A function to retry on some errors, suitable
 
688
 
        for the "errcheck" attribute on ctypes functions"""
 
689
 
        while result < gnutls.E_SUCCESS:
 
690
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
691
 
                return _error_code(result)
 
692
 
            result = func(*arguments)
 
695
 
    # Unless otherwise indicated, the function declarations below are
 
696
 
    # all from the gnutls/gnutls.h C header file.
 
699
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
701
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
702
 
    priority_set_direct.restype = _error_code
 
704
 
    init = _library.gnutls_init
 
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
706
 
    init.restype = _error_code
 
708
 
    set_default_priority = _library.gnutls_set_default_priority
 
709
 
    set_default_priority.argtypes = [ClientSession]
 
710
 
    set_default_priority.restype = _error_code
 
712
 
    record_send = _library.gnutls_record_send
 
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
715
 
    record_send.restype = ctypes.c_ssize_t
 
716
 
    record_send.errcheck = _retry_on_error
 
718
 
    certificate_allocate_credentials = (
 
719
 
        _library.gnutls_certificate_allocate_credentials)
 
720
 
    certificate_allocate_credentials.argtypes = [
 
721
 
        PointerTo(Credentials)]
 
722
 
    certificate_allocate_credentials.restype = _error_code
 
724
 
    certificate_free_credentials = (
 
725
 
        _library.gnutls_certificate_free_credentials)
 
726
 
    certificate_free_credentials.argtypes = [Credentials]
 
727
 
    certificate_free_credentials.restype = None
 
729
 
    handshake_set_private_extensions = (
 
730
 
        _library.gnutls_handshake_set_private_extensions)
 
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
733
 
    handshake_set_private_extensions.restype = None
 
735
 
    credentials_set = _library.gnutls_credentials_set
 
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
737
 
                                CastToVoidPointer(Credentials)]
 
738
 
    credentials_set.restype = _error_code
 
740
 
    strerror = _library.gnutls_strerror
 
741
 
    strerror.argtypes = [ctypes.c_int]
 
742
 
    strerror.restype = ctypes.c_char_p
 
744
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
745
 
    certificate_type_get.argtypes = [ClientSession]
 
746
 
    certificate_type_get.restype = _error_code
 
748
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
749
 
    certificate_get_peers.argtypes = [ClientSession,
 
750
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
751
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
753
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
754
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
755
 
    global_set_log_level.restype = None
 
757
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
758
 
    global_set_log_function.argtypes = [log_func]
 
759
 
    global_set_log_function.restype = None
 
761
 
    deinit = _library.gnutls_deinit
 
762
 
    deinit.argtypes = [ClientSession]
 
763
 
    deinit.restype = None
 
765
 
    handshake = _library.gnutls_handshake
 
766
 
    handshake.argtypes = [ClientSession]
 
767
 
    handshake.restype = ctypes.c_int
 
768
 
    handshake.errcheck = _retry_on_error
 
770
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
772
 
    transport_set_ptr.restype = None
 
774
 
    bye = _library.gnutls_bye
 
775
 
    bye.argtypes = [ClientSession, close_request_t]
 
776
 
    bye.restype = ctypes.c_int
 
777
 
    bye.errcheck = _retry_on_error
 
779
 
    check_version = _library.gnutls_check_version
 
780
 
    check_version.argtypes = [ctypes.c_char_p]
 
781
 
    check_version.restype = ctypes.c_char_p
 
783
 
    _need_version = b"3.3.0"
 
784
 
    if check_version(_need_version) is None:
 
785
 
        raise self.Error("Needs GnuTLS {} or later"
 
786
 
                         .format(_need_version))
 
788
 
    _tls_rawpk_version = b"3.6.6"
 
789
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
793
 
        class pubkey_st(ctypes.Structure):
 
795
 
        pubkey_t = ctypes.POINTER(pubkey_st)
 
797
 
        x509_crt_fmt_t = ctypes.c_int
 
799
 
        # All the function declarations below are from
 
801
 
        pubkey_init = _library.gnutls_pubkey_init
 
802
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
803
 
        pubkey_init.restype = _error_code
 
805
 
        pubkey_import = _library.gnutls_pubkey_import
 
806
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
808
 
        pubkey_import.restype = _error_code
 
810
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
811
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
812
 
                                      ctypes.POINTER(ctypes.c_ubyte),
 
813
 
                                      ctypes.POINTER(ctypes.c_size_t)]
 
814
 
        pubkey_get_key_id.restype = _error_code
 
816
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
817
 
        pubkey_deinit.argtypes = [pubkey_t]
 
818
 
        pubkey_deinit.restype = None
 
820
 
        # All the function declarations below are from
 
823
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
824
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
825
 
        openpgp_crt_init.restype = _error_code
 
827
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
828
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
829
 
                                       ctypes.POINTER(datum_t),
 
831
 
        openpgp_crt_import.restype = _error_code
 
833
 
        openpgp_crt_verify_self = \
 
834
 
            _library.gnutls_openpgp_crt_verify_self
 
835
 
        openpgp_crt_verify_self.argtypes = [
 
838
 
            ctypes.POINTER(ctypes.c_uint),
 
840
 
        openpgp_crt_verify_self.restype = _error_code
 
842
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
843
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
844
 
        openpgp_crt_deinit.restype = None
 
846
 
        openpgp_crt_get_fingerprint = (
 
847
 
            _library.gnutls_openpgp_crt_get_fingerprint)
 
848
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
852
 
        openpgp_crt_get_fingerprint.restype = _error_code
 
854
 
    if check_version(b"3.6.4"):
 
855
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
857
 
        certificate_type_get2.restype = _error_code
 
859
 
    # Remove non-public functions
 
860
 
    del _error_code, _retry_on_error
 
863
 
def call_pipe(connection,       # : multiprocessing.Connection
 
864
 
              func, *args, **kwargs):
 
865
 
    """This function is meant to be called by multiprocessing.Process
 
867
 
    This function runs func(*args, **kwargs), and writes the resulting
 
868
 
    return value on the provided multiprocessing.Connection.
 
870
 
    connection.send(func(*args, **kwargs))
 
 
267
class Client(object):
 
875
268
    """A representation of a client host served by this server.
 
878
 
    approved:   bool(); None if not yet approved/disapproved
 
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
 
879
272
    approval_delay: datetime.timedelta(); Time to wait for approval
 
880
273
    approval_duration: datetime.timedelta(); Duration of one approval
 
881
 
    checker: multiprocessing.Process(); a running checker process used
 
882
 
             to see if the client lives. None if no process is
 
884
 
    checker_callback_tag: a GLib event source tag, or None
 
 
274
    checker:    subprocess.Popen(); a running checker process used
 
 
275
                                    to see if the client lives.
 
 
276
                                    'None' if no process is running.
 
 
277
    checker_callback_tag: a gobject event source tag, or None
 
885
278
    checker_command: string; External command which is run to check
 
886
279
                     if client lives.  %() expansions are done at
 
887
280
                     runtime with vars(self) as dict, so that for
 
888
281
                     instance %(name)s can be used in the command.
 
889
 
    checker_initiator_tag: a GLib event source tag, or None
 
 
282
    checker_initiator_tag: a gobject event source tag, or None
 
890
283
    created:    datetime.datetime(); (UTC) object creation
 
891
 
    client_structure: Object describing what attributes a client has
 
892
 
                      and is used for storing the client at exit
 
893
284
    current_checker_command: string; current running checker_command
 
894
 
    disable_initiator_tag: a GLib event source tag, or None
 
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
 
 
286
    disable_initiator_tag: a gobject event source tag, or None
 
896
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
897
 
                 uniquely identify an OpenPGP client
 
898
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
899
 
            a client using raw public keys
 
 
289
                 uniquely identify the client
 
900
290
    host:       string; available for use by the checker command
 
901
291
    interval:   datetime.timedelta(); How often to start a new checker
 
902
292
    last_approval_request: datetime.datetime(); (UTC) or None
 
903
293
    last_checked_ok: datetime.datetime(); (UTC) or None
 
904
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
905
 
                         status of last checker. -1 reflects crashed
 
906
 
                         checker, -2 means no checker completed yet.
 
907
 
    last_checker_signal: The signal which killed the last checker, if
 
908
 
                         last_checker_status is -1
 
909
 
    last_enabled: datetime.datetime(); (UTC) or None
 
 
294
    last_enabled: datetime.datetime(); (UTC)
 
910
295
    name:       string; from the config file, used in log messages and
 
911
296
                        D-Bus identifiers
 
912
297
    secret:     bytestring; sent verbatim (over TLS) to client
 
913
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
914
299
                                      until this client is disabled
 
915
 
    extended_timeout:   extra long timeout when secret has been sent
 
916
300
    runtime_expansions: Allowed attributes for runtime expansion.
 
917
 
    expires:    datetime.datetime(); time (UTC) when a client will be
 
919
 
    server_settings: The server_settings dict from main()
 
922
303
    runtime_expansions = ("approval_delay", "approval_duration",
 
923
 
                          "created", "enabled", "expires", "key_id",
 
924
 
                          "fingerprint", "host", "interval",
 
925
 
                          "last_approval_request", "last_checked_ok",
 
 
304
                          "created", "enabled", "fingerprint",
 
 
305
                          "host", "interval", "last_checked_ok",
 
926
306
                          "last_enabled", "name", "timeout")
 
929
 
        "extended_timeout": "PT15M",
 
931
 
        "checker": "fping -q -- %%(host)s",
 
933
 
        "approval_delay": "PT0S",
 
934
 
        "approval_duration": "PT1S",
 
935
 
        "approved_by_default": "True",
 
940
 
    def config_parser(config):
 
941
 
        """Construct a new dict of client settings of this form:
 
942
 
        { client_name: {setting_name: value, ...}, ...}
 
943
 
        with exceptions for any special settings as defined above.
 
944
 
        NOTE: Must be a pure function. Must return the same result
 
945
 
        value given the same arguments.
 
948
 
        for client_name in config.sections():
 
949
 
            section = dict(config.items(client_name))
 
950
 
            client = settings[client_name] = {}
 
952
 
            client["host"] = section["host"]
 
953
 
            # Reformat values from string types to Python types
 
954
 
            client["approved_by_default"] = config.getboolean(
 
955
 
                client_name, "approved_by_default")
 
956
 
            client["enabled"] = config.getboolean(client_name,
 
959
 
            # Uppercase and remove spaces from key_id and fingerprint
 
960
 
            # for later comparison purposes with return value from the
 
961
 
            # key_id() and fingerprint() functions
 
962
 
            client["key_id"] = (section.get("key_id", "").upper()
 
964
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
966
 
            if "secret" in section:
 
967
 
                client["secret"] = codecs.decode(section["secret"]
 
970
 
            elif "secfile" in section:
 
971
 
                with open(os.path.expanduser(os.path.expandvars
 
972
 
                                             (section["secfile"])),
 
974
 
                    client["secret"] = secfile.read()
 
976
 
                raise TypeError("No secret or secfile for section {}"
 
978
 
            client["timeout"] = string_to_delta(section["timeout"])
 
979
 
            client["extended_timeout"] = string_to_delta(
 
980
 
                section["extended_timeout"])
 
981
 
            client["interval"] = string_to_delta(section["interval"])
 
982
 
            client["approval_delay"] = string_to_delta(
 
983
 
                section["approval_delay"])
 
984
 
            client["approval_duration"] = string_to_delta(
 
985
 
                section["approval_duration"])
 
986
 
            client["checker_command"] = section["checker"]
 
987
 
            client["last_approval_request"] = None
 
988
 
            client["last_checked_ok"] = None
 
989
 
            client["last_checker_status"] = -2
 
993
 
    def __init__(self, settings, name=None, server_settings=None):
 
 
309
    def _timedelta_to_milliseconds(td):
 
 
310
        "Convert a datetime.timedelta() to milliseconds"
 
 
311
        return ((td.days * 24 * 60 * 60 * 1000)
 
 
312
                + (td.seconds * 1000)
 
 
313
                + (td.microseconds // 1000))
 
 
315
    def timeout_milliseconds(self):
 
 
316
        "Return the 'timeout' attribute in milliseconds"
 
 
317
        return self._timedelta_to_milliseconds(self.timeout)
 
 
319
    def interval_milliseconds(self):
 
 
320
        "Return the 'interval' attribute in milliseconds"
 
 
321
        return self._timedelta_to_milliseconds(self.interval)
 
 
323
    def approval_delay_milliseconds(self):
 
 
324
        return self._timedelta_to_milliseconds(self.approval_delay)
 
 
326
    def __init__(self, name = None, disable_hook=None, config=None):
 
 
327
        """Note: the 'checker' key in 'config' sets the
 
 
328
        'checker_command' attribute and *not* the 'checker'
 
995
 
        if server_settings is None:
 
997
 
        self.server_settings = server_settings
 
998
 
        # adding all client settings
 
999
 
        for setting, value in settings.items():
 
1000
 
            setattr(self, setting, value)
 
1003
 
            if not hasattr(self, "last_enabled"):
 
1004
 
                self.last_enabled = datetime.datetime.utcnow()
 
1005
 
            if not hasattr(self, "expires"):
 
1006
 
                self.expires = (datetime.datetime.utcnow()
 
 
333
        logger.debug("Creating client %r", self.name)
 
 
334
        # Uppercase and remove spaces from fingerprint for later
 
 
335
        # comparison purposes with return value from the fingerprint()
 
 
337
        self.fingerprint = (config["fingerprint"].upper()
 
 
339
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
 
340
        if "secret" in config:
 
 
341
            self.secret = config["secret"].decode("base64")
 
 
342
        elif "secfile" in config:
 
 
343
            with open(os.path.expanduser(os.path.expandvars
 
 
344
                                         (config["secfile"])),
 
 
346
                self.secret = secfile.read()
 
1009
 
            self.last_enabled = None
 
1012
 
        log.debug("Creating client %r", self.name)
 
1013
 
        log.debug("  Key ID: %s", self.key_id)
 
1014
 
        log.debug("  Fingerprint: %s", self.fingerprint)
 
1015
 
        self.created = settings.get("created",
 
1016
 
                                    datetime.datetime.utcnow())
 
1018
 
        # attributes specific for this server instance
 
 
348
            raise TypeError("No secret or secfile for client %s"
 
 
350
        self.host = config.get("host", "")
 
 
351
        self.created = datetime.datetime.utcnow()
 
 
353
        self.last_approval_request = None
 
 
354
        self.last_enabled = None
 
 
355
        self.last_checked_ok = None
 
 
356
        self.timeout = string_to_delta(config["timeout"])
 
 
357
        self.interval = string_to_delta(config["interval"])
 
 
358
        self.disable_hook = disable_hook
 
1019
359
        self.checker = None
 
1020
360
        self.checker_initiator_tag = None
 
1021
361
        self.disable_initiator_tag = None
 
1022
362
        self.checker_callback_tag = None
 
 
363
        self.checker_command = config["checker"]
 
1023
364
        self.current_checker_command = None
 
1024
 
        self.approved = None
 
 
365
        self.last_connect = None
 
 
366
        self._approved = None
 
 
367
        self.approved_by_default = config.get("approved_by_default",
 
1025
369
        self.approvals_pending = 0
 
1026
 
        self.changedstate = multiprocessing_manager.Condition(
 
1027
 
            multiprocessing_manager.Lock())
 
1028
 
        self.client_structure = [attr
 
1029
 
                                 for attr in self.__dict__.keys()
 
1030
 
                                 if not attr.startswith("_")]
 
1031
 
        self.client_structure.append("client_structure")
 
1033
 
        for name, t in inspect.getmembers(
 
1034
 
                type(self), lambda obj: isinstance(obj, property)):
 
1035
 
            if not name.startswith("_"):
 
1036
 
                self.client_structure.append(name)
 
1038
 
    # Send notice to process children that client state has changed
 
 
370
        self.approval_delay = string_to_delta(
 
 
371
            config["approval_delay"])
 
 
372
        self.approval_duration = string_to_delta(
 
 
373
            config["approval_duration"])
 
 
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
1039
376
    def send_changedstate(self):
 
1040
 
        with self.changedstate:
 
1041
 
            self.changedstate.notify_all()
 
 
377
        self.changedstate.acquire()
 
 
378
        self.changedstate.notify_all()
 
 
379
        self.changedstate.release()
 
1043
381
    def enable(self):
 
1044
382
        """Start this client's checker and timeout hooks"""
 
1045
383
        if getattr(self, "enabled", False):
 
1046
384
            # Already enabled
 
 
386
        self.send_changedstate()
 
1049
387
        self.last_enabled = datetime.datetime.utcnow()
 
1051
 
        self.send_changedstate()
 
 
388
        # Schedule a new checker to be started an 'interval' from now,
 
 
389
        # and every interval from then on.
 
 
390
        self.checker_initiator_tag = (gobject.timeout_add
 
 
391
                                      (self.interval_milliseconds(),
 
 
393
        # Schedule a disable() when 'timeout' has passed
 
 
394
        self.disable_initiator_tag = (gobject.timeout_add
 
 
395
                                   (self.timeout_milliseconds(),
 
 
398
        # Also start a new checker *right now*.
 
1053
401
    def disable(self, quiet=True):
 
1054
402
        """Disable this client."""
 
1055
403
        if not getattr(self, "enabled", False):
 
1058
 
            log.info("Disabling client %s", self.name)
 
1059
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
1060
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
406
            self.send_changedstate()
 
 
408
            logger.info("Disabling client %s", self.name)
 
 
409
        if getattr(self, "disable_initiator_tag", False):
 
 
410
            gobject.source_remove(self.disable_initiator_tag)
 
1061
411
            self.disable_initiator_tag = None
 
1063
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
1064
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
412
        if getattr(self, "checker_initiator_tag", False):
 
 
413
            gobject.source_remove(self.checker_initiator_tag)
 
1065
414
            self.checker_initiator_tag = None
 
1066
415
        self.stop_checker()
 
 
416
        if self.disable_hook:
 
 
417
            self.disable_hook(self)
 
1067
418
        self.enabled = False
 
1069
 
            self.send_changedstate()
 
1070
 
        # Do not run this again if called by a GLib.timeout_add
 
 
419
        # Do not run this again if called by a gobject.timeout_add
 
1073
422
    def __del__(self):
 
 
423
        self.disable_hook = None
 
1076
 
    def init_checker(self, randomize_start=False):
 
1077
 
        # Schedule a new checker to be started a randomly selected
 
1078
 
        # time (a fraction of 'interval') from now.  This spreads out
 
1079
 
        # the startup of checkers over time when the server is
 
1081
 
        if self.checker_initiator_tag is not None:
 
1082
 
            GLib.source_remove(self.checker_initiator_tag)
 
1083
 
        interval_milliseconds = int(self.interval.total_seconds()
 
1086
 
            delay_milliseconds = random.randrange(
 
1087
 
                interval_milliseconds + 1)
 
1089
 
            delay_milliseconds = interval_milliseconds
 
1090
 
        self.checker_initiator_tag = GLib.timeout_add(
 
1091
 
            delay_milliseconds, self.start_checker, randomize_start)
 
1092
 
        delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
 
1093
 
        # A checker might take up to an 'interval' of time, so we can
 
1094
 
        # expire at the soonest one interval after a checker was
 
1095
 
        # started.  Since the initial checker is delayed, the expire
 
1096
 
        # time might have to be extended.
 
1097
 
        now = datetime.datetime.utcnow()
 
1098
 
        self.expires = now + delay + self.interval
 
1099
 
        # Schedule a disable() at expire time
 
1100
 
        if self.disable_initiator_tag is not None:
 
1101
 
            GLib.source_remove(self.disable_initiator_tag)
 
1102
 
        self.disable_initiator_tag = GLib.timeout_add(
 
1103
 
            int((self.expires - now).total_seconds() * 1000),
 
1106
 
    def checker_callback(self, source, condition, connection,
 
 
426
    def checker_callback(self, pid, condition, command):
 
1108
427
        """The checker has completed, so take appropriate actions."""
 
1109
 
        # Read return code from connection (see call_pipe)
 
1110
 
        returncode = connection.recv()
 
1112
 
        if self.checker is not None:
 
1114
428
        self.checker_callback_tag = None
 
1115
429
        self.checker = None
 
1118
 
            self.last_checker_status = returncode
 
1119
 
            self.last_checker_signal = None
 
1120
 
            if self.last_checker_status == 0:
 
1121
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
 
430
        if os.WIFEXITED(condition):
 
 
431
            exitstatus = os.WEXITSTATUS(condition)
 
 
433
                logger.info("Checker for %(name)s succeeded",
 
1122
435
                self.checked_ok()
 
1124
 
                log.info("Checker for %(name)s failed", vars(self))
 
 
437
                logger.info("Checker for %(name)s failed",
 
1126
 
            self.last_checker_status = -1
 
1127
 
            self.last_checker_signal = -returncode
 
1128
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
 
440
            logger.warning("Checker for %(name)s crashed?",
 
1131
443
    def checked_ok(self):
 
1132
 
        """Assert that the client has been seen, alive and well."""
 
 
444
        """Bump up the timeout for this client.
 
 
446
        This should only be called when the client has been seen,
 
1133
449
        self.last_checked_ok = datetime.datetime.utcnow()
 
1134
 
        self.last_checker_status = 0
 
1135
 
        self.last_checker_signal = None
 
1138
 
    def bump_timeout(self, timeout=None):
 
1139
 
        """Bump up the timeout for this client."""
 
1141
 
            timeout = self.timeout
 
1142
 
        if self.disable_initiator_tag is not None:
 
1143
 
            GLib.source_remove(self.disable_initiator_tag)
 
1144
 
            self.disable_initiator_tag = None
 
1145
 
        if getattr(self, "enabled", False):
 
1146
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1147
 
                int(timeout.total_seconds() * 1000), self.disable)
 
1148
 
            self.expires = datetime.datetime.utcnow() + timeout
 
 
450
        gobject.source_remove(self.disable_initiator_tag)
 
 
451
        self.disable_initiator_tag = (gobject.timeout_add
 
 
452
                                      (self.timeout_milliseconds(),
 
1150
455
    def need_approval(self):
 
1151
456
        self.last_approval_request = datetime.datetime.utcnow()
 
1153
 
    def start_checker(self, start_was_randomized=False):
 
 
458
    def start_checker(self):
 
1154
459
        """Start a new checker subprocess if one is not running.
 
1156
461
        If a checker already exists, leave it running and do
 
1158
463
        # The reason for not killing a running checker is that if we
 
1159
 
        # did that, and if a checker (for some reason) started running
 
1160
 
        # slowly and taking more than 'interval' time, then the client
 
1161
 
        # would inevitably timeout, since no checker would get a
 
1162
 
        # chance to run to completion.  If we instead leave running
 
 
464
        # did that, then if a checker (for some reason) started
 
 
465
        # running slowly and taking more than 'interval' time, the
 
 
466
        # client would inevitably timeout, since no checker would get
 
 
467
        # a chance to run to completion.  If we instead leave running
 
1163
468
        # checkers alone, the checker would have to take more time
 
1164
469
        # than 'timeout' for the client to be disabled, which is as it
 
1167
 
        if self.checker is not None and not self.checker.is_alive():
 
1168
 
            log.warning("Checker was not alive; joining")
 
 
472
        # If a checker exists, make sure it is not a zombie
 
 
474
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
475
        except (AttributeError, OSError) as error:
 
 
476
            if (isinstance(error, OSError)
 
 
477
                and error.errno != errno.ECHILD):
 
 
481
                logger.warning("Checker was a zombie")
 
 
482
                gobject.source_remove(self.checker_callback_tag)
 
 
483
                self.checker_callback(pid, status,
 
 
484
                                      self.current_checker_command)
 
1171
485
        # Start a new checker if needed
 
1172
486
        if self.checker is None:
 
1173
 
            # Escape attributes for the shell
 
1175
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1176
 
                for attr in self.runtime_expansions}
 
1178
 
                command = self.checker_command % escaped_attrs
 
1179
 
            except TypeError as error:
 
1180
 
                log.error('Could not format string "%s"',
 
1181
 
                          self.checker_command, exc_info=error)
 
1182
 
                return True     # Try again later
 
 
488
                # In case checker_command has exactly one % operator
 
 
489
                command = self.checker_command % self.host
 
 
491
                # Escape attributes for the shell
 
 
492
                escaped_attrs = dict(
 
 
494
                     re.escape(unicode(str(getattr(self, attr, "")),
 
 
498
                    self.runtime_expansions)
 
 
501
                    command = self.checker_command % escaped_attrs
 
 
502
                except TypeError as error:
 
 
503
                    logger.error('Could not format string "%s":'
 
 
504
                                 ' %s', self.checker_command, error)
 
 
505
                    return True # Try again later
 
1183
506
            self.current_checker_command = command
 
1184
 
            log.info("Starting checker %r for %s", command, self.name)
 
1185
 
            # We don't need to redirect stdout and stderr, since
 
1186
 
            # in normal mode, that is already done by daemon(),
 
1187
 
            # and in debug mode we don't want to.  (Stdin is
 
1188
 
            # always replaced by /dev/null.)
 
1189
 
            # The exception is when not debugging but nevertheless
 
1190
 
            # running in the foreground; use the previously
 
1192
 
            popen_args = {"close_fds": True,
 
1195
 
            if (not self.server_settings["debug"]
 
1196
 
                and self.server_settings["foreground"]):
 
1197
 
                popen_args.update({"stdout": wnull,
 
1199
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1200
 
            self.checker = multiprocessing.Process(
 
1202
 
                args=(pipe[1], subprocess.call, command),
 
1204
 
            self.checker.start()
 
1205
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1206
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1207
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1208
 
                self.checker_callback, pipe[0], command)
 
1209
 
        if start_was_randomized:
 
1210
 
            # We were started after a random delay; Schedule a new
 
1211
 
            # checker to be started an 'interval' from now, and every
 
1212
 
            # interval from then on.
 
1213
 
            now = datetime.datetime.utcnow()
 
1214
 
            self.checker_initiator_tag = GLib.timeout_add(
 
1215
 
                int(self.interval.total_seconds() * 1000),
 
1217
 
            self.expires = max(self.expires, now + self.interval)
 
1218
 
            # Don't start a new checker again after same random delay
 
1220
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
508
                logger.info("Starting checker %r for %s",
 
 
510
                # We don't need to redirect stdout and stderr, since
 
 
511
                # in normal mode, that is already done by daemon(),
 
 
512
                # and in debug mode we don't want to.  (Stdin is
 
 
513
                # always replaced by /dev/null.)
 
 
514
                self.checker = subprocess.Popen(command,
 
 
517
                self.checker_callback_tag = (gobject.child_watch_add
 
 
519
                                              self.checker_callback,
 
 
521
                # The checker may have completed before the gobject
 
 
522
                # watch was added.  Check for this.
 
 
523
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
525
                    gobject.source_remove(self.checker_callback_tag)
 
 
526
                    self.checker_callback(pid, status, command)
 
 
527
            except OSError as error:
 
 
528
                logger.error("Failed to start subprocess: %s",
 
 
530
        # Re-run this periodically if run by gobject.timeout_add
 
1223
533
    def stop_checker(self):
 
1224
534
        """Force the checker process, if any, to stop."""
 
1225
535
        if self.checker_callback_tag:
 
1226
 
            GLib.source_remove(self.checker_callback_tag)
 
 
536
            gobject.source_remove(self.checker_callback_tag)
 
1227
537
            self.checker_callback_tag = None
 
1228
538
        if getattr(self, "checker", None) is None:
 
1230
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1231
 
        self.checker.terminate()
 
 
540
        logger.debug("Stopping checker for %(name)s", vars(self))
 
 
542
            os.kill(self.checker.pid, signal.SIGTERM)
 
 
544
            #if self.checker.poll() is None:
 
 
545
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
 
546
        except OSError as error:
 
 
547
            if error.errno != errno.ESRCH: # No such process
 
1232
549
        self.checker = None
 
1235
 
def dbus_service_property(dbus_interface,
 
 
551
def dbus_service_property(dbus_interface, signature="v",
 
 
552
                          access="readwrite", byte_arrays=False):
 
1239
553
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1240
554
    become properties on the D-Bus.
 
1242
556
    The decorated method will be called with no arguments by "Get"
 
1243
557
    and with one argument by "Set".
 
1245
559
    The parameters, where they are supported, are the same as
 
1246
560
    dbus.service.method, except there is only "signature", since the
 
1247
561
    type from Get() and the type sent to Set() is the same.
 
 
1578
732
            document.unlink()
 
1579
733
        except (AttributeError, xml.dom.DOMException,
 
1580
734
                xml.parsers.expat.ExpatError) as error:
 
1581
 
            log.error("Failed to override Introspection method",
 
1587
 
    dbus.OBJECT_MANAGER_IFACE
 
1588
 
except AttributeError:
 
1589
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1592
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1593
 
    """A D-Bus object with an ObjectManager.
 
1595
 
    Classes inheriting from this exposes the standard
 
1596
 
    GetManagedObjects call and the InterfacesAdded and
 
1597
 
    InterfacesRemoved signals on the standard
 
1598
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1600
 
    Note: No signals are sent automatically; they must be sent
 
1603
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1604
 
                         out_signature="a{oa{sa{sv}}}")
 
1605
 
    def GetManagedObjects(self):
 
1606
 
        """This function must be overridden"""
 
1607
 
        raise NotImplementedError()
 
1609
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1610
 
                         signature="oa{sa{sv}}")
 
1611
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1614
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1615
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1618
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1620
 
                         path_keyword="object_path",
 
1621
 
                         connection_keyword="connection")
 
1622
 
    def Introspect(self, object_path, connection):
 
1623
 
        """Overloading of standard D-Bus method.
 
1625
 
        Override return argument name of GetManagedObjects to be
 
1626
 
        "objpath_interfaces_and_properties"
 
1628
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1632
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1634
 
            for if_tag in document.getElementsByTagName("interface"):
 
1635
 
                # Fix argument name for the GetManagedObjects method
 
1636
 
                if (if_tag.getAttribute("name")
 
1637
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1638
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1639
 
                        if (cn.getAttribute("name")
 
1640
 
                            == "GetManagedObjects"):
 
1641
 
                            for arg in cn.getElementsByTagName("arg"):
 
1642
 
                                if (arg.getAttribute("direction")
 
1646
 
                                        "objpath_interfaces"
 
1648
 
            xmlstring = document.toxml("utf-8")
 
1650
 
        except (AttributeError, xml.dom.DOMException,
 
1651
 
                xml.parsers.expat.ExpatError) as error:
 
1652
 
            log.error("Failed to override Introspection method",
 
1657
 
def datetime_to_dbus(dt, variant_level=0):
 
1658
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1660
 
        return dbus.String("", variant_level=variant_level)
 
1661
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1664
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1665
 
    """A class decorator; applied to a subclass of
 
1666
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1667
 
    interface names according to the "alt_interface_names" mapping.
 
1670
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1671
 
                                    "net.example.AlternateInterface"})
 
1672
 
    class SampleDBusObject(dbus.service.Object):
 
1673
 
        @dbus.service.method("org.example.Interface")
 
1674
 
        def SampleDBusMethod():
 
1677
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1678
 
    reachable via two interfaces: "org.example.Interface" and
 
1679
 
    "net.example.AlternateInterface", the latter of which will have
 
1680
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1681
 
    "true", unless "deprecate" is passed with a False value.
 
1683
 
    This works for methods and signals, and also for D-Bus properties
 
1684
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1685
 
    dbus_interface_annotations decorator).
 
1689
 
        for orig_interface_name, alt_interface_name in (
 
1690
 
                alt_interface_names.items()):
 
1692
 
            interface_names = set()
 
1693
 
            # Go though all attributes of the class
 
1694
 
            for attrname, attribute in inspect.getmembers(cls):
 
1695
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1696
 
                # with the wrong interface name
 
1697
 
                if (not hasattr(attribute, "_dbus_interface")
 
1698
 
                    or not attribute._dbus_interface.startswith(
 
1699
 
                        orig_interface_name)):
 
1701
 
                # Create an alternate D-Bus interface name based on
 
1703
 
                alt_interface = attribute._dbus_interface.replace(
 
1704
 
                    orig_interface_name, alt_interface_name)
 
1705
 
                interface_names.add(alt_interface)
 
1706
 
                # Is this a D-Bus signal?
 
1707
 
                if getattr(attribute, "_dbus_is_signal", False):
 
1708
 
                    # Extract the original non-method undecorated
 
1709
 
                    # function by black magic
 
1710
 
                    if sys.version_info.major == 2:
 
1711
 
                        nonmethod_func = (dict(
 
1712
 
                            zip(attribute.func_code.co_freevars,
 
1713
 
                                attribute.__closure__))
 
1714
 
                                          ["func"].cell_contents)
 
1716
 
                        nonmethod_func = (dict(
 
1717
 
                            zip(attribute.__code__.co_freevars,
 
1718
 
                                attribute.__closure__))
 
1719
 
                                          ["func"].cell_contents)
 
1720
 
                    # Create a new, but exactly alike, function
 
1721
 
                    # object, and decorate it to be a new D-Bus signal
 
1722
 
                    # with the alternate D-Bus interface name
 
1723
 
                    new_function = copy_function(nonmethod_func)
 
1724
 
                    new_function = (dbus.service.signal(
 
1726
 
                        attribute._dbus_signature)(new_function))
 
1727
 
                    # Copy annotations, if any
 
1729
 
                        new_function._dbus_annotations = dict(
 
1730
 
                            attribute._dbus_annotations)
 
1731
 
                    except AttributeError:
 
1734
 
                    # Define a creator of a function to call both the
 
1735
 
                    # original and alternate functions, so both the
 
1736
 
                    # original and alternate signals gets sent when
 
1737
 
                    # the function is called
 
1738
 
                    def fixscope(func1, func2):
 
1739
 
                        """This function is a scope container to pass
 
1740
 
                        func1 and func2 to the "call_both" function
 
1741
 
                        outside of its arguments"""
 
1743
 
                        @functools.wraps(func2)
 
1744
 
                        def call_both(*args, **kwargs):
 
1745
 
                            """This function will emit two D-Bus
 
1746
 
                            signals by calling func1 and func2"""
 
1747
 
                            func1(*args, **kwargs)
 
1748
 
                            func2(*args, **kwargs)
 
1749
 
                        # Make wrapper function look like a D-Bus
 
1751
 
                        for name, attr in inspect.getmembers(func2):
 
1752
 
                            if name.startswith("_dbus_"):
 
1753
 
                                setattr(call_both, name, attr)
 
1756
 
                    # Create the "call_both" function and add it to
 
1758
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1759
 
                # Is this a D-Bus method?
 
1760
 
                elif getattr(attribute, "_dbus_is_method", False):
 
1761
 
                    # Create a new, but exactly alike, function
 
1762
 
                    # object.  Decorate it to be a new D-Bus method
 
1763
 
                    # with the alternate D-Bus interface name.  Add it
 
1766
 
                        dbus.service.method(
 
1768
 
                            attribute._dbus_in_signature,
 
1769
 
                            attribute._dbus_out_signature)
 
1770
 
                        (copy_function(attribute)))
 
1771
 
                    # Copy annotations, if any
 
1773
 
                        attr[attrname]._dbus_annotations = dict(
 
1774
 
                            attribute._dbus_annotations)
 
1775
 
                    except AttributeError:
 
1777
 
                # Is this a D-Bus property?
 
1778
 
                elif getattr(attribute, "_dbus_is_property", False):
 
1779
 
                    # Create a new, but exactly alike, function
 
1780
 
                    # object, and decorate it to be a new D-Bus
 
1781
 
                    # property with the alternate D-Bus interface
 
1782
 
                    # name.  Add it to the class.
 
1783
 
                    attr[attrname] = (dbus_service_property(
 
1784
 
                        alt_interface, attribute._dbus_signature,
 
1785
 
                        attribute._dbus_access,
 
1786
 
                        attribute._dbus_get_args_options
 
1788
 
                                      (copy_function(attribute)))
 
1789
 
                    # Copy annotations, if any
 
1791
 
                        attr[attrname]._dbus_annotations = dict(
 
1792
 
                            attribute._dbus_annotations)
 
1793
 
                    except AttributeError:
 
1795
 
                # Is this a D-Bus interface?
 
1796
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1797
 
                    # Create a new, but exactly alike, function
 
1798
 
                    # object.  Decorate it to be a new D-Bus interface
 
1799
 
                    # with the alternate D-Bus interface name.  Add it
 
1802
 
                        dbus_interface_annotations(alt_interface)
 
1803
 
                        (copy_function(attribute)))
 
1805
 
                # Deprecate all alternate interfaces
 
1806
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1807
 
                for interface_name in interface_names:
 
1809
 
                    @dbus_interface_annotations(interface_name)
 
1811
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1813
 
                    # Find an unused name
 
1814
 
                    for aname in (iname.format(i)
 
1815
 
                                  for i in itertools.count()):
 
1816
 
                        if aname not in attr:
 
1820
 
                # Replace the class with a new subclass of it with
 
1821
 
                # methods, signals, etc. as created above.
 
1822
 
                if sys.version_info.major == 2:
 
1823
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1826
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1833
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1834
 
                            "se.bsnet.fukt.Mandos"})
 
 
735
            logger.error("Failed to override Introspection method",
 
1835
740
class ClientDBus(Client, DBusObjectWithProperties):
 
1836
741
    """A Client class using D-Bus
 
1839
744
    dbus_object_path: dbus.ObjectPath
 
1840
745
    bus: dbus.SystemBus()
 
1843
748
    runtime_expansions = (Client.runtime_expansions
 
1844
 
                          + ("dbus_object_path", ))
 
1846
 
    _interface = "se.recompile.Mandos.Client"
 
 
749
                          + ("dbus_object_path",))
 
1848
751
    # dbus.service.Object doesn't use super(), so we can't either.
 
1850
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
753
    def __init__(self, bus = None, *args, **kwargs):
 
 
754
        self._approvals_pending = 0
 
1852
756
        Client.__init__(self, *args, **kwargs)
 
1853
757
        # Only now, when this client is initialized, can it show up on
 
1855
 
        client_object_name = str(self.name).translate(
 
 
759
        client_object_name = unicode(self.name).translate(
 
1856
760
            {ord("."): ord("_"),
 
1857
761
             ord("-"): ord("_")})
 
1858
 
        self.dbus_object_path = dbus.ObjectPath(
 
1859
 
            "/clients/" + client_object_name)
 
 
762
        self.dbus_object_path = (dbus.ObjectPath
 
 
763
                                 ("/clients/" + client_object_name))
 
1860
764
        DBusObjectWithProperties.__init__(self, self.bus,
 
1861
765
                                          self.dbus_object_path)
 
1863
 
    def notifychangeproperty(transform_func, dbus_name,
 
1864
 
                             type_func=lambda x: x,
 
1866
 
                             invalidate_only=False,
 
1867
 
                             _interface=_interface):
 
1868
 
        """ Modify a variable so that it's a property which announces
 
1869
 
        its changes to DBus.
 
1871
 
        transform_fun: Function that takes a value and a variant_level
 
1872
 
                       and transforms it to a D-Bus type.
 
1873
 
        dbus_name: D-Bus name of the variable
 
1874
 
        type_func: Function that transform the value before sending it
 
1875
 
                   to the D-Bus.  Default: no transform
 
1876
 
        variant_level: D-Bus variant level.  Default: 1
 
1878
 
        attrname = "_{}".format(dbus_name)
 
1880
 
        def setter(self, value):
 
1881
 
            if hasattr(self, "dbus_object_path"):
 
1882
 
                if (not hasattr(self, attrname) or
 
1883
 
                    type_func(getattr(self, attrname, None))
 
1884
 
                    != type_func(value)):
 
1886
 
                        self.PropertiesChanged(
 
1887
 
                            _interface, dbus.Dictionary(),
 
1888
 
                            dbus.Array((dbus_name, )))
 
1890
 
                        dbus_value = transform_func(
 
1892
 
                            variant_level=variant_level)
 
1893
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1895
 
                        self.PropertiesChanged(
 
1897
 
                            dbus.Dictionary({dbus.String(dbus_name):
 
1900
 
            setattr(self, attrname, value)
 
1902
 
        return property(lambda self: getattr(self, attrname), setter)
 
1904
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1905
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1908
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1909
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1911
 
    checker = notifychangeproperty(
 
1912
 
        dbus.Boolean, "CheckerRunning",
 
1913
 
        type_func=lambda checker: checker is not None)
 
1914
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1916
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1917
 
                                               "LastCheckerStatus")
 
1918
 
    last_approval_request = notifychangeproperty(
 
1919
 
        datetime_to_dbus, "LastApprovalRequest")
 
1920
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1921
 
                                               "ApprovedByDefault")
 
1922
 
    approval_delay = notifychangeproperty(
 
1923
 
        dbus.UInt64, "ApprovalDelay",
 
1924
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1925
 
    approval_duration = notifychangeproperty(
 
1926
 
        dbus.UInt64, "ApprovalDuration",
 
1927
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1928
 
    host = notifychangeproperty(dbus.String, "Host")
 
1929
 
    timeout = notifychangeproperty(
 
1930
 
        dbus.UInt64, "Timeout",
 
1931
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1932
 
    extended_timeout = notifychangeproperty(
 
1933
 
        dbus.UInt64, "ExtendedTimeout",
 
1934
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1935
 
    interval = notifychangeproperty(
 
1936
 
        dbus.UInt64, "Interval",
 
1937
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1938
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1939
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1940
 
                                  invalidate_only=True)
 
1942
 
    del notifychangeproperty
 
 
767
    def _get_approvals_pending(self):
 
 
768
        return self._approvals_pending
 
 
769
    def _set_approvals_pending(self, value):
 
 
770
        old_value = self._approvals_pending
 
 
771
        self._approvals_pending = value
 
 
773
        if (hasattr(self, "dbus_object_path")
 
 
774
            and bval is not bool(old_value)):
 
 
775
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
 
776
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
 
779
    approvals_pending = property(_get_approvals_pending,
 
 
780
                                 _set_approvals_pending)
 
 
781
    del _get_approvals_pending, _set_approvals_pending
 
 
784
    def _datetime_to_dbus(dt, variant_level=0):
 
 
785
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
786
        return dbus.String(dt.isoformat(),
 
 
787
                           variant_level=variant_level)
 
 
790
        oldstate = getattr(self, "enabled", False)
 
 
791
        r = Client.enable(self)
 
 
792
        if oldstate != self.enabled:
 
 
794
            self.PropertyChanged(dbus.String("Enabled"),
 
 
795
                                 dbus.Boolean(True, variant_level=1))
 
 
796
            self.PropertyChanged(
 
 
797
                dbus.String("LastEnabled"),
 
 
798
                self._datetime_to_dbus(self.last_enabled,
 
 
802
    def disable(self, quiet = False):
 
 
803
        oldstate = getattr(self, "enabled", False)
 
 
804
        r = Client.disable(self, quiet=quiet)
 
 
805
        if not quiet and oldstate != self.enabled:
 
 
807
            self.PropertyChanged(dbus.String("Enabled"),
 
 
808
                                 dbus.Boolean(False, variant_level=1))
 
1944
811
    def __del__(self, *args, **kwargs):
 
1946
813
            self.remove_from_connection()
 
 
2264
1147
            self.start_checker()
 
2266
1149
            self.stop_checker()
 
2268
1151
    # ObjectPath - property
 
2270
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2271
 
         "org.freedesktop.DBus.Deprecated": "true"})
 
2272
1152
    @dbus_service_property(_interface, signature="o", access="read")
 
2273
1153
    def ObjectPath_dbus_property(self):
 
2274
 
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
 
1154
        return self.dbus_object_path # is already a dbus.ObjectPath
 
2276
1156
    # Secret = property
 
2278
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2280
 
    @dbus_service_property(_interface,
 
 
1157
    @dbus_service_property(_interface, signature="ay",
 
 
1158
                           access="write", byte_arrays=True)
 
2284
1159
    def Secret_dbus_property(self, value):
 
2285
 
        self.secret = bytes(value)
 
 
1160
        self.secret = str(value)
 
2291
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
 
1165
class ProxyClient(object):
 
 
1166
    def __init__(self, child_pipe, fpr, address):
 
2292
1167
        self._pipe = child_pipe
 
2293
 
        self._pipe.send(("init", key_id, fpr, address))
 
 
1168
        self._pipe.send(('init', fpr, address))
 
2294
1169
        if not self._pipe.recv():
 
2295
 
            raise KeyError(key_id or fpr)
 
2297
1172
    def __getattribute__(self, name):
 
 
1173
        if(name == '_pipe'):
 
2299
1174
            return super(ProxyClient, self).__getattribute__(name)
 
2300
 
        self._pipe.send(("getattr", name))
 
 
1175
        self._pipe.send(('getattr', name))
 
2301
1176
        data = self._pipe.recv()
 
2302
 
        if data[0] == "data":
 
 
1177
        if data[0] == 'data':
 
2304
 
        if data[0] == "function":
 
 
1179
        if data[0] == 'function':
 
2306
1180
            def func(*args, **kwargs):
 
2307
 
                self._pipe.send(("funcall", name, args, kwargs))
 
 
1181
                self._pipe.send(('funcall', name, args, kwargs))
 
2308
1182
                return self._pipe.recv()[1]
 
2312
1185
    def __setattr__(self, name, value):
 
 
1186
        if(name == '_pipe'):
 
2314
1187
            return super(ProxyClient, self).__setattr__(name, value)
 
2315
 
        self._pipe.send(("setattr", name, value))
 
 
1188
        self._pipe.send(('setattr', name, value))
 
2318
1191
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2319
1192
    """A class to handle client connections.
 
2321
1194
    Instantiated once for each connection to handle it.
 
2322
1195
    Note: This will run in its own forked process."""
 
2324
1197
    def handle(self):
 
2325
1198
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2326
 
            log.info("TCP connection from: %s",
 
2327
 
                     str(self.client_address))
 
2328
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
 
2330
 
            session = gnutls.ClientSession(self.request)
 
2332
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2333
 
            #                       "+AES-256-CBC", "+SHA1",
 
2334
 
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
1199
            logger.info("TCP connection from: %s",
 
 
1200
                        unicode(self.client_address))
 
 
1201
            logger.debug("Pipe FD: %d",
 
 
1202
                         self.server.child_pipe.fileno())
 
 
1204
            session = (gnutls.connection
 
 
1205
                       .ClientSession(self.request,
 
 
1207
                                      .X509Credentials()))
 
 
1209
            # Note: gnutls.connection.X509Credentials is really a
 
 
1210
            # generic GnuTLS certificate credentials object so long as
 
 
1211
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1212
            # here despite using OpenPGP certificates.
 
 
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
1215
            #                      "+AES-256-CBC", "+SHA1",
 
 
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
2336
1218
            # Use a fallback default, since this MUST be set.
 
2337
1219
            priority = self.server.gnutls_priority
 
2338
1220
            if priority is None:
 
2339
1221
                priority = "NORMAL"
 
2340
 
            gnutls.priority_set_direct(session,
 
2341
 
                                       priority.encode("utf-8"), None)
 
 
1222
            (gnutls.library.functions
 
 
1223
             .gnutls_priority_set_direct(session._c_object,
 
2343
1226
            # Start communication using the Mandos protocol
 
2344
1227
            # Get protocol number
 
2345
1228
            line = self.request.makefile().readline()
 
2346
 
            log.debug("Protocol version: %r", line)
 
 
1229
            logger.debug("Protocol version: %r", line)
 
2348
1231
                if int(line.strip().split()[0]) > 1:
 
2349
 
                    raise RuntimeError(line)
 
2350
1233
            except (ValueError, IndexError, RuntimeError) as error:
 
2351
 
                log.error("Unknown protocol version: %s", error)
 
 
1234
                logger.error("Unknown protocol version: %s", error)
 
2354
1237
            # Start GnuTLS connection
 
2356
1239
                session.handshake()
 
2357
 
            except gnutls.Error as error:
 
2358
 
                log.warning("Handshake failed: %s", error)
 
 
1240
            except gnutls.errors.GNUTLSError as error:
 
 
1241
                logger.warning("Handshake failed: %s", error)
 
2359
1242
                # Do not run session.bye() here: the session is not
 
2360
1243
                # established.  Just abandon the request.
 
2362
 
            log.debug("Handshake succeeded")
 
 
1245
            logger.debug("Handshake succeeded")
 
2364
1247
            approval_required = False
 
2366
 
                if gnutls.has_rawpk:
 
2369
 
                        key_id = self.key_id(
 
2370
 
                            self.peer_certificate(session))
 
2371
 
                    except (TypeError, gnutls.Error) as error:
 
2372
 
                        log.warning("Bad certificate: %s", error)
 
2374
 
                    log.debug("Key ID: %s",
 
2375
 
                              key_id.decode("utf-8",
 
2381
 
                        fpr = self.fingerprint(
 
2382
 
                            self.peer_certificate(session))
 
2383
 
                    except (TypeError, gnutls.Error) as error:
 
2384
 
                        log.warning("Bad certificate: %s", error)
 
2386
 
                    log.debug("Fingerprint: %s", fpr)
 
2389
 
                    client = ProxyClient(child_pipe, key_id, fpr,
 
 
1250
                    fpr = self.fingerprint(self.peer_certificate
 
 
1253
                        gnutls.errors.GNUTLSError) as error:
 
 
1254
                    logger.warning("Bad certificate: %s", error)
 
 
1256
                logger.debug("Fingerprint: %s", fpr)
 
 
1259
                    client = ProxyClient(child_pipe, fpr,
 
2390
1260
                                         self.client_address)
 
2391
1261
                except KeyError:
 
2394
1264
                if client.approval_delay:
 
2395
1265
                    delay = client.approval_delay
 
2396
1266
                    client.approvals_pending += 1
 
2397
1267
                    approval_required = True
 
2400
1270
                    if not client.enabled:
 
2401
 
                        log.info("Client %s is disabled", client.name)
 
 
1271
                        logger.info("Client %s is disabled",
 
2402
1273
                        if self.server.use_dbus:
 
2403
1274
                            # Emit D-Bus signal
 
2404
 
                            client.Rejected("Disabled")
 
 
1275
                            client.Rejected("Disabled")                    
 
2407
 
                    if client.approved or not client.approval_delay:
 
2408
 
                        # We are approved or approval is disabled
 
 
1278
                    if client._approved or not client.approval_delay:
 
 
1279
                        #We are approved or approval is disabled
 
2410
 
                    elif client.approved is None:
 
2411
 
                        log.info("Client %s needs approval",
 
 
1281
                    elif client._approved is None:
 
 
1282
                        logger.info("Client %s needs approval",
 
2413
1284
                        if self.server.use_dbus:
 
2414
1285
                            # Emit D-Bus signal
 
2415
1286
                            client.NeedApproval(
 
2416
 
                                client.approval_delay.total_seconds()
 
2417
 
                                * 1000, client.approved_by_default)
 
 
1287
                                client.approval_delay_milliseconds(),
 
 
1288
                                client.approved_by_default)
 
2419
 
                        log.warning("Client %s was not approved",
 
 
1290
                        logger.warning("Client %s was not approved",
 
2421
1292
                        if self.server.use_dbus:
 
2422
1293
                            # Emit D-Bus signal
 
2423
1294
                            client.Rejected("Denied")
 
2426
 
                    # wait until timeout or approved
 
 
1297
                    #wait until timeout or approved
 
 
1298
                    #x = float(client._timedelta_to_milliseconds(delay))
 
2427
1299
                    time = datetime.datetime.now()
 
2428
1300
                    client.changedstate.acquire()
 
2429
 
                    client.changedstate.wait(delay.total_seconds())
 
 
1301
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
2430
1302
                    client.changedstate.release()
 
2431
1303
                    time2 = datetime.datetime.now()
 
2432
1304
                    if (time2 - time) >= delay:
 
2433
1305
                        if not client.approved_by_default:
 
2434
 
                            log.warning("Client %s timed out while"
 
2435
 
                                        " waiting for approval",
 
 
1306
                            logger.warning("Client %s timed out while"
 
 
1307
                                           " waiting for approval",
 
2437
1309
                            if self.server.use_dbus:
 
2438
1310
                                # Emit D-Bus signal
 
2439
1311
                                client.Rejected("Approval timed out")
 
 
2444
1316
                        delay -= time2 - time
 
2447
 
                    session.send(client.secret)
 
2448
 
                except gnutls.Error as error:
 
2449
 
                    log.warning("gnutls send failed", exc_info=error)
 
2452
 
                log.info("Sending secret to %s", client.name)
 
2453
 
                # bump the timeout using extended_timeout
 
2454
 
                client.bump_timeout(client.extended_timeout)
 
 
1319
                while sent_size < len(client.secret):
 
 
1321
                        sent = session.send(client.secret[sent_size:])
 
 
1322
                    except gnutls.errors.GNUTLSError as error:
 
 
1323
                        logger.warning("gnutls send failed")
 
 
1325
                    logger.debug("Sent: %d, remaining: %d",
 
 
1326
                                 sent, len(client.secret)
 
 
1327
                                 - (sent_size + sent))
 
 
1330
                logger.info("Sending secret to %s", client.name)
 
 
1331
                # bump the timeout as if seen
 
2455
1333
                if self.server.use_dbus:
 
2456
1334
                    # Emit D-Bus signal
 
2457
1335
                    client.GotSecret()
 
2460
1338
                if approval_required:
 
2461
1339
                    client.approvals_pending -= 1
 
2464
 
                except gnutls.Error as error:
 
2465
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
 
1342
                except gnutls.errors.GNUTLSError as error:
 
 
1343
                    logger.warning("GnuTLS bye failed")
 
2468
1346
    def peer_certificate(session):
 
2469
 
        "Return the peer's certificate as a bytestring"
 
2471
 
            cert_type = gnutls.certificate_type_get2(
 
2472
 
                session, gnutls.CTYPE_PEERS)
 
2473
 
        except AttributeError:
 
2474
 
            cert_type = gnutls.certificate_type_get(session)
 
2475
 
        if gnutls.has_rawpk:
 
2476
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2478
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2479
 
        # If not a valid certificate type...
 
2480
 
        if cert_type not in valid_cert_types:
 
2481
 
            log.info("Cert type %r not in %r", cert_type,
 
2483
 
            # ...return invalid data
 
 
1347
        "Return the peer's OpenPGP certificate as a bytestring"
 
 
1348
        # If not an OpenPGP certificate...
 
 
1349
        if (gnutls.library.functions
 
 
1350
            .gnutls_certificate_type_get(session._c_object)
 
 
1351
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1352
            # ...do the normal thing
 
 
1353
            return session.peer_certificate
 
2485
1354
        list_size = ctypes.c_uint(1)
 
2486
 
        cert_list = (gnutls.certificate_get_peers
 
2487
 
                     (session, ctypes.byref(list_size)))
 
 
1355
        cert_list = (gnutls.library.functions
 
 
1356
                     .gnutls_certificate_get_peers
 
 
1357
                     (session._c_object, ctypes.byref(list_size)))
 
2488
1358
        if not bool(cert_list) and list_size.value != 0:
 
2489
 
            raise gnutls.Error("error getting peer certificate")
 
 
1359
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2490
1361
        if list_size.value == 0:
 
2492
1363
        cert = cert_list[0]
 
2493
1364
        return ctypes.string_at(cert.data, cert.size)
 
2496
 
    def key_id(certificate):
 
2497
 
        "Convert a certificate bytestring to a hexdigit key ID"
 
2498
 
        # New GnuTLS "datum" with the public key
 
2499
 
        datum = gnutls.datum_t(
 
2500
 
            ctypes.cast(ctypes.c_char_p(certificate),
 
2501
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2502
 
            ctypes.c_uint(len(certificate)))
 
2503
 
        # XXX all these need to be created in the gnutls "module"
 
2504
 
        # New empty GnuTLS certificate
 
2505
 
        pubkey = gnutls.pubkey_t()
 
2506
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2507
 
        # Import the raw public key into the certificate
 
2508
 
        gnutls.pubkey_import(pubkey,
 
2509
 
                             ctypes.byref(datum),
 
2510
 
                             gnutls.X509_FMT_DER)
 
2511
 
        # New buffer for the key ID
 
2512
 
        buf = ctypes.create_string_buffer(32)
 
2513
 
        buf_len = ctypes.c_size_t(len(buf))
 
2514
 
        # Get the key ID from the raw public key into the buffer
 
2515
 
        gnutls.pubkey_get_key_id(
 
2517
 
            gnutls.KEYID_USE_SHA256,
 
2518
 
            ctypes.cast(ctypes.byref(buf),
 
2519
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2520
 
            ctypes.byref(buf_len))
 
2521
 
        # Deinit the certificate
 
2522
 
        gnutls.pubkey_deinit(pubkey)
 
2524
 
        # Convert the buffer to a Python bytestring
 
2525
 
        key_id = ctypes.string_at(buf, buf_len.value)
 
2526
 
        # Convert the bytestring to hexadecimal notation
 
2527
 
        hex_key_id = binascii.hexlify(key_id).upper()
 
2531
1367
    def fingerprint(openpgp):
 
2532
1368
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2533
1369
        # New GnuTLS "datum" with the OpenPGP public key
 
2534
 
        datum = gnutls.datum_t(
 
2535
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2536
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2537
 
            ctypes.c_uint(len(openpgp)))
 
 
1370
        datum = (gnutls.library.types
 
 
1371
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1374
                                 ctypes.c_uint(len(openpgp))))
 
2538
1375
        # New empty GnuTLS certificate
 
2539
 
        crt = gnutls.openpgp_crt_t()
 
2540
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1376
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1377
        (gnutls.library.functions
 
 
1378
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2541
1379
        # Import the OpenPGP public key into the certificate
 
2542
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2543
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1380
        (gnutls.library.functions
 
 
1381
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1382
                                    gnutls.library.constants
 
 
1383
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2544
1384
        # Verify the self signature in the key
 
2545
1385
        crtverify = ctypes.c_uint()
 
2546
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2547
 
                                       ctypes.byref(crtverify))
 
 
1386
        (gnutls.library.functions
 
 
1387
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1388
                                         ctypes.byref(crtverify)))
 
2548
1389
        if crtverify.value != 0:
 
2549
 
            gnutls.openpgp_crt_deinit(crt)
 
2550
 
            raise gnutls.CertificateSecurityError(code
 
 
1390
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1391
            raise (gnutls.errors.CertificateSecurityError
 
2552
1393
        # New buffer for the fingerprint
 
2553
1394
        buf = ctypes.create_string_buffer(20)
 
2554
1395
        buf_len = ctypes.c_size_t()
 
2555
1396
        # Get the fingerprint from the certificate into the buffer
 
2556
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2557
 
                                           ctypes.byref(buf_len))
 
 
1397
        (gnutls.library.functions
 
 
1398
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1399
                                             ctypes.byref(buf_len)))
 
2558
1400
        # Deinit the certificate
 
2559
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1401
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2560
1402
        # Convert the buffer to a Python bytestring
 
2561
1403
        fpr = ctypes.string_at(buf, buf_len.value)
 
2562
1404
        # Convert the bytestring to hexadecimal notation
 
2563
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
2567
 
class MultiprocessingMixIn:
 
 
1409
class MultiprocessingMixIn(object):
 
2568
1410
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2570
1411
    def sub_process_main(self, request, address):
 
2572
1413
            self.finish_request(request, address)
 
2574
1415
            self.handle_error(request, address)
 
2575
1416
        self.close_request(request)
 
2577
1418
    def process_request(self, request, address):
 
2578
1419
        """Start a new process to process the request."""
 
2579
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2580
 
                                       args=(request, address))
 
2585
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
 
1420
        multiprocessing.Process(target = self.sub_process_main,
 
 
1421
                                args = (request, address)).start()
 
 
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2586
1424
    """ adds a pipe to the MixIn """
 
2588
1425
    def process_request(self, request, client_address):
 
2589
1426
        """Overrides and wraps the original process_request().
 
2591
1428
        This function creates a new pipe in self.pipe
 
2593
1430
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2595
 
        proc = MultiprocessingMixIn.process_request(self, request,
 
 
1432
        super(MultiprocessingMixInWithPipe,
 
 
1433
              self).process_request(request, client_address)
 
2597
1434
        self.child_pipe.close()
 
2598
 
        self.add_pipe(parent_pipe, proc)
 
 
1435
        self.add_pipe(parent_pipe)
 
2600
 
    def add_pipe(self, parent_pipe, proc):
 
 
1437
    def add_pipe(self, parent_pipe):
 
2601
1438
        """Dummy function; override as necessary"""
 
2602
 
        raise NotImplementedError()
 
 
1439
        raise NotImplementedError
 
2605
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2606
 
                     socketserver.TCPServer):
 
2607
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
 
1442
                     socketserver.TCPServer, object):
 
 
1443
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2610
1446
        enabled:        Boolean; whether this server is activated yet
 
2611
1447
        interface:      None or a network interface name (string)
 
2612
1448
        use_ipv6:       Boolean; to use IPv6 or not
 
2615
1450
    def __init__(self, server_address, RequestHandlerClass,
 
2619
 
        """If socketfd is set, use that file descriptor instead of
 
2620
 
        creating a new one with socket.socket().
 
 
1451
                 interface=None, use_ipv6=True):
 
2622
1452
        self.interface = interface
 
2624
1454
            self.address_family = socket.AF_INET6
 
2625
 
        if socketfd is not None:
 
2626
 
            # Save the file descriptor
 
2627
 
            self.socketfd = socketfd
 
2628
 
            # Save the original socket.socket() function
 
2629
 
            self.socket_socket = socket.socket
 
2631
 
            # To implement --socket, we monkey patch socket.socket.
 
2633
 
            # (When socketserver.TCPServer is a new-style class, we
 
2634
 
            # could make self.socket into a property instead of monkey
 
2635
 
            # patching socket.socket.)
 
2637
 
            # Create a one-time-only replacement for socket.socket()
 
2638
 
            @functools.wraps(socket.socket)
 
2639
 
            def socket_wrapper(*args, **kwargs):
 
2640
 
                # Restore original function so subsequent calls are
 
2642
 
                socket.socket = self.socket_socket
 
2643
 
                del self.socket_socket
 
2644
 
                # This time only, return a new socket object from the
 
2645
 
                # saved file descriptor.
 
2646
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2647
 
            # Replace socket.socket() function with wrapper
 
2648
 
            socket.socket = socket_wrapper
 
2649
 
        # The socketserver.TCPServer.__init__ will call
 
2650
 
        # socket.socket(), which might be our replacement,
 
2651
 
        # socket_wrapper(), if socketfd was set.
 
2652
1455
        socketserver.TCPServer.__init__(self, server_address,
 
2653
1456
                                        RequestHandlerClass)
 
2655
1457
    def server_bind(self):
 
2656
1458
        """This overrides the normal server_bind() function
 
2657
1459
        to bind to an interface if one was specified, and also NOT to
 
2658
1460
        bind to an address or port if they were not specified."""
 
2659
 
        global SO_BINDTODEVICE
 
2660
1461
        if self.interface is not None:
 
2661
1462
            if SO_BINDTODEVICE is None:
 
2662
 
                # Fall back to a hard-coded value which seems to be
 
2664
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2665
 
                SO_BINDTODEVICE = 25
 
2667
 
                self.socket.setsockopt(
 
2668
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2669
 
                    (self.interface + "\0").encode("utf-8"))
 
2670
 
            except socket.error as error:
 
2671
 
                if error.errno == errno.EPERM:
 
2672
 
                    log.error("No permission to bind to interface %s",
 
2674
 
                elif error.errno == errno.ENOPROTOOPT:
 
2675
 
                    log.error("SO_BINDTODEVICE not available; cannot"
 
2676
 
                              " bind to interface %s", self.interface)
 
2677
 
                elif error.errno == errno.ENODEV:
 
2678
 
                    log.error("Interface %s does not exist, cannot"
 
2679
 
                              " bind", self.interface)
 
 
1463
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1464
                             " cannot bind to interface %s",
 
 
1468
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1472
                except socket.error as error:
 
 
1473
                    if error[0] == errno.EPERM:
 
 
1474
                        logger.error("No permission to"
 
 
1475
                                     " bind to interface %s",
 
 
1477
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1478
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1479
                                     " cannot bind to interface %s",
 
2682
1483
        # Only bind(2) the socket if we really need to.
 
2683
1484
        if self.server_address[0] or self.server_address[1]:
 
2684
 
            if self.server_address[1]:
 
2685
 
                self.allow_reuse_address = True
 
2686
1485
            if not self.server_address[0]:
 
2687
1486
                if self.address_family == socket.AF_INET6:
 
2688
 
                    any_address = "::"  # in6addr_any
 
 
1487
                    any_address = "::" # in6addr_any
 
2690
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1489
                    any_address = socket.INADDR_ANY
 
2691
1490
                self.server_address = (any_address,
 
2692
1491
                                       self.server_address[1])
 
2693
1492
            elif not self.server_address[1]:
 
2694
 
                self.server_address = (self.server_address[0], 0)
 
 
1493
                self.server_address = (self.server_address[0],
 
2695
1495
#                 if self.interface:
 
2696
1496
#                     self.server_address = (self.server_address[0],
 
 
3027
1728
    parser.add_argument("--no-dbus", action="store_false",
 
3028
1729
                        dest="use_dbus", help="Do not provide D-Bus"
 
3029
 
                        " system bus interface", default=None)
 
 
1730
                        " system bus interface")
 
3030
1731
    parser.add_argument("--no-ipv6", action="store_false",
 
3031
 
                        dest="use_ipv6", help="Do not use IPv6",
 
3033
 
    parser.add_argument("--no-restore", action="store_false",
 
3034
 
                        dest="restore", help="Do not restore stored"
 
3035
 
                        " state", default=None)
 
3036
 
    parser.add_argument("--socket", type=int,
 
3037
 
                        help="Specify a file descriptor to a network"
 
3038
 
                        " socket to use instead of creating one")
 
3039
 
    parser.add_argument("--statedir", metavar="DIR",
 
3040
 
                        help="Directory to save/restore state in")
 
3041
 
    parser.add_argument("--foreground", action="store_true",
 
3042
 
                        help="Run in foreground", default=None)
 
3043
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
3044
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
1732
                        dest="use_ipv6", help="Do not use IPv6")
 
3047
1733
    options = parser.parse_args()
 
3049
1740
    # Default values for config file for server-global settings
 
3050
 
    if gnutls.has_rawpk:
 
3051
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
3052
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
3054
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
3055
 
                    ":+SIGN-DSA-SHA256")
 
3056
 
    server_defaults = {"interface": "",
 
3060
 
                       "priority": priority,
 
3061
 
                       "servicename": "Mandos",
 
3067
 
                       "statedir": "/var/lib/mandos",
 
3068
 
                       "foreground": "False",
 
 
1741
    server_defaults = { "interface": "",
 
 
1746
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1747
                        "servicename": "Mandos",
 
3073
1753
    # Parse config file for server-global settings
 
3074
 
    server_config = configparser.ConfigParser(server_defaults)
 
 
1754
    server_config = configparser.SafeConfigParser(server_defaults)
 
3075
1755
    del server_defaults
 
3076
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
3077
 
    # Convert the ConfigParser object to a dict
 
 
1756
    server_config.read(os.path.join(options.configdir,
 
 
1758
    # Convert the SafeConfigParser object to a dict
 
3078
1759
    server_settings = server_config.defaults()
 
3079
1760
    # Use the appropriate methods on the non-string config options
 
3080
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3081
 
                   "foreground", "zeroconf"):
 
 
1761
    for option in ("debug", "use_dbus", "use_ipv6"):
 
3082
1762
        server_settings[option] = server_config.getboolean("DEFAULT",
 
3084
1764
    if server_settings["port"]:
 
3085
1765
        server_settings["port"] = server_config.getint("DEFAULT",
 
3087
 
    if server_settings["socket"]:
 
3088
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
3090
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
3091
 
        # over with an opened os.devnull.  But we don't want this to
 
3092
 
        # happen with a supplied network socket.
 
3093
 
        if 0 <= server_settings["socket"] <= 2:
 
3094
 
            server_settings["socket"] = os.dup(server_settings
 
3096
1767
    del server_config
 
3098
1769
    # Override the settings from the config file with command line
 
3099
1770
    # options, if set.
 
3100
1771
    for option in ("interface", "address", "port", "debug",
 
3101
 
                   "priority", "servicename", "configdir", "use_dbus",
 
3102
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
3103
 
                   "socket", "foreground", "zeroconf"):
 
 
1772
                   "priority", "servicename", "configdir",
 
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
 
3104
1774
        value = getattr(options, option)
 
3105
1775
        if value is not None:
 
3106
1776
            server_settings[option] = value
 
3108
1778
    # Force all strings to be unicode
 
3109
1779
    for option in server_settings.keys():
 
3110
 
        if isinstance(server_settings[option], bytes):
 
3111
 
            server_settings[option] = (server_settings[option]
 
3113
 
    # Force all boolean options to be boolean
 
3114
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3115
 
                   "foreground", "zeroconf"):
 
3116
 
        server_settings[option] = bool(server_settings[option])
 
3117
 
    # Debug implies foreground
 
3118
 
    if server_settings["debug"]:
 
3119
 
        server_settings["foreground"] = True
 
 
1780
        if type(server_settings[option]) is str:
 
 
1781
            server_settings[option] = unicode(server_settings[option])
 
3120
1782
    # Now we have our good server settings in "server_settings"
 
3122
1784
    ##################################################################
 
3124
 
    if (not server_settings["zeroconf"]
 
3125
 
        and not (server_settings["port"]
 
3126
 
                 or server_settings["socket"] != "")):
 
3127
 
        parser.error("Needs port or socket to work without Zeroconf")
 
3129
1786
    # For convenience
 
3130
1787
    debug = server_settings["debug"]
 
3131
1788
    debuglevel = server_settings["debuglevel"]
 
3132
1789
    use_dbus = server_settings["use_dbus"]
 
3133
1790
    use_ipv6 = server_settings["use_ipv6"]
 
3134
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
3136
 
    foreground = server_settings["foreground"]
 
3137
 
    zeroconf = server_settings["zeroconf"]
 
3140
 
        initlogger(debug, logging.DEBUG)
 
3145
 
            level = getattr(logging, debuglevel.upper())
 
3146
 
            initlogger(debug, level)
 
3148
1792
    if server_settings["servicename"] != "Mandos":
 
3149
 
        syslogger.setFormatter(
 
3150
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
 
3151
 
                              " %(levelname)s: %(message)s".format(
 
3152
 
                                  server_settings["servicename"])))
 
 
1793
        syslogger.setFormatter(logging.Formatter
 
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
 
1795
                                ' %%(levelname)s: %%(message)s'
 
 
1796
                                % server_settings["servicename"]))
 
3154
1798
    # Parse config file with clients
 
3155
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
 
1799
    client_defaults = { "timeout": "1h",
 
 
1801
                        "checker": "fping -q -- %%(host)s",
 
 
1803
                        "approval_delay": "0s",
 
 
1804
                        "approval_duration": "1s",
 
 
1806
    client_config = configparser.SafeConfigParser(client_defaults)
 
3156
1807
    client_config.read(os.path.join(server_settings["configdir"],
 
3157
1808
                                    "clients.conf"))
 
3159
1810
    global mandos_dbus_service
 
3160
1811
    mandos_dbus_service = None
 
3163
 
    if server_settings["socket"] != "":
 
3164
 
        socketfd = server_settings["socket"]
 
3165
 
    tcp_server = MandosServer(
 
3166
 
        (server_settings["address"], server_settings["port"]),
 
3168
 
        interface=(server_settings["interface"] or None),
 
3170
 
        gnutls_priority=server_settings["priority"],
 
3174
 
        pidfilename = "/run/mandos.pid"
 
3175
 
        if not os.path.isdir("/run/."):
 
3176
 
            pidfilename = "/var/run/mandos.pid"
 
3179
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
3180
 
        except IOError as e:
 
3181
 
            log.error("Could not open file %r", pidfilename,
 
3184
 
    for name, group in (("_mandos", "_mandos"),
 
3185
 
                        ("mandos", "mandos"),
 
3186
 
                        ("nobody", "nogroup")):
 
3188
 
            uid = pwd.getpwnam(name).pw_uid
 
3189
 
            gid = pwd.getpwnam(group).pw_gid
 
 
1813
    tcp_server = MandosServer((server_settings["address"],
 
 
1814
                               server_settings["port"]),
 
 
1816
                              interface=(server_settings["interface"]
 
 
1820
                              server_settings["priority"],
 
 
1823
        pidfilename = "/var/run/mandos.pid"
 
 
1825
            pidfile = open(pidfilename, "w")
 
 
1827
            logger.error("Could not open file %r", pidfilename)
 
 
1830
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
1831
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
1834
            uid = pwd.getpwnam("mandos").pw_uid
 
 
1835
            gid = pwd.getpwnam("mandos").pw_gid
 
3191
1836
        except KeyError:
 
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
 
3199
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3200
1846
    except OSError as error:
 
3201
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
 
3202
 
                    os.strerror(error.errno))
 
3203
 
        if error.errno != errno.EPERM:
 
 
1847
        if error[0] != errno.EPERM:
 
 
1850
    if not debug and not debuglevel:
 
 
1851
        syslogger.setLevel(logging.WARNING)
 
 
1852
        console.setLevel(logging.WARNING)
 
 
1854
        level = getattr(logging, debuglevel.upper())
 
 
1855
        syslogger.setLevel(level)
 
 
1856
        console.setLevel(level)
 
3207
1859
        # Enable all possible GnuTLS debugging
 
3209
1861
        # "Use a log level over 10 to enable all debugging options."
 
3210
1862
        # - GnuTLS manual
 
3211
 
        gnutls.global_set_log_level(11)
 
 
1863
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
1865
        @gnutls.library.types.gnutls_log_func
 
3214
1866
        def debug_gnutls(level, string):
 
3215
 
            log.debug("GnuTLS: %s",
 
3216
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3218
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
1867
            logger.debug("GnuTLS: %s", string[:-1])
 
 
1869
        (gnutls.library.functions
 
 
1870
         .gnutls_global_set_log_function(debug_gnutls))
 
3220
1872
        # Redirect stdin so all checkers get /dev/null
 
3221
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1873
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
3222
1874
        os.dup2(null, sys.stdin.fileno())
 
 
1878
        # No console logging
 
 
1879
        logger.removeHandler(console)
 
3226
1881
    # Need to fork before connecting to D-Bus
 
3228
1883
        # Close all input and output, do double fork, etc.
 
3231
 
    if gi.version_info < (3, 10, 2):
 
3232
 
        # multiprocessing will use threads, so before we use GLib we
 
3233
 
        # need to inform GLib that threads will be used.
 
3236
1886
    global main_loop
 
3237
1887
    # From the Avahi example code
 
3238
 
    DBusGMainLoop(set_as_default=True)
 
3239
 
    main_loop = GLib.MainLoop()
 
 
1888
    DBusGMainLoop(set_as_default=True )
 
 
1889
    main_loop = gobject.MainLoop()
 
3240
1890
    bus = dbus.SystemBus()
 
3241
1891
    # End of Avahi example code
 
3244
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3247
 
            old_bus_name = dbus.service.BusName(
 
3248
 
                "se.bsnet.fukt.Mandos", bus,
 
3250
 
        except dbus.exceptions.DBusException as e:
 
3251
 
            log.error("Disabling D-Bus:", exc_info=e)
 
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
 
1895
                                            bus, do_not_queue=True)
 
 
1896
        except dbus.exceptions.NameExistsException as e:
 
 
1897
            logger.error(unicode(e) + ", disabling D-Bus")
 
3252
1898
            use_dbus = False
 
3253
1899
            server_settings["use_dbus"] = False
 
3254
1900
            tcp_server.use_dbus = False
 
3256
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3257
 
        service = AvahiServiceToSyslog(
 
3258
 
            name=server_settings["servicename"],
 
3259
 
            servicetype="_mandos._tcp",
 
3262
 
        if server_settings["interface"]:
 
3263
 
            service.interface = if_nametoindex(
 
3264
 
                server_settings["interface"].encode("utf-8"))
 
 
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
 
1903
                           servicetype = "_mandos._tcp",
 
 
1904
                           protocol = protocol, bus = bus)
 
 
1905
    if server_settings["interface"]:
 
 
1906
        service.interface = (if_nametoindex
 
 
1907
                             (str(server_settings["interface"])))
 
3266
1909
    global multiprocessing_manager
 
3267
1910
    multiprocessing_manager = multiprocessing.Manager()
 
3269
1912
    client_class = Client
 
3271
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
3273
 
    client_settings = Client.config_parser(client_config)
 
3274
 
    old_client_settings = {}
 
3277
 
    # This is used to redirect stdout and stderr for checker processes
 
3279
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3280
 
    # Only used if server is running in foreground but not in debug
 
3282
 
    if debug or not foreground:
 
3285
 
    # Get client data and settings from last running state.
 
3286
 
    if server_settings["restore"]:
 
3288
 
            with open(stored_state_path, "rb") as stored_state:
 
3289
 
                if sys.version_info.major == 2:
 
3290
 
                    clients_data, old_client_settings = pickle.load(
 
3293
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3294
 
                        pickle.load(stored_state, encoding="bytes"))
 
3295
 
                    #   Fix bytes to strings
 
3298
 
                    clients_data = {(key.decode("utf-8")
 
3299
 
                                     if isinstance(key, bytes)
 
3302
 
                                    bytes_clients_data.items()}
 
3303
 
                    del bytes_clients_data
 
3304
 
                    for key in clients_data:
 
3305
 
                        value = {(k.decode("utf-8")
 
3306
 
                                  if isinstance(k, bytes) else k): v
 
3308
 
                                 clients_data[key].items()}
 
3309
 
                        clients_data[key] = value
 
3311
 
                        value["client_structure"] = [
 
3313
 
                             if isinstance(s, bytes)
 
3315
 
                            value["client_structure"]]
 
3316
 
                        # .name, .host, and .checker_command
 
3317
 
                        for k in ("name", "host", "checker_command"):
 
3318
 
                            if isinstance(value[k], bytes):
 
3319
 
                                value[k] = value[k].decode("utf-8")
 
3320
 
                        if "key_id" not in value:
 
3321
 
                            value["key_id"] = ""
 
3322
 
                        elif "fingerprint" not in value:
 
3323
 
                            value["fingerprint"] = ""
 
3324
 
                    #  old_client_settings
 
3326
 
                    old_client_settings = {
 
3327
 
                        (key.decode("utf-8")
 
3328
 
                         if isinstance(key, bytes)
 
3331
 
                        bytes_old_client_settings.items()}
 
3332
 
                    del bytes_old_client_settings
 
3333
 
                    # .host and .checker_command
 
3334
 
                    for value in old_client_settings.values():
 
3335
 
                        for attribute in ("host", "checker_command"):
 
3336
 
                            if isinstance(value[attribute], bytes):
 
3337
 
                                value[attribute] = (value[attribute]
 
3339
 
            os.remove(stored_state_path)
 
3340
 
        except IOError as e:
 
3341
 
            if e.errno == errno.ENOENT:
 
3342
 
                log.warning("Could not load persistent state:"
 
3343
 
                            " %s", os.strerror(e.errno))
 
3345
 
                log.critical("Could not load persistent state:",
 
3348
 
        except EOFError as e:
 
3349
 
            log.warning("Could not load persistent state: EOFError:",
 
3352
 
    with PGPEngine() as pgp:
 
3353
 
        for client_name, client in clients_data.items():
 
3354
 
            # Skip removed clients
 
3355
 
            if client_name not in client_settings:
 
3358
 
            # Decide which value to use after restoring saved state.
 
3359
 
            # We have three different values: Old config file,
 
3360
 
            # new config file, and saved state.
 
3361
 
            # New config value takes precedence if it differs from old
 
3362
 
            # config value, otherwise use saved state.
 
3363
 
            for name, value in client_settings[client_name].items():
 
3365
 
                    # For each value in new config, check if it
 
3366
 
                    # differs from the old config value (Except for
 
3367
 
                    # the "secret" attribute)
 
3368
 
                    if (name != "secret"
 
3370
 
                             old_client_settings[client_name][name])):
 
3371
 
                        client[name] = value
 
3375
 
            # Clients who has passed its expire date can still be
 
3376
 
            # enabled if its last checker was successful.  A Client
 
3377
 
            # whose checker succeeded before we stored its state is
 
3378
 
            # assumed to have successfully run all checkers during
 
3380
 
            if client["enabled"]:
 
3381
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
3382
 
                    if not client["last_checked_ok"]:
 
3383
 
                        log.warning("disabling client %s - Client"
 
3384
 
                                    " never performed a successful"
 
3385
 
                                    " checker", client_name)
 
3386
 
                        client["enabled"] = False
 
3387
 
                    elif client["last_checker_status"] != 0:
 
3388
 
                        log.warning("disabling client %s - Client"
 
3389
 
                                    " last checker failed with error"
 
3390
 
                                    " code %s", client_name,
 
3391
 
                                    client["last_checker_status"])
 
3392
 
                        client["enabled"] = False
 
3394
 
                        client["expires"] = (
 
3395
 
                            datetime.datetime.utcnow()
 
3396
 
                            + client["timeout"])
 
3397
 
                        log.debug("Last checker succeeded, keeping %s"
 
3398
 
                                  " enabled", client_name)
 
 
1914
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
1915
    def client_config_items(config, section):
 
 
1916
        special_settings = {
 
 
1917
            "approved_by_default":
 
 
1918
                lambda: config.getboolean(section,
 
 
1919
                                          "approved_by_default"),
 
 
1921
        for name, value in config.items(section):
 
3400
 
                client["secret"] = pgp.decrypt(
 
3401
 
                    client["encrypted_secret"],
 
3402
 
                    client_settings[client_name]["secret"])
 
3404
 
                # If decryption fails, we use secret from new settings
 
3405
 
                log.debug("Failed to decrypt %s old secret",
 
3407
 
                client["secret"] = (client_settings[client_name]
 
3410
 
    # Add/remove clients based on new changes made to config
 
3411
 
    for client_name in (set(old_client_settings)
 
3412
 
                        - set(client_settings)):
 
3413
 
        del clients_data[client_name]
 
3414
 
    for client_name in (set(client_settings)
 
3415
 
                        - set(old_client_settings)):
 
3416
 
        clients_data[client_name] = client_settings[client_name]
 
3418
 
    # Create all client objects
 
3419
 
    for client_name, client in clients_data.items():
 
3420
 
        tcp_server.clients[client_name] = client_class(
 
3423
 
            server_settings=server_settings)
 
 
1923
                yield (name, special_settings[name]())
 
 
1927
    tcp_server.clients.update(set(
 
 
1928
            client_class(name = section,
 
 
1929
                         config= dict(client_config_items(
 
 
1930
                        client_config, section)))
 
 
1931
            for section in client_config.sections()))
 
3425
1932
    if not tcp_server.clients:
 
3426
 
        log.warning("No clients defined")
 
3429
 
        if pidfile is not None:
 
3433
 
                    print(pid, file=pidfile)
 
3435
 
                log.error("Could not write to file %r with PID %d",
 
 
1933
        logger.warning("No clients defined")
 
 
1939
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
1942
            logger.error("Could not write to file %r with PID %d",
 
 
1945
            # "pidfile" was never created
 
3438
1947
        del pidfilename
 
3440
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3441
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3442
 
                             lambda: main_loop.quit() and False)
 
 
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3446
 
        @alternate_dbus_interfaces(
 
3447
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3448
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
1955
        class MandosDBusService(dbus.service.Object):
 
3449
1956
            """A D-Bus proxy object"""
 
3451
1957
            def __init__(self):
 
3452
1958
                dbus.service.Object.__init__(self, bus, "/")
 
3454
 
            _interface = "se.recompile.Mandos"
 
 
1959
            _interface = "se.bsnet.fukt.Mandos"
 
3456
1961
            @dbus.service.signal(_interface, signature="o")
 
3457
1962
            def ClientAdded(self, objpath):
 
3461
1966
            @dbus.service.signal(_interface, signature="ss")
 
3462
 
            def ClientNotFound(self, key_id, address):
 
 
1967
            def ClientNotFound(self, fingerprint, address):
 
3466
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3468
1971
            @dbus.service.signal(_interface, signature="os")
 
3469
1972
            def ClientRemoved(self, objpath, name):
 
3473
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3475
1976
            @dbus.service.method(_interface, out_signature="ao")
 
3476
1977
            def GetAllClients(self):
 
3478
 
                return dbus.Array(c.dbus_object_path for c in
 
3479
 
                                  tcp_server.clients.values())
 
3481
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
1979
                return dbus.Array(c.dbus_object_path
 
 
1980
                                  for c in tcp_server.clients)
 
3483
1982
            @dbus.service.method(_interface,
 
3484
1983
                                 out_signature="a{oa{sv}}")
 
3485
1984
            def GetAllClientsWithProperties(self):
 
3487
1986
                return dbus.Dictionary(
 
3488
 
                    {c.dbus_object_path: c.GetAll(
 
3489
 
                        "se.recompile.Mandos.Client")
 
3490
 
                     for c in tcp_server.clients.values()},
 
 
1987
                    ((c.dbus_object_path, c.GetAll(""))
 
 
1988
                     for c in tcp_server.clients),
 
3491
1989
                    signature="oa{sv}")
 
3493
1991
            @dbus.service.method(_interface, in_signature="o")
 
3494
1992
            def RemoveClient(self, object_path):
 
3496
 
                for c in tcp_server.clients.values():
 
 
1994
                for c in tcp_server.clients:
 
3497
1995
                    if c.dbus_object_path == object_path:
 
3498
 
                        del tcp_server.clients[c.name]
 
 
1996
                        tcp_server.clients.remove(c)
 
3499
1997
                        c.remove_from_connection()
 
3500
 
                        # Don't signal the disabling
 
 
1998
                        # Don't signal anything except ClientRemoved
 
3501
1999
                        c.disable(quiet=True)
 
3502
 
                        # Emit D-Bus signal for removal
 
3503
 
                        self.client_removed_signal(c)
 
 
2001
                        self.ClientRemoved(object_path, c.name)
 
3505
2003
                raise KeyError(object_path)
 
3509
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3510
 
                                 out_signature="a{oa{sa{sv}}}")
 
3511
 
            def GetManagedObjects(self):
 
3513
 
                return dbus.Dictionary(
 
3514
 
                    {client.dbus_object_path:
 
3516
 
                         {interface: client.GetAll(interface)
 
3518
 
                          client._get_all_interface_names()})
 
3519
 
                     for client in tcp_server.clients.values()})
 
3521
 
            def client_added_signal(self, client):
 
3522
 
                """Send the new standard signal and the old signal"""
 
3524
 
                    # New standard signal
 
3525
 
                    self.InterfacesAdded(
 
3526
 
                        client.dbus_object_path,
 
3528
 
                            {interface: client.GetAll(interface)
 
3530
 
                             client._get_all_interface_names()}))
 
3532
 
                    self.ClientAdded(client.dbus_object_path)
 
3534
 
            def client_removed_signal(self, client):
 
3535
 
                """Send the new standard signal and the old signal"""
 
3537
 
                    # New standard signal
 
3538
 
                    self.InterfacesRemoved(
 
3539
 
                        client.dbus_object_path,
 
3540
 
                        client._get_all_interface_names())
 
3542
 
                    self.ClientRemoved(client.dbus_object_path,
 
3545
2007
        mandos_dbus_service = MandosDBusService()
 
3547
 
    # Save modules to variables to exempt the modules from being
 
3548
 
    # unloaded before the function registered with atexit() is run.
 
3549
 
    mp = multiprocessing
 
3553
2010
        "Cleanup function; run on exit"
 
3557
 
        mp.active_children()
 
3559
 
        if not (tcp_server.clients or client_settings):
 
3562
 
        # Store client before exiting. Secrets are encrypted with key
 
3563
 
        # based on what config file has. If config file is
 
3564
 
        # removed/edited, old secret will thus be unrecovable.
 
3566
 
        with PGPEngine() as pgp:
 
3567
 
            for client in tcp_server.clients.values():
 
3568
 
                key = client_settings[client.name]["secret"]
 
3569
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3573
 
                # A list of attributes that can not be pickled
 
3575
 
                exclude = {"bus", "changedstate", "secret",
 
3576
 
                           "checker", "server_settings"}
 
3577
 
                for name, typ in inspect.getmembers(dbus.service
 
3581
 
                client_dict["encrypted_secret"] = (client
 
3583
 
                for attr in client.client_structure:
 
3584
 
                    if attr not in exclude:
 
3585
 
                        client_dict[attr] = getattr(client, attr)
 
3587
 
                clients[client.name] = client_dict
 
3588
 
                del client_settings[client.name]["secret"]
 
3591
 
            with tempfile.NamedTemporaryFile(
 
3595
 
                    dir=os.path.dirname(stored_state_path),
 
3596
 
                    delete=False) as stored_state:
 
3597
 
                pickle.dump((clients, client_settings), stored_state,
 
3599
 
                tempname = stored_state.name
 
3600
 
            os.rename(tempname, stored_state_path)
 
3601
 
        except (IOError, OSError) as e:
 
3607
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3608
 
                log.warning("Could not save persistent state: %s",
 
3609
 
                            os.strerror(e.errno))
 
3611
 
                log.warning("Could not save persistent state:",
 
3615
 
        # Delete all clients, and settings from config
 
3616
2013
        while tcp_server.clients:
 
3617
 
            name, client = tcp_server.clients.popitem()
 
 
2014
            client = tcp_server.clients.pop()
 
3619
2016
                client.remove_from_connection()
 
3620
 
            # Don't signal the disabling
 
 
2017
            client.disable_hook = None
 
 
2018
            # Don't signal anything except ClientRemoved
 
3621
2019
            client.disable(quiet=True)
 
3622
 
            # Emit D-Bus signal for removal
 
3624
 
                mandos_dbus_service.client_removed_signal(client)
 
3625
 
        client_settings.clear()
 
 
2022
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
3627
2025
    atexit.register(cleanup)
 
3629
 
    for client in tcp_server.clients.values():
 
 
2027
    for client in tcp_server.clients:
 
3631
 
            # Emit D-Bus signal for adding
 
3632
 
            mandos_dbus_service.client_added_signal(client)
 
3633
 
        # Need to initiate checking of clients
 
3635
 
            client.init_checker(randomize_start=True)
 
 
2030
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3637
2033
    tcp_server.enable()
 
3638
2034
    tcp_server.server_activate()
 
3640
2036
    # Find out what port we got
 
3642
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2037
    service.port = tcp_server.socket.getsockname()[1]
 
3644
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
3645
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
 
2039
        logger.info("Now listening on address %r, port %d,"
 
 
2040
                    " flowinfo %d, scope_id %d"
 
 
2041
                    % tcp_server.socket.getsockname())
 
3647
 
        log.info("Now listening on address %r, port %d",
 
3648
 
                 *tcp_server.socket.getsockname())
 
3650
 
    # service.interface = tcp_server.socket.getsockname()[3]
 
 
2043
        logger.info("Now listening on address %r, port %d"
 
 
2044
                    % tcp_server.socket.getsockname())
 
 
2046
    #service.interface = tcp_server.socket.getsockname()[3]
 
3654
 
            # From the Avahi example code
 
3657
 
            except dbus.exceptions.DBusException as error:
 
3658
 
                log.critical("D-Bus Exception", exc_info=error)
 
3661
 
            # End of Avahi example code
 
3664
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3665
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3666
 
            lambda *args, **kwargs: (tcp_server.handle_request
 
3667
 
                                     (*args[2:], **kwargs) or True))
 
3669
 
        log.debug("Starting main loop")
 
 
2049
        # From the Avahi example code
 
 
2052
        except dbus.exceptions.DBusException as error:
 
 
2053
            logger.critical("DBusException: %s", error)
 
 
2056
        # End of Avahi example code
 
 
2058
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
 
2059
                             lambda *args, **kwargs:
 
 
2060
                             (tcp_server.handle_request
 
 
2061
                              (*args[2:], **kwargs) or True))
 
 
2063
        logger.debug("Starting main loop")
 
3670
2064
        main_loop.run()
 
3671
2065
    except AvahiError as error:
 
3672
 
        log.critical("Avahi Error", exc_info=error)
 
 
2066
        logger.critical("AvahiError: %s", error)
 
3675
2069
    except KeyboardInterrupt:
 
3677
2071
            print("", file=sys.stderr)
 
3678
 
        log.debug("Server received KeyboardInterrupt")
 
3679
 
    log.debug("Server exiting")
 
 
2072
        logger.debug("Server received KeyboardInterrupt")
 
 
2073
    logger.debug("Server exiting")
 
3680
2074
    # Must run before the D-Bus bus name gets deregistered
 
3684
 
def parse_test_args():
 
3685
 
    # type: () -> argparse.Namespace
 
3686
 
    parser = argparse.ArgumentParser(add_help=False)
 
3687
 
    parser.add_argument("--check", action="store_true")
 
3688
 
    parser.add_argument("--prefix", )
 
3689
 
    args, unknown_args = parser.parse_known_args()
 
3691
 
        # Remove test options from sys.argv
 
3692
 
        sys.argv[1:] = unknown_args
 
3695
 
# Add all tests from doctest strings
 
3696
 
def load_tests(loader, tests, none):
 
3698
 
    tests.addTests(doctest.DocTestSuite())
 
3701
 
if __name__ == "__main__":
 
3702
 
    options = parse_test_args()
 
3705
 
            extra_test_prefix = options.prefix
 
3706
 
            if extra_test_prefix is not None:
 
3707
 
                if not (unittest.main(argv=[""], exit=False)
 
3708
 
                        .result.wasSuccessful()):
 
3710
 
                class ExtraTestLoader(unittest.TestLoader):
 
3711
 
                    testMethodPrefix = extra_test_prefix
 
3712
 
                # Call using ./scriptname --test [--verbose]
 
3713
 
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
 
3715
 
                unittest.main(argv=[""])
 
3723
 
# (lambda (&optional extra)
 
3724
 
#   (if (not (funcall run-tests-in-test-buffer default-directory
 
3726
 
#       (funcall show-test-buffer-in-test-window)
 
3727
 
#     (funcall remove-test-window)
 
3728
 
#     (if extra (message "Extra tests run successfully!"))))
 
3729
 
# run-tests-in-test-buffer:
 
3730
 
# (lambda (dir &optional extra)
 
3731
 
#   (with-current-buffer (get-buffer-create "*Test*")
 
3732
 
#     (setq buffer-read-only nil
 
3733
 
#           default-directory dir)
 
3735
 
#     (compilation-mode))
 
3736
 
#   (let ((process-result
 
3737
 
#          (let ((inhibit-read-only t))
 
3738
 
#            (process-file-shell-command
 
3739
 
#             (funcall get-command-line extra) nil "*Test*"))))
 
3740
 
#     (and (numberp process-result)
 
3741
 
#          (= process-result 0))))
 
3743
 
# (lambda (&optional extra)
 
3744
 
#   (let ((quoted-script
 
3745
 
#          (shell-quote-argument (funcall get-script-name))))
 
3747
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
 
3751
 
#   (if (fboundp 'file-local-name)
 
3752
 
#       (file-local-name (buffer-file-name))
 
3753
 
#     (or (file-remote-p (buffer-file-name) 'localname)
 
3754
 
#         (buffer-file-name))))
 
3755
 
# remove-test-window:
 
3757
 
#   (let ((test-window (get-buffer-window "*Test*")))
 
3758
 
#     (if test-window (delete-window test-window))))
 
3759
 
# show-test-buffer-in-test-window:
 
3761
 
#   (when (not (get-buffer-window-list "*Test*"))
 
3762
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
 
3763
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
 
3764
 
#            (display-buffer-overriding-action
 
3765
 
#             `((display-buffer-in-side-window) (side . ,side)
 
3766
 
#               (window-height . fit-window-to-buffer)
 
3767
 
#               (window-width . fit-window-to-buffer))))
 
3768
 
#       (display-buffer "*Test*"))))
 
3771
 
#   (let* ((run-extra-tests (lambda () (interactive)
 
3772
 
#                             (funcall run-tests t)))
 
3773
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
 
3774
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
 
3775
 
#     (setq minor-mode-overriding-map-alist
 
3776
 
#           (cons `(run-tests . ,outer-keymap)
 
3777
 
#                 minor-mode-overriding-map-alist)))
 
3778
 
#   (add-hook 'after-save-hook run-tests 90 t))
 
 
2077
if __name__ == '__main__':