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-2020 Teddy Hogeborn
 
15
 
# Copyright © 2008-2020 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
 
1048
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
 
386
        self.send_changedstate()
 
1050
387
        self.last_enabled = datetime.datetime.utcnow()
 
1052
 
        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*.
 
1054
401
    def disable(self, quiet=True):
 
1055
402
        """Disable this client."""
 
1056
403
        if not getattr(self, "enabled", False):
 
1059
 
            log.info("Disabling client %s", self.name)
 
1060
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
1061
 
            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)
 
1062
411
            self.disable_initiator_tag = None
 
1064
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
1065
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
412
        if getattr(self, "checker_initiator_tag", False):
 
 
413
            gobject.source_remove(self.checker_initiator_tag)
 
1066
414
            self.checker_initiator_tag = None
 
1067
415
        self.stop_checker()
 
 
416
        if self.disable_hook:
 
 
417
            self.disable_hook(self)
 
1068
418
        self.enabled = False
 
1070
 
            self.send_changedstate()
 
1071
 
        # 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
 
1074
422
    def __del__(self):
 
 
423
        self.disable_hook = None
 
1077
 
    def init_checker(self):
 
1078
 
        # Schedule a new checker to be started an 'interval' from now,
 
1079
 
        # and every interval from then on.
 
1080
 
        if self.checker_initiator_tag is not None:
 
1081
 
            GLib.source_remove(self.checker_initiator_tag)
 
1082
 
        self.checker_initiator_tag = GLib.timeout_add(
 
1083
 
            random.randrange(int(self.interval.total_seconds() * 1000
 
1086
 
        # Schedule a disable() when 'timeout' has passed
 
1087
 
        if self.disable_initiator_tag is not None:
 
1088
 
            GLib.source_remove(self.disable_initiator_tag)
 
1089
 
        self.disable_initiator_tag = GLib.timeout_add(
 
1090
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
1091
 
        # Also start a new checker *right now*.
 
1092
 
        self.start_checker()
 
1094
 
    def checker_callback(self, source, condition, connection,
 
 
426
    def checker_callback(self, pid, condition, command):
 
1096
427
        """The checker has completed, so take appropriate actions."""
 
1097
 
        # Read return code from connection (see call_pipe)
 
1098
 
        returncode = connection.recv()
 
1100
 
        if self.checker is not None:
 
1102
428
        self.checker_callback_tag = None
 
1103
429
        self.checker = None
 
1106
 
            self.last_checker_status = returncode
 
1107
 
            self.last_checker_signal = None
 
1108
 
            if self.last_checker_status == 0:
 
1109
 
                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",
 
1110
435
                self.checked_ok()
 
1112
 
                log.info("Checker for %(name)s failed", vars(self))
 
 
437
                logger.info("Checker for %(name)s failed",
 
1114
 
            self.last_checker_status = -1
 
1115
 
            self.last_checker_signal = -returncode
 
1116
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
 
440
            logger.warning("Checker for %(name)s crashed?",
 
1119
443
    def checked_ok(self):
 
1120
 
        """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,
 
1121
449
        self.last_checked_ok = datetime.datetime.utcnow()
 
1122
 
        self.last_checker_status = 0
 
1123
 
        self.last_checker_signal = None
 
1126
 
    def bump_timeout(self, timeout=None):
 
1127
 
        """Bump up the timeout for this client."""
 
1129
 
            timeout = self.timeout
 
1130
 
        if self.disable_initiator_tag is not None:
 
1131
 
            GLib.source_remove(self.disable_initiator_tag)
 
1132
 
            self.disable_initiator_tag = None
 
1133
 
        if getattr(self, "enabled", False):
 
1134
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1135
 
                int(timeout.total_seconds() * 1000), self.disable)
 
1136
 
            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(),
 
1138
455
    def need_approval(self):
 
1139
456
        self.last_approval_request = datetime.datetime.utcnow()
 
1141
458
    def start_checker(self):
 
1142
459
        """Start a new checker subprocess if one is not running.
 
1144
461
        If a checker already exists, leave it running and do
 
1146
463
        # The reason for not killing a running checker is that if we
 
1147
 
        # did that, and if a checker (for some reason) started running
 
1148
 
        # slowly and taking more than 'interval' time, then the client
 
1149
 
        # would inevitably timeout, since no checker would get a
 
1150
 
        # 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
 
1151
468
        # checkers alone, the checker would have to take more time
 
1152
469
        # than 'timeout' for the client to be disabled, which is as it
 
1155
 
        if self.checker is not None and not self.checker.is_alive():
 
1156
 
            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)
 
1159
485
        # Start a new checker if needed
 
1160
486
        if self.checker is None:
 
1161
 
            # Escape attributes for the shell
 
1163
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1164
 
                for attr in self.runtime_expansions}
 
1166
 
                command = self.checker_command % escaped_attrs
 
1167
 
            except TypeError as error:
 
1168
 
                log.error('Could not format string "%s"',
 
1169
 
                          self.checker_command, exc_info=error)
 
1170
 
                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
 
1171
506
            self.current_checker_command = command
 
1172
 
            log.info("Starting checker %r for %s", command, self.name)
 
1173
 
            # We don't need to redirect stdout and stderr, since
 
1174
 
            # in normal mode, that is already done by daemon(),
 
1175
 
            # and in debug mode we don't want to.  (Stdin is
 
1176
 
            # always replaced by /dev/null.)
 
1177
 
            # The exception is when not debugging but nevertheless
 
1178
 
            # running in the foreground; use the previously
 
1180
 
            popen_args = {"close_fds": True,
 
1183
 
            if (not self.server_settings["debug"]
 
1184
 
                and self.server_settings["foreground"]):
 
1185
 
                popen_args.update({"stdout": wnull,
 
1187
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1188
 
            self.checker = multiprocessing.Process(
 
1190
 
                args=(pipe[1], subprocess.call, command),
 
1192
 
            self.checker.start()
 
1193
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1194
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1195
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1196
 
                self.checker_callback, pipe[0], command)
 
1197
 
        # 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
 
1200
533
    def stop_checker(self):
 
1201
534
        """Force the checker process, if any, to stop."""
 
1202
535
        if self.checker_callback_tag:
 
1203
 
            GLib.source_remove(self.checker_callback_tag)
 
 
536
            gobject.source_remove(self.checker_callback_tag)
 
1204
537
            self.checker_callback_tag = None
 
1205
538
        if getattr(self, "checker", None) is None:
 
1207
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1208
 
        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
 
1209
549
        self.checker = None
 
1212
 
def dbus_service_property(dbus_interface,
 
 
551
def dbus_service_property(dbus_interface, signature="v",
 
 
552
                          access="readwrite", byte_arrays=False):
 
1216
553
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1217
554
    become properties on the D-Bus.
 
1219
556
    The decorated method will be called with no arguments by "Get"
 
1220
557
    and with one argument by "Set".
 
1222
559
    The parameters, where they are supported, are the same as
 
1223
560
    dbus.service.method, except there is only "signature", since the
 
1224
561
    type from Get() and the type sent to Set() is the same.
 
 
1555
732
            document.unlink()
 
1556
733
        except (AttributeError, xml.dom.DOMException,
 
1557
734
                xml.parsers.expat.ExpatError) as error:
 
1558
 
            log.error("Failed to override Introspection method",
 
1564
 
    dbus.OBJECT_MANAGER_IFACE
 
1565
 
except AttributeError:
 
1566
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1569
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1570
 
    """A D-Bus object with an ObjectManager.
 
1572
 
    Classes inheriting from this exposes the standard
 
1573
 
    GetManagedObjects call and the InterfacesAdded and
 
1574
 
    InterfacesRemoved signals on the standard
 
1575
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1577
 
    Note: No signals are sent automatically; they must be sent
 
1580
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1581
 
                         out_signature="a{oa{sa{sv}}}")
 
1582
 
    def GetManagedObjects(self):
 
1583
 
        """This function must be overridden"""
 
1584
 
        raise NotImplementedError()
 
1586
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1587
 
                         signature="oa{sa{sv}}")
 
1588
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1591
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1592
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1595
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1597
 
                         path_keyword="object_path",
 
1598
 
                         connection_keyword="connection")
 
1599
 
    def Introspect(self, object_path, connection):
 
1600
 
        """Overloading of standard D-Bus method.
 
1602
 
        Override return argument name of GetManagedObjects to be
 
1603
 
        "objpath_interfaces_and_properties"
 
1605
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1609
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1611
 
            for if_tag in document.getElementsByTagName("interface"):
 
1612
 
                # Fix argument name for the GetManagedObjects method
 
1613
 
                if (if_tag.getAttribute("name")
 
1614
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1615
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1616
 
                        if (cn.getAttribute("name")
 
1617
 
                            == "GetManagedObjects"):
 
1618
 
                            for arg in cn.getElementsByTagName("arg"):
 
1619
 
                                if (arg.getAttribute("direction")
 
1623
 
                                        "objpath_interfaces"
 
1625
 
            xmlstring = document.toxml("utf-8")
 
1627
 
        except (AttributeError, xml.dom.DOMException,
 
1628
 
                xml.parsers.expat.ExpatError) as error:
 
1629
 
            log.error("Failed to override Introspection method",
 
1634
 
def datetime_to_dbus(dt, variant_level=0):
 
1635
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1637
 
        return dbus.String("", variant_level=variant_level)
 
1638
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1641
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1642
 
    """A class decorator; applied to a subclass of
 
1643
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1644
 
    interface names according to the "alt_interface_names" mapping.
 
1647
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1648
 
                                    "net.example.AlternateInterface"})
 
1649
 
    class SampleDBusObject(dbus.service.Object):
 
1650
 
        @dbus.service.method("org.example.Interface")
 
1651
 
        def SampleDBusMethod():
 
1654
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1655
 
    reachable via two interfaces: "org.example.Interface" and
 
1656
 
    "net.example.AlternateInterface", the latter of which will have
 
1657
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1658
 
    "true", unless "deprecate" is passed with a False value.
 
1660
 
    This works for methods and signals, and also for D-Bus properties
 
1661
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1662
 
    dbus_interface_annotations decorator).
 
1666
 
        for orig_interface_name, alt_interface_name in (
 
1667
 
                alt_interface_names.items()):
 
1669
 
            interface_names = set()
 
1670
 
            # Go though all attributes of the class
 
1671
 
            for attrname, attribute in inspect.getmembers(cls):
 
1672
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1673
 
                # with the wrong interface name
 
1674
 
                if (not hasattr(attribute, "_dbus_interface")
 
1675
 
                    or not attribute._dbus_interface.startswith(
 
1676
 
                        orig_interface_name)):
 
1678
 
                # Create an alternate D-Bus interface name based on
 
1680
 
                alt_interface = attribute._dbus_interface.replace(
 
1681
 
                    orig_interface_name, alt_interface_name)
 
1682
 
                interface_names.add(alt_interface)
 
1683
 
                # Is this a D-Bus signal?
 
1684
 
                if getattr(attribute, "_dbus_is_signal", False):
 
1685
 
                    # Extract the original non-method undecorated
 
1686
 
                    # function by black magic
 
1687
 
                    if sys.version_info.major == 2:
 
1688
 
                        nonmethod_func = (dict(
 
1689
 
                            zip(attribute.func_code.co_freevars,
 
1690
 
                                attribute.__closure__))
 
1691
 
                                          ["func"].cell_contents)
 
1693
 
                        nonmethod_func = (dict(
 
1694
 
                            zip(attribute.__code__.co_freevars,
 
1695
 
                                attribute.__closure__))
 
1696
 
                                          ["func"].cell_contents)
 
1697
 
                    # Create a new, but exactly alike, function
 
1698
 
                    # object, and decorate it to be a new D-Bus signal
 
1699
 
                    # with the alternate D-Bus interface name
 
1700
 
                    new_function = copy_function(nonmethod_func)
 
1701
 
                    new_function = (dbus.service.signal(
 
1703
 
                        attribute._dbus_signature)(new_function))
 
1704
 
                    # Copy annotations, if any
 
1706
 
                        new_function._dbus_annotations = dict(
 
1707
 
                            attribute._dbus_annotations)
 
1708
 
                    except AttributeError:
 
1711
 
                    # Define a creator of a function to call both the
 
1712
 
                    # original and alternate functions, so both the
 
1713
 
                    # original and alternate signals gets sent when
 
1714
 
                    # the function is called
 
1715
 
                    def fixscope(func1, func2):
 
1716
 
                        """This function is a scope container to pass
 
1717
 
                        func1 and func2 to the "call_both" function
 
1718
 
                        outside of its arguments"""
 
1720
 
                        @functools.wraps(func2)
 
1721
 
                        def call_both(*args, **kwargs):
 
1722
 
                            """This function will emit two D-Bus
 
1723
 
                            signals by calling func1 and func2"""
 
1724
 
                            func1(*args, **kwargs)
 
1725
 
                            func2(*args, **kwargs)
 
1726
 
                        # Make wrapper function look like a D-Bus
 
1728
 
                        for name, attr in inspect.getmembers(func2):
 
1729
 
                            if name.startswith("_dbus_"):
 
1730
 
                                setattr(call_both, name, attr)
 
1733
 
                    # Create the "call_both" function and add it to
 
1735
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1736
 
                # Is this a D-Bus method?
 
1737
 
                elif getattr(attribute, "_dbus_is_method", False):
 
1738
 
                    # Create a new, but exactly alike, function
 
1739
 
                    # object.  Decorate it to be a new D-Bus method
 
1740
 
                    # with the alternate D-Bus interface name.  Add it
 
1743
 
                        dbus.service.method(
 
1745
 
                            attribute._dbus_in_signature,
 
1746
 
                            attribute._dbus_out_signature)
 
1747
 
                        (copy_function(attribute)))
 
1748
 
                    # Copy annotations, if any
 
1750
 
                        attr[attrname]._dbus_annotations = dict(
 
1751
 
                            attribute._dbus_annotations)
 
1752
 
                    except AttributeError:
 
1754
 
                # Is this a D-Bus property?
 
1755
 
                elif getattr(attribute, "_dbus_is_property", False):
 
1756
 
                    # Create a new, but exactly alike, function
 
1757
 
                    # object, and decorate it to be a new D-Bus
 
1758
 
                    # property with the alternate D-Bus interface
 
1759
 
                    # name.  Add it to the class.
 
1760
 
                    attr[attrname] = (dbus_service_property(
 
1761
 
                        alt_interface, attribute._dbus_signature,
 
1762
 
                        attribute._dbus_access,
 
1763
 
                        attribute._dbus_get_args_options
 
1765
 
                                      (copy_function(attribute)))
 
1766
 
                    # Copy annotations, if any
 
1768
 
                        attr[attrname]._dbus_annotations = dict(
 
1769
 
                            attribute._dbus_annotations)
 
1770
 
                    except AttributeError:
 
1772
 
                # Is this a D-Bus interface?
 
1773
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1774
 
                    # Create a new, but exactly alike, function
 
1775
 
                    # object.  Decorate it to be a new D-Bus interface
 
1776
 
                    # with the alternate D-Bus interface name.  Add it
 
1779
 
                        dbus_interface_annotations(alt_interface)
 
1780
 
                        (copy_function(attribute)))
 
1782
 
                # Deprecate all alternate interfaces
 
1783
 
                iname = "_AlternateDBusNames_interface_annotation{}"
 
1784
 
                for interface_name in interface_names:
 
1786
 
                    @dbus_interface_annotations(interface_name)
 
1788
 
                        return {"org.freedesktop.DBus.Deprecated":
 
1790
 
                    # Find an unused name
 
1791
 
                    for aname in (iname.format(i)
 
1792
 
                                  for i in itertools.count()):
 
1793
 
                        if aname not in attr:
 
1797
 
                # Replace the class with a new subclass of it with
 
1798
 
                # methods, signals, etc. as created above.
 
1799
 
                if sys.version_info.major == 2:
 
1800
 
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1803
 
                    cls = type("{}Alternate".format(cls.__name__),
 
1810
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1811
 
                            "se.bsnet.fukt.Mandos"})
 
 
735
            logger.error("Failed to override Introspection method",
 
1812
740
class ClientDBus(Client, DBusObjectWithProperties):
 
1813
741
    """A Client class using D-Bus
 
1816
744
    dbus_object_path: dbus.ObjectPath
 
1817
745
    bus: dbus.SystemBus()
 
1820
748
    runtime_expansions = (Client.runtime_expansions
 
1821
 
                          + ("dbus_object_path", ))
 
1823
 
    _interface = "se.recompile.Mandos.Client"
 
 
749
                          + ("dbus_object_path",))
 
1825
751
    # dbus.service.Object doesn't use super(), so we can't either.
 
1827
 
    def __init__(self, bus=None, *args, **kwargs):
 
 
753
    def __init__(self, bus = None, *args, **kwargs):
 
 
754
        self._approvals_pending = 0
 
1829
756
        Client.__init__(self, *args, **kwargs)
 
1830
757
        # Only now, when this client is initialized, can it show up on
 
1832
 
        client_object_name = str(self.name).translate(
 
 
759
        client_object_name = unicode(self.name).translate(
 
1833
760
            {ord("."): ord("_"),
 
1834
761
             ord("-"): ord("_")})
 
1835
 
        self.dbus_object_path = dbus.ObjectPath(
 
1836
 
            "/clients/" + client_object_name)
 
 
762
        self.dbus_object_path = (dbus.ObjectPath
 
 
763
                                 ("/clients/" + client_object_name))
 
1837
764
        DBusObjectWithProperties.__init__(self, self.bus,
 
1838
765
                                          self.dbus_object_path)
 
1840
 
    def notifychangeproperty(transform_func, dbus_name,
 
1841
 
                             type_func=lambda x: x,
 
1843
 
                             invalidate_only=False,
 
1844
 
                             _interface=_interface):
 
1845
 
        """ Modify a variable so that it's a property which announces
 
1846
 
        its changes to DBus.
 
1848
 
        transform_fun: Function that takes a value and a variant_level
 
1849
 
                       and transforms it to a D-Bus type.
 
1850
 
        dbus_name: D-Bus name of the variable
 
1851
 
        type_func: Function that transform the value before sending it
 
1852
 
                   to the D-Bus.  Default: no transform
 
1853
 
        variant_level: D-Bus variant level.  Default: 1
 
1855
 
        attrname = "_{}".format(dbus_name)
 
1857
 
        def setter(self, value):
 
1858
 
            if hasattr(self, "dbus_object_path"):
 
1859
 
                if (not hasattr(self, attrname) or
 
1860
 
                    type_func(getattr(self, attrname, None))
 
1861
 
                    != type_func(value)):
 
1863
 
                        self.PropertiesChanged(
 
1864
 
                            _interface, dbus.Dictionary(),
 
1865
 
                            dbus.Array((dbus_name, )))
 
1867
 
                        dbus_value = transform_func(
 
1869
 
                            variant_level=variant_level)
 
1870
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1872
 
                        self.PropertiesChanged(
 
1874
 
                            dbus.Dictionary({dbus.String(dbus_name):
 
1877
 
            setattr(self, attrname, value)
 
1879
 
        return property(lambda self: getattr(self, attrname), setter)
 
1881
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1882
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1885
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1886
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1888
 
    checker = notifychangeproperty(
 
1889
 
        dbus.Boolean, "CheckerRunning",
 
1890
 
        type_func=lambda checker: checker is not None)
 
1891
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1893
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1894
 
                                               "LastCheckerStatus")
 
1895
 
    last_approval_request = notifychangeproperty(
 
1896
 
        datetime_to_dbus, "LastApprovalRequest")
 
1897
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1898
 
                                               "ApprovedByDefault")
 
1899
 
    approval_delay = notifychangeproperty(
 
1900
 
        dbus.UInt64, "ApprovalDelay",
 
1901
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1902
 
    approval_duration = notifychangeproperty(
 
1903
 
        dbus.UInt64, "ApprovalDuration",
 
1904
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1905
 
    host = notifychangeproperty(dbus.String, "Host")
 
1906
 
    timeout = notifychangeproperty(
 
1907
 
        dbus.UInt64, "Timeout",
 
1908
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1909
 
    extended_timeout = notifychangeproperty(
 
1910
 
        dbus.UInt64, "ExtendedTimeout",
 
1911
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1912
 
    interval = notifychangeproperty(
 
1913
 
        dbus.UInt64, "Interval",
 
1914
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1915
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1916
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1917
 
                                  invalidate_only=True)
 
1919
 
    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))
 
1921
811
    def __del__(self, *args, **kwargs):
 
1923
813
            self.remove_from_connection()
 
 
2241
1147
            self.start_checker()
 
2243
1149
            self.stop_checker()
 
2245
1151
    # ObjectPath - property
 
2247
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2248
 
         "org.freedesktop.DBus.Deprecated": "true"})
 
2249
1152
    @dbus_service_property(_interface, signature="o", access="read")
 
2250
1153
    def ObjectPath_dbus_property(self):
 
2251
 
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
 
1154
        return self.dbus_object_path # is already a dbus.ObjectPath
 
2253
1156
    # Secret = property
 
2255
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2257
 
    @dbus_service_property(_interface,
 
 
1157
    @dbus_service_property(_interface, signature="ay",
 
 
1158
                           access="write", byte_arrays=True)
 
2261
1159
    def Secret_dbus_property(self, value):
 
2262
 
        self.secret = bytes(value)
 
 
1160
        self.secret = str(value)
 
2268
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
 
1165
class ProxyClient(object):
 
 
1166
    def __init__(self, child_pipe, fpr, address):
 
2269
1167
        self._pipe = child_pipe
 
2270
 
        self._pipe.send(("init", key_id, fpr, address))
 
 
1168
        self._pipe.send(('init', fpr, address))
 
2271
1169
        if not self._pipe.recv():
 
2272
 
            raise KeyError(key_id or fpr)
 
2274
1172
    def __getattribute__(self, name):
 
 
1173
        if(name == '_pipe'):
 
2276
1174
            return super(ProxyClient, self).__getattribute__(name)
 
2277
 
        self._pipe.send(("getattr", name))
 
 
1175
        self._pipe.send(('getattr', name))
 
2278
1176
        data = self._pipe.recv()
 
2279
 
        if data[0] == "data":
 
 
1177
        if data[0] == 'data':
 
2281
 
        if data[0] == "function":
 
 
1179
        if data[0] == 'function':
 
2283
1180
            def func(*args, **kwargs):
 
2284
 
                self._pipe.send(("funcall", name, args, kwargs))
 
 
1181
                self._pipe.send(('funcall', name, args, kwargs))
 
2285
1182
                return self._pipe.recv()[1]
 
2289
1185
    def __setattr__(self, name, value):
 
 
1186
        if(name == '_pipe'):
 
2291
1187
            return super(ProxyClient, self).__setattr__(name, value)
 
2292
 
        self._pipe.send(("setattr", name, value))
 
 
1188
        self._pipe.send(('setattr', name, value))
 
2295
1191
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2296
1192
    """A class to handle client connections.
 
2298
1194
    Instantiated once for each connection to handle it.
 
2299
1195
    Note: This will run in its own forked process."""
 
2301
1197
    def handle(self):
 
2302
1198
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2303
 
            log.info("TCP connection from: %s",
 
2304
 
                     str(self.client_address))
 
2305
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
 
2307
 
            session = gnutls.ClientSession(self.request)
 
2309
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2310
 
            #                       "+AES-256-CBC", "+SHA1",
 
2311
 
            #                       "+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",
 
2313
1218
            # Use a fallback default, since this MUST be set.
 
2314
1219
            priority = self.server.gnutls_priority
 
2315
1220
            if priority is None:
 
2316
1221
                priority = "NORMAL"
 
2317
 
            gnutls.priority_set_direct(session,
 
2318
 
                                       priority.encode("utf-8"), None)
 
 
1222
            (gnutls.library.functions
 
 
1223
             .gnutls_priority_set_direct(session._c_object,
 
2320
1226
            # Start communication using the Mandos protocol
 
2321
1227
            # Get protocol number
 
2322
1228
            line = self.request.makefile().readline()
 
2323
 
            log.debug("Protocol version: %r", line)
 
 
1229
            logger.debug("Protocol version: %r", line)
 
2325
1231
                if int(line.strip().split()[0]) > 1:
 
2326
 
                    raise RuntimeError(line)
 
2327
1233
            except (ValueError, IndexError, RuntimeError) as error:
 
2328
 
                log.error("Unknown protocol version: %s", error)
 
 
1234
                logger.error("Unknown protocol version: %s", error)
 
2331
1237
            # Start GnuTLS connection
 
2333
1239
                session.handshake()
 
2334
 
            except gnutls.Error as error:
 
2335
 
                log.warning("Handshake failed: %s", error)
 
 
1240
            except gnutls.errors.GNUTLSError as error:
 
 
1241
                logger.warning("Handshake failed: %s", error)
 
2336
1242
                # Do not run session.bye() here: the session is not
 
2337
1243
                # established.  Just abandon the request.
 
2339
 
            log.debug("Handshake succeeded")
 
 
1245
            logger.debug("Handshake succeeded")
 
2341
1247
            approval_required = False
 
2343
 
                if gnutls.has_rawpk:
 
2346
 
                        key_id = self.key_id(
 
2347
 
                            self.peer_certificate(session))
 
2348
 
                    except (TypeError, gnutls.Error) as error:
 
2349
 
                        log.warning("Bad certificate: %s", error)
 
2351
 
                    log.debug("Key ID: %s",
 
2352
 
                              key_id.decode("utf-8",
 
2358
 
                        fpr = self.fingerprint(
 
2359
 
                            self.peer_certificate(session))
 
2360
 
                    except (TypeError, gnutls.Error) as error:
 
2361
 
                        log.warning("Bad certificate: %s", error)
 
2363
 
                    log.debug("Fingerprint: %s", fpr)
 
2366
 
                    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,
 
2367
1260
                                         self.client_address)
 
2368
1261
                except KeyError:
 
2371
1264
                if client.approval_delay:
 
2372
1265
                    delay = client.approval_delay
 
2373
1266
                    client.approvals_pending += 1
 
2374
1267
                    approval_required = True
 
2377
1270
                    if not client.enabled:
 
2378
 
                        log.info("Client %s is disabled", client.name)
 
 
1271
                        logger.info("Client %s is disabled",
 
2379
1273
                        if self.server.use_dbus:
 
2380
1274
                            # Emit D-Bus signal
 
2381
 
                            client.Rejected("Disabled")
 
 
1275
                            client.Rejected("Disabled")                    
 
2384
 
                    if client.approved or not client.approval_delay:
 
2385
 
                        # We are approved or approval is disabled
 
 
1278
                    if client._approved or not client.approval_delay:
 
 
1279
                        #We are approved or approval is disabled
 
2387
 
                    elif client.approved is None:
 
2388
 
                        log.info("Client %s needs approval",
 
 
1281
                    elif client._approved is None:
 
 
1282
                        logger.info("Client %s needs approval",
 
2390
1284
                        if self.server.use_dbus:
 
2391
1285
                            # Emit D-Bus signal
 
2392
1286
                            client.NeedApproval(
 
2393
 
                                client.approval_delay.total_seconds()
 
2394
 
                                * 1000, client.approved_by_default)
 
 
1287
                                client.approval_delay_milliseconds(),
 
 
1288
                                client.approved_by_default)
 
2396
 
                        log.warning("Client %s was not approved",
 
 
1290
                        logger.warning("Client %s was not approved",
 
2398
1292
                        if self.server.use_dbus:
 
2399
1293
                            # Emit D-Bus signal
 
2400
1294
                            client.Rejected("Denied")
 
2403
 
                    # wait until timeout or approved
 
 
1297
                    #wait until timeout or approved
 
 
1298
                    #x = float(client._timedelta_to_milliseconds(delay))
 
2404
1299
                    time = datetime.datetime.now()
 
2405
1300
                    client.changedstate.acquire()
 
2406
 
                    client.changedstate.wait(delay.total_seconds())
 
 
1301
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
2407
1302
                    client.changedstate.release()
 
2408
1303
                    time2 = datetime.datetime.now()
 
2409
1304
                    if (time2 - time) >= delay:
 
2410
1305
                        if not client.approved_by_default:
 
2411
 
                            log.warning("Client %s timed out while"
 
2412
 
                                        " waiting for approval",
 
 
1306
                            logger.warning("Client %s timed out while"
 
 
1307
                                           " waiting for approval",
 
2414
1309
                            if self.server.use_dbus:
 
2415
1310
                                # Emit D-Bus signal
 
2416
1311
                                client.Rejected("Approval timed out")
 
 
2421
1316
                        delay -= time2 - time
 
2424
 
                    session.send(client.secret)
 
2425
 
                except gnutls.Error as error:
 
2426
 
                    log.warning("gnutls send failed", exc_info=error)
 
2429
 
                log.info("Sending secret to %s", client.name)
 
2430
 
                # bump the timeout using extended_timeout
 
2431
 
                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
 
2432
1333
                if self.server.use_dbus:
 
2433
1334
                    # Emit D-Bus signal
 
2434
1335
                    client.GotSecret()
 
2437
1338
                if approval_required:
 
2438
1339
                    client.approvals_pending -= 1
 
2441
 
                except gnutls.Error as error:
 
2442
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
 
1342
                except gnutls.errors.GNUTLSError as error:
 
 
1343
                    logger.warning("GnuTLS bye failed")
 
2445
1346
    def peer_certificate(session):
 
2446
 
        "Return the peer's certificate as a bytestring"
 
2448
 
            cert_type = gnutls.certificate_type_get2(
 
2449
 
                session, gnutls.CTYPE_PEERS)
 
2450
 
        except AttributeError:
 
2451
 
            cert_type = gnutls.certificate_type_get(session)
 
2452
 
        if gnutls.has_rawpk:
 
2453
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2455
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2456
 
        # If not a valid certificate type...
 
2457
 
        if cert_type not in valid_cert_types:
 
2458
 
            log.info("Cert type %r not in %r", cert_type,
 
2460
 
            # ...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
 
2462
1354
        list_size = ctypes.c_uint(1)
 
2463
 
        cert_list = (gnutls.certificate_get_peers
 
2464
 
                     (session, ctypes.byref(list_size)))
 
 
1355
        cert_list = (gnutls.library.functions
 
 
1356
                     .gnutls_certificate_get_peers
 
 
1357
                     (session._c_object, ctypes.byref(list_size)))
 
2465
1358
        if not bool(cert_list) and list_size.value != 0:
 
2466
 
            raise gnutls.Error("error getting peer certificate")
 
 
1359
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2467
1361
        if list_size.value == 0:
 
2469
1363
        cert = cert_list[0]
 
2470
1364
        return ctypes.string_at(cert.data, cert.size)
 
2473
 
    def key_id(certificate):
 
2474
 
        "Convert a certificate bytestring to a hexdigit key ID"
 
2475
 
        # New GnuTLS "datum" with the public key
 
2476
 
        datum = gnutls.datum_t(
 
2477
 
            ctypes.cast(ctypes.c_char_p(certificate),
 
2478
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2479
 
            ctypes.c_uint(len(certificate)))
 
2480
 
        # XXX all these need to be created in the gnutls "module"
 
2481
 
        # New empty GnuTLS certificate
 
2482
 
        pubkey = gnutls.pubkey_t()
 
2483
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2484
 
        # Import the raw public key into the certificate
 
2485
 
        gnutls.pubkey_import(pubkey,
 
2486
 
                             ctypes.byref(datum),
 
2487
 
                             gnutls.X509_FMT_DER)
 
2488
 
        # New buffer for the key ID
 
2489
 
        buf = ctypes.create_string_buffer(32)
 
2490
 
        buf_len = ctypes.c_size_t(len(buf))
 
2491
 
        # Get the key ID from the raw public key into the buffer
 
2492
 
        gnutls.pubkey_get_key_id(
 
2494
 
            gnutls.KEYID_USE_SHA256,
 
2495
 
            ctypes.cast(ctypes.byref(buf),
 
2496
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2497
 
            ctypes.byref(buf_len))
 
2498
 
        # Deinit the certificate
 
2499
 
        gnutls.pubkey_deinit(pubkey)
 
2501
 
        # Convert the buffer to a Python bytestring
 
2502
 
        key_id = ctypes.string_at(buf, buf_len.value)
 
2503
 
        # Convert the bytestring to hexadecimal notation
 
2504
 
        hex_key_id = binascii.hexlify(key_id).upper()
 
2508
1367
    def fingerprint(openpgp):
 
2509
1368
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2510
1369
        # New GnuTLS "datum" with the OpenPGP public key
 
2511
 
        datum = gnutls.datum_t(
 
2512
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2513
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2514
 
            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))))
 
2515
1375
        # New empty GnuTLS certificate
 
2516
 
        crt = gnutls.openpgp_crt_t()
 
2517
 
        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)))
 
2518
1379
        # Import the OpenPGP public key into the certificate
 
2519
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2520
 
                                  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))
 
2521
1384
        # Verify the self signature in the key
 
2522
1385
        crtverify = ctypes.c_uint()
 
2523
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2524
 
                                       ctypes.byref(crtverify))
 
 
1386
        (gnutls.library.functions
 
 
1387
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1388
                                         ctypes.byref(crtverify)))
 
2525
1389
        if crtverify.value != 0:
 
2526
 
            gnutls.openpgp_crt_deinit(crt)
 
2527
 
            raise gnutls.CertificateSecurityError(code
 
 
1390
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1391
            raise (gnutls.errors.CertificateSecurityError
 
2529
1393
        # New buffer for the fingerprint
 
2530
1394
        buf = ctypes.create_string_buffer(20)
 
2531
1395
        buf_len = ctypes.c_size_t()
 
2532
1396
        # Get the fingerprint from the certificate into the buffer
 
2533
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2534
 
                                           ctypes.byref(buf_len))
 
 
1397
        (gnutls.library.functions
 
 
1398
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1399
                                             ctypes.byref(buf_len)))
 
2535
1400
        # Deinit the certificate
 
2536
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1401
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2537
1402
        # Convert the buffer to a Python bytestring
 
2538
1403
        fpr = ctypes.string_at(buf, buf_len.value)
 
2539
1404
        # Convert the bytestring to hexadecimal notation
 
2540
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
2544
 
class MultiprocessingMixIn:
 
 
1409
class MultiprocessingMixIn(object):
 
2545
1410
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2547
1411
    def sub_process_main(self, request, address):
 
2549
1413
            self.finish_request(request, address)
 
2551
1415
            self.handle_error(request, address)
 
2552
1416
        self.close_request(request)
 
2554
1418
    def process_request(self, request, address):
 
2555
1419
        """Start a new process to process the request."""
 
2556
 
        proc = multiprocessing.Process(target=self.sub_process_main,
 
2557
 
                                       args=(request, address))
 
2562
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
 
1420
        multiprocessing.Process(target = self.sub_process_main,
 
 
1421
                                args = (request, address)).start()
 
 
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
2563
1424
    """ adds a pipe to the MixIn """
 
2565
1425
    def process_request(self, request, client_address):
 
2566
1426
        """Overrides and wraps the original process_request().
 
2568
1428
        This function creates a new pipe in self.pipe
 
2570
1430
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
2572
 
        proc = MultiprocessingMixIn.process_request(self, request,
 
 
1432
        super(MultiprocessingMixInWithPipe,
 
 
1433
              self).process_request(request, client_address)
 
2574
1434
        self.child_pipe.close()
 
2575
 
        self.add_pipe(parent_pipe, proc)
 
 
1435
        self.add_pipe(parent_pipe)
 
2577
 
    def add_pipe(self, parent_pipe, proc):
 
 
1437
    def add_pipe(self, parent_pipe):
 
2578
1438
        """Dummy function; override as necessary"""
 
2579
 
        raise NotImplementedError()
 
 
1439
        raise NotImplementedError
 
2582
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
2583
 
                     socketserver.TCPServer):
 
2584
 
    """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
 
2587
1446
        enabled:        Boolean; whether this server is activated yet
 
2588
1447
        interface:      None or a network interface name (string)
 
2589
1448
        use_ipv6:       Boolean; to use IPv6 or not
 
2592
1450
    def __init__(self, server_address, RequestHandlerClass,
 
2596
 
        """If socketfd is set, use that file descriptor instead of
 
2597
 
        creating a new one with socket.socket().
 
 
1451
                 interface=None, use_ipv6=True):
 
2599
1452
        self.interface = interface
 
2601
1454
            self.address_family = socket.AF_INET6
 
2602
 
        if socketfd is not None:
 
2603
 
            # Save the file descriptor
 
2604
 
            self.socketfd = socketfd
 
2605
 
            # Save the original socket.socket() function
 
2606
 
            self.socket_socket = socket.socket
 
2608
 
            # To implement --socket, we monkey patch socket.socket.
 
2610
 
            # (When socketserver.TCPServer is a new-style class, we
 
2611
 
            # could make self.socket into a property instead of monkey
 
2612
 
            # patching socket.socket.)
 
2614
 
            # Create a one-time-only replacement for socket.socket()
 
2615
 
            @functools.wraps(socket.socket)
 
2616
 
            def socket_wrapper(*args, **kwargs):
 
2617
 
                # Restore original function so subsequent calls are
 
2619
 
                socket.socket = self.socket_socket
 
2620
 
                del self.socket_socket
 
2621
 
                # This time only, return a new socket object from the
 
2622
 
                # saved file descriptor.
 
2623
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2624
 
            # Replace socket.socket() function with wrapper
 
2625
 
            socket.socket = socket_wrapper
 
2626
 
        # The socketserver.TCPServer.__init__ will call
 
2627
 
        # socket.socket(), which might be our replacement,
 
2628
 
        # socket_wrapper(), if socketfd was set.
 
2629
1455
        socketserver.TCPServer.__init__(self, server_address,
 
2630
1456
                                        RequestHandlerClass)
 
2632
1457
    def server_bind(self):
 
2633
1458
        """This overrides the normal server_bind() function
 
2634
1459
        to bind to an interface if one was specified, and also NOT to
 
2635
1460
        bind to an address or port if they were not specified."""
 
2636
 
        global SO_BINDTODEVICE
 
2637
1461
        if self.interface is not None:
 
2638
1462
            if SO_BINDTODEVICE is None:
 
2639
 
                # Fall back to a hard-coded value which seems to be
 
2641
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2642
 
                SO_BINDTODEVICE = 25
 
2644
 
                self.socket.setsockopt(
 
2645
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2646
 
                    (self.interface + "\0").encode("utf-8"))
 
2647
 
            except socket.error as error:
 
2648
 
                if error.errno == errno.EPERM:
 
2649
 
                    log.error("No permission to bind to interface %s",
 
2651
 
                elif error.errno == errno.ENOPROTOOPT:
 
2652
 
                    log.error("SO_BINDTODEVICE not available; cannot"
 
2653
 
                              " bind to interface %s", self.interface)
 
2654
 
                elif error.errno == errno.ENODEV:
 
2655
 
                    log.error("Interface %s does not exist, cannot"
 
2656
 
                              " 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",
 
2659
1483
        # Only bind(2) the socket if we really need to.
 
2660
1484
        if self.server_address[0] or self.server_address[1]:
 
2661
 
            if self.server_address[1]:
 
2662
 
                self.allow_reuse_address = True
 
2663
1485
            if not self.server_address[0]:
 
2664
1486
                if self.address_family == socket.AF_INET6:
 
2665
 
                    any_address = "::"  # in6addr_any
 
 
1487
                    any_address = "::" # in6addr_any
 
2667
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
1489
                    any_address = socket.INADDR_ANY
 
2668
1490
                self.server_address = (any_address,
 
2669
1491
                                       self.server_address[1])
 
2670
1492
            elif not self.server_address[1]:
 
2671
 
                self.server_address = (self.server_address[0], 0)
 
 
1493
                self.server_address = (self.server_address[0],
 
2672
1495
#                 if self.interface:
 
2673
1496
#                     self.server_address = (self.server_address[0],
 
 
3004
1728
    parser.add_argument("--no-dbus", action="store_false",
 
3005
1729
                        dest="use_dbus", help="Do not provide D-Bus"
 
3006
 
                        " system bus interface", default=None)
 
 
1730
                        " system bus interface")
 
3007
1731
    parser.add_argument("--no-ipv6", action="store_false",
 
3008
 
                        dest="use_ipv6", help="Do not use IPv6",
 
3010
 
    parser.add_argument("--no-restore", action="store_false",
 
3011
 
                        dest="restore", help="Do not restore stored"
 
3012
 
                        " state", default=None)
 
3013
 
    parser.add_argument("--socket", type=int,
 
3014
 
                        help="Specify a file descriptor to a network"
 
3015
 
                        " socket to use instead of creating one")
 
3016
 
    parser.add_argument("--statedir", metavar="DIR",
 
3017
 
                        help="Directory to save/restore state in")
 
3018
 
    parser.add_argument("--foreground", action="store_true",
 
3019
 
                        help="Run in foreground", default=None)
 
3020
 
    parser.add_argument("--no-zeroconf", action="store_false",
 
3021
 
                        dest="zeroconf", help="Do not use Zeroconf",
 
 
1732
                        dest="use_ipv6", help="Do not use IPv6")
 
3024
1733
    options = parser.parse_args()
 
3026
1740
    # Default values for config file for server-global settings
 
3027
 
    if gnutls.has_rawpk:
 
3028
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
3029
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
3031
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
3032
 
                    ":+SIGN-DSA-SHA256")
 
3033
 
    server_defaults = {"interface": "",
 
3037
 
                       "priority": priority,
 
3038
 
                       "servicename": "Mandos",
 
3044
 
                       "statedir": "/var/lib/mandos",
 
3045
 
                       "foreground": "False",
 
 
1741
    server_defaults = { "interface": "",
 
 
1746
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1747
                        "servicename": "Mandos",
 
3050
1753
    # Parse config file for server-global settings
 
3051
 
    server_config = configparser.ConfigParser(server_defaults)
 
 
1754
    server_config = configparser.SafeConfigParser(server_defaults)
 
3052
1755
    del server_defaults
 
3053
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
3054
 
    # Convert the ConfigParser object to a dict
 
 
1756
    server_config.read(os.path.join(options.configdir,
 
 
1758
    # Convert the SafeConfigParser object to a dict
 
3055
1759
    server_settings = server_config.defaults()
 
3056
1760
    # Use the appropriate methods on the non-string config options
 
3057
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3058
 
                   "foreground", "zeroconf"):
 
 
1761
    for option in ("debug", "use_dbus", "use_ipv6"):
 
3059
1762
        server_settings[option] = server_config.getboolean("DEFAULT",
 
3061
1764
    if server_settings["port"]:
 
3062
1765
        server_settings["port"] = server_config.getint("DEFAULT",
 
3064
 
    if server_settings["socket"]:
 
3065
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
3067
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
3068
 
        # over with an opened os.devnull.  But we don't want this to
 
3069
 
        # happen with a supplied network socket.
 
3070
 
        if 0 <= server_settings["socket"] <= 2:
 
3071
 
            server_settings["socket"] = os.dup(server_settings
 
3073
1767
    del server_config
 
3075
1769
    # Override the settings from the config file with command line
 
3076
1770
    # options, if set.
 
3077
1771
    for option in ("interface", "address", "port", "debug",
 
3078
 
                   "priority", "servicename", "configdir", "use_dbus",
 
3079
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
3080
 
                   "socket", "foreground", "zeroconf"):
 
 
1772
                   "priority", "servicename", "configdir",
 
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
 
3081
1774
        value = getattr(options, option)
 
3082
1775
        if value is not None:
 
3083
1776
            server_settings[option] = value
 
3085
1778
    # Force all strings to be unicode
 
3086
1779
    for option in server_settings.keys():
 
3087
 
        if isinstance(server_settings[option], bytes):
 
3088
 
            server_settings[option] = (server_settings[option]
 
3090
 
    # Force all boolean options to be boolean
 
3091
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
3092
 
                   "foreground", "zeroconf"):
 
3093
 
        server_settings[option] = bool(server_settings[option])
 
3094
 
    # Debug implies foreground
 
3095
 
    if server_settings["debug"]:
 
3096
 
        server_settings["foreground"] = True
 
 
1780
        if type(server_settings[option]) is str:
 
 
1781
            server_settings[option] = unicode(server_settings[option])
 
3097
1782
    # Now we have our good server settings in "server_settings"
 
3099
1784
    ##################################################################
 
3101
 
    if (not server_settings["zeroconf"]
 
3102
 
        and not (server_settings["port"]
 
3103
 
                 or server_settings["socket"] != "")):
 
3104
 
        parser.error("Needs port or socket to work without Zeroconf")
 
3106
1786
    # For convenience
 
3107
1787
    debug = server_settings["debug"]
 
3108
1788
    debuglevel = server_settings["debuglevel"]
 
3109
1789
    use_dbus = server_settings["use_dbus"]
 
3110
1790
    use_ipv6 = server_settings["use_ipv6"]
 
3111
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
3113
 
    foreground = server_settings["foreground"]
 
3114
 
    zeroconf = server_settings["zeroconf"]
 
3117
 
        initlogger(debug, logging.DEBUG)
 
3122
 
            level = getattr(logging, debuglevel.upper())
 
3123
 
            initlogger(debug, level)
 
3125
1792
    if server_settings["servicename"] != "Mandos":
 
3126
 
        syslogger.setFormatter(
 
3127
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
 
3128
 
                              " %(levelname)s: %(message)s".format(
 
3129
 
                                  server_settings["servicename"])))
 
 
1793
        syslogger.setFormatter(logging.Formatter
 
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
 
1795
                                ' %%(levelname)s: %%(message)s'
 
 
1796
                                % server_settings["servicename"]))
 
3131
1798
    # Parse config file with clients
 
3132
 
    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)
 
3133
1807
    client_config.read(os.path.join(server_settings["configdir"],
 
3134
1808
                                    "clients.conf"))
 
3136
1810
    global mandos_dbus_service
 
3137
1811
    mandos_dbus_service = None
 
3140
 
    if server_settings["socket"] != "":
 
3141
 
        socketfd = server_settings["socket"]
 
3142
 
    tcp_server = MandosServer(
 
3143
 
        (server_settings["address"], server_settings["port"]),
 
3145
 
        interface=(server_settings["interface"] or None),
 
3147
 
        gnutls_priority=server_settings["priority"],
 
3151
 
        pidfilename = "/run/mandos.pid"
 
3152
 
        if not os.path.isdir("/run/."):
 
3153
 
            pidfilename = "/var/run/mandos.pid"
 
3156
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
3157
 
        except IOError as e:
 
3158
 
            log.error("Could not open file %r", pidfilename,
 
3161
 
    for name, group in (("_mandos", "_mandos"),
 
3162
 
                        ("mandos", "mandos"),
 
3163
 
                        ("nobody", "nogroup")):
 
3165
 
            uid = pwd.getpwnam(name).pw_uid
 
3166
 
            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
 
3168
1836
        except KeyError:
 
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
 
3176
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3177
1846
    except OSError as error:
 
3178
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
 
3179
 
                    os.strerror(error.errno))
 
3180
 
        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)
 
3184
1859
        # Enable all possible GnuTLS debugging
 
3186
1861
        # "Use a log level over 10 to enable all debugging options."
 
3187
1862
        # - GnuTLS manual
 
3188
 
        gnutls.global_set_log_level(11)
 
 
1863
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
1865
        @gnutls.library.types.gnutls_log_func
 
3191
1866
        def debug_gnutls(level, string):
 
3192
 
            log.debug("GnuTLS: %s",
 
3193
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3195
 
        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))
 
3197
1872
        # Redirect stdin so all checkers get /dev/null
 
3198
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1873
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
3199
1874
        os.dup2(null, sys.stdin.fileno())
 
 
1878
        # No console logging
 
 
1879
        logger.removeHandler(console)
 
3203
1881
    # Need to fork before connecting to D-Bus
 
3205
1883
        # Close all input and output, do double fork, etc.
 
3208
 
    if gi.version_info < (3, 10, 2):
 
3209
 
        # multiprocessing will use threads, so before we use GLib we
 
3210
 
        # need to inform GLib that threads will be used.
 
3213
1886
    global main_loop
 
3214
1887
    # From the Avahi example code
 
3215
 
    DBusGMainLoop(set_as_default=True)
 
3216
 
    main_loop = GLib.MainLoop()
 
 
1888
    DBusGMainLoop(set_as_default=True )
 
 
1889
    main_loop = gobject.MainLoop()
 
3217
1890
    bus = dbus.SystemBus()
 
3218
1891
    # End of Avahi example code
 
3221
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3224
 
            old_bus_name = dbus.service.BusName(
 
3225
 
                "se.bsnet.fukt.Mandos", bus,
 
3227
 
        except dbus.exceptions.DBusException as e:
 
3228
 
            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")
 
3229
1898
            use_dbus = False
 
3230
1899
            server_settings["use_dbus"] = False
 
3231
1900
            tcp_server.use_dbus = False
 
3233
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3234
 
        service = AvahiServiceToSyslog(
 
3235
 
            name=server_settings["servicename"],
 
3236
 
            servicetype="_mandos._tcp",
 
3239
 
        if server_settings["interface"]:
 
3240
 
            service.interface = if_nametoindex(
 
3241
 
                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"])))
 
3243
1909
    global multiprocessing_manager
 
3244
1910
    multiprocessing_manager = multiprocessing.Manager()
 
3246
1912
    client_class = Client
 
3248
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
3250
 
    client_settings = Client.config_parser(client_config)
 
3251
 
    old_client_settings = {}
 
3254
 
    # This is used to redirect stdout and stderr for checker processes
 
3256
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
3257
 
    # Only used if server is running in foreground but not in debug
 
3259
 
    if debug or not foreground:
 
3262
 
    # Get client data and settings from last running state.
 
3263
 
    if server_settings["restore"]:
 
3265
 
            with open(stored_state_path, "rb") as stored_state:
 
3266
 
                if sys.version_info.major == 2:
 
3267
 
                    clients_data, old_client_settings = pickle.load(
 
3270
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3271
 
                        pickle.load(stored_state, encoding="bytes"))
 
3272
 
                    #   Fix bytes to strings
 
3275
 
                    clients_data = {(key.decode("utf-8")
 
3276
 
                                     if isinstance(key, bytes)
 
3279
 
                                    bytes_clients_data.items()}
 
3280
 
                    del bytes_clients_data
 
3281
 
                    for key in clients_data:
 
3282
 
                        value = {(k.decode("utf-8")
 
3283
 
                                  if isinstance(k, bytes) else k): v
 
3285
 
                                 clients_data[key].items()}
 
3286
 
                        clients_data[key] = value
 
3288
 
                        value["client_structure"] = [
 
3290
 
                             if isinstance(s, bytes)
 
3292
 
                            value["client_structure"]]
 
3293
 
                        # .name, .host, and .checker_command
 
3294
 
                        for k in ("name", "host", "checker_command"):
 
3295
 
                            if isinstance(value[k], bytes):
 
3296
 
                                value[k] = value[k].decode("utf-8")
 
3297
 
                        if "key_id" not in value:
 
3298
 
                            value["key_id"] = ""
 
3299
 
                        elif "fingerprint" not in value:
 
3300
 
                            value["fingerprint"] = ""
 
3301
 
                    #  old_client_settings
 
3303
 
                    old_client_settings = {
 
3304
 
                        (key.decode("utf-8")
 
3305
 
                         if isinstance(key, bytes)
 
3308
 
                        bytes_old_client_settings.items()}
 
3309
 
                    del bytes_old_client_settings
 
3310
 
                    # .host and .checker_command
 
3311
 
                    for value in old_client_settings.values():
 
3312
 
                        for attribute in ("host", "checker_command"):
 
3313
 
                            if isinstance(value[attribute], bytes):
 
3314
 
                                value[attribute] = (value[attribute]
 
3316
 
            os.remove(stored_state_path)
 
3317
 
        except IOError as e:
 
3318
 
            if e.errno == errno.ENOENT:
 
3319
 
                log.warning("Could not load persistent state:"
 
3320
 
                            " %s", os.strerror(e.errno))
 
3322
 
                log.critical("Could not load persistent state:",
 
3325
 
        except EOFError as e:
 
3326
 
            log.warning("Could not load persistent state: EOFError:",
 
3329
 
    with PGPEngine() as pgp:
 
3330
 
        for client_name, client in clients_data.items():
 
3331
 
            # Skip removed clients
 
3332
 
            if client_name not in client_settings:
 
3335
 
            # Decide which value to use after restoring saved state.
 
3336
 
            # We have three different values: Old config file,
 
3337
 
            # new config file, and saved state.
 
3338
 
            # New config value takes precedence if it differs from old
 
3339
 
            # config value, otherwise use saved state.
 
3340
 
            for name, value in client_settings[client_name].items():
 
3342
 
                    # For each value in new config, check if it
 
3343
 
                    # differs from the old config value (Except for
 
3344
 
                    # the "secret" attribute)
 
3345
 
                    if (name != "secret"
 
3347
 
                             old_client_settings[client_name][name])):
 
3348
 
                        client[name] = value
 
3352
 
            # Clients who has passed its expire date can still be
 
3353
 
            # enabled if its last checker was successful.  A Client
 
3354
 
            # whose checker succeeded before we stored its state is
 
3355
 
            # assumed to have successfully run all checkers during
 
3357
 
            if client["enabled"]:
 
3358
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
3359
 
                    if not client["last_checked_ok"]:
 
3360
 
                        log.warning("disabling client %s - Client"
 
3361
 
                                    " never performed a successful"
 
3362
 
                                    " checker", client_name)
 
3363
 
                        client["enabled"] = False
 
3364
 
                    elif client["last_checker_status"] != 0:
 
3365
 
                        log.warning("disabling client %s - Client"
 
3366
 
                                    " last checker failed with error"
 
3367
 
                                    " code %s", client_name,
 
3368
 
                                    client["last_checker_status"])
 
3369
 
                        client["enabled"] = False
 
3371
 
                        client["expires"] = (
 
3372
 
                            datetime.datetime.utcnow()
 
3373
 
                            + client["timeout"])
 
3374
 
                        log.debug("Last checker succeeded, keeping %s"
 
3375
 
                                  " 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):
 
3377
 
                client["secret"] = pgp.decrypt(
 
3378
 
                    client["encrypted_secret"],
 
3379
 
                    client_settings[client_name]["secret"])
 
3381
 
                # If decryption fails, we use secret from new settings
 
3382
 
                log.debug("Failed to decrypt %s old secret",
 
3384
 
                client["secret"] = (client_settings[client_name]
 
3387
 
    # Add/remove clients based on new changes made to config
 
3388
 
    for client_name in (set(old_client_settings)
 
3389
 
                        - set(client_settings)):
 
3390
 
        del clients_data[client_name]
 
3391
 
    for client_name in (set(client_settings)
 
3392
 
                        - set(old_client_settings)):
 
3393
 
        clients_data[client_name] = client_settings[client_name]
 
3395
 
    # Create all client objects
 
3396
 
    for client_name, client in clients_data.items():
 
3397
 
        tcp_server.clients[client_name] = client_class(
 
3400
 
            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()))
 
3402
1932
    if not tcp_server.clients:
 
3403
 
        log.warning("No clients defined")
 
3406
 
        if pidfile is not None:
 
3410
 
                    print(pid, file=pidfile)
 
3412
 
                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
 
3415
1947
        del pidfilename
 
3417
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3418
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3419
 
                             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())
 
3423
 
        @alternate_dbus_interfaces(
 
3424
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3425
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
1955
        class MandosDBusService(dbus.service.Object):
 
3426
1956
            """A D-Bus proxy object"""
 
3428
1957
            def __init__(self):
 
3429
1958
                dbus.service.Object.__init__(self, bus, "/")
 
3431
 
            _interface = "se.recompile.Mandos"
 
 
1959
            _interface = "se.bsnet.fukt.Mandos"
 
3433
1961
            @dbus.service.signal(_interface, signature="o")
 
3434
1962
            def ClientAdded(self, objpath):
 
3438
1966
            @dbus.service.signal(_interface, signature="ss")
 
3439
 
            def ClientNotFound(self, key_id, address):
 
 
1967
            def ClientNotFound(self, fingerprint, address):
 
3443
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3445
1971
            @dbus.service.signal(_interface, signature="os")
 
3446
1972
            def ClientRemoved(self, objpath, name):
 
3450
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3452
1976
            @dbus.service.method(_interface, out_signature="ao")
 
3453
1977
            def GetAllClients(self):
 
3455
 
                return dbus.Array(c.dbus_object_path for c in
 
3456
 
                                  tcp_server.clients.values())
 
3458
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
1979
                return dbus.Array(c.dbus_object_path
 
 
1980
                                  for c in tcp_server.clients)
 
3460
1982
            @dbus.service.method(_interface,
 
3461
1983
                                 out_signature="a{oa{sv}}")
 
3462
1984
            def GetAllClientsWithProperties(self):
 
3464
1986
                return dbus.Dictionary(
 
3465
 
                    {c.dbus_object_path: c.GetAll(
 
3466
 
                        "se.recompile.Mandos.Client")
 
3467
 
                     for c in tcp_server.clients.values()},
 
 
1987
                    ((c.dbus_object_path, c.GetAll(""))
 
 
1988
                     for c in tcp_server.clients),
 
3468
1989
                    signature="oa{sv}")
 
3470
1991
            @dbus.service.method(_interface, in_signature="o")
 
3471
1992
            def RemoveClient(self, object_path):
 
3473
 
                for c in tcp_server.clients.values():
 
 
1994
                for c in tcp_server.clients:
 
3474
1995
                    if c.dbus_object_path == object_path:
 
3475
 
                        del tcp_server.clients[c.name]
 
 
1996
                        tcp_server.clients.remove(c)
 
3476
1997
                        c.remove_from_connection()
 
3477
 
                        # Don't signal the disabling
 
 
1998
                        # Don't signal anything except ClientRemoved
 
3478
1999
                        c.disable(quiet=True)
 
3479
 
                        # Emit D-Bus signal for removal
 
3480
 
                        self.client_removed_signal(c)
 
 
2001
                        self.ClientRemoved(object_path, c.name)
 
3482
2003
                raise KeyError(object_path)
 
3486
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3487
 
                                 out_signature="a{oa{sa{sv}}}")
 
3488
 
            def GetManagedObjects(self):
 
3490
 
                return dbus.Dictionary(
 
3491
 
                    {client.dbus_object_path:
 
3493
 
                         {interface: client.GetAll(interface)
 
3495
 
                          client._get_all_interface_names()})
 
3496
 
                     for client in tcp_server.clients.values()})
 
3498
 
            def client_added_signal(self, client):
 
3499
 
                """Send the new standard signal and the old signal"""
 
3501
 
                    # New standard signal
 
3502
 
                    self.InterfacesAdded(
 
3503
 
                        client.dbus_object_path,
 
3505
 
                            {interface: client.GetAll(interface)
 
3507
 
                             client._get_all_interface_names()}))
 
3509
 
                    self.ClientAdded(client.dbus_object_path)
 
3511
 
            def client_removed_signal(self, client):
 
3512
 
                """Send the new standard signal and the old signal"""
 
3514
 
                    # New standard signal
 
3515
 
                    self.InterfacesRemoved(
 
3516
 
                        client.dbus_object_path,
 
3517
 
                        client._get_all_interface_names())
 
3519
 
                    self.ClientRemoved(client.dbus_object_path,
 
3522
2007
        mandos_dbus_service = MandosDBusService()
 
3524
 
    # Save modules to variables to exempt the modules from being
 
3525
 
    # unloaded before the function registered with atexit() is run.
 
3526
 
    mp = multiprocessing
 
3530
2010
        "Cleanup function; run on exit"
 
3534
 
        mp.active_children()
 
3536
 
        if not (tcp_server.clients or client_settings):
 
3539
 
        # Store client before exiting. Secrets are encrypted with key
 
3540
 
        # based on what config file has. If config file is
 
3541
 
        # removed/edited, old secret will thus be unrecovable.
 
3543
 
        with PGPEngine() as pgp:
 
3544
 
            for client in tcp_server.clients.values():
 
3545
 
                key = client_settings[client.name]["secret"]
 
3546
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3550
 
                # A list of attributes that can not be pickled
 
3552
 
                exclude = {"bus", "changedstate", "secret",
 
3553
 
                           "checker", "server_settings"}
 
3554
 
                for name, typ in inspect.getmembers(dbus.service
 
3558
 
                client_dict["encrypted_secret"] = (client
 
3560
 
                for attr in client.client_structure:
 
3561
 
                    if attr not in exclude:
 
3562
 
                        client_dict[attr] = getattr(client, attr)
 
3564
 
                clients[client.name] = client_dict
 
3565
 
                del client_settings[client.name]["secret"]
 
3568
 
            with tempfile.NamedTemporaryFile(
 
3572
 
                    dir=os.path.dirname(stored_state_path),
 
3573
 
                    delete=False) as stored_state:
 
3574
 
                pickle.dump((clients, client_settings), stored_state,
 
3576
 
                tempname = stored_state.name
 
3577
 
            os.rename(tempname, stored_state_path)
 
3578
 
        except (IOError, OSError) as e:
 
3584
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3585
 
                log.warning("Could not save persistent state: %s",
 
3586
 
                            os.strerror(e.errno))
 
3588
 
                log.warning("Could not save persistent state:",
 
3592
 
        # Delete all clients, and settings from config
 
3593
2013
        while tcp_server.clients:
 
3594
 
            name, client = tcp_server.clients.popitem()
 
 
2014
            client = tcp_server.clients.pop()
 
3596
2016
                client.remove_from_connection()
 
3597
 
            # Don't signal the disabling
 
 
2017
            client.disable_hook = None
 
 
2018
            # Don't signal anything except ClientRemoved
 
3598
2019
            client.disable(quiet=True)
 
3599
 
            # Emit D-Bus signal for removal
 
3601
 
                mandos_dbus_service.client_removed_signal(client)
 
3602
 
        client_settings.clear()
 
 
2022
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
3604
2025
    atexit.register(cleanup)
 
3606
 
    for client in tcp_server.clients.values():
 
 
2027
    for client in tcp_server.clients:
 
3608
 
            # Emit D-Bus signal for adding
 
3609
 
            mandos_dbus_service.client_added_signal(client)
 
3610
 
        # Need to initiate checking of clients
 
3612
 
            client.init_checker()
 
 
2030
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3614
2033
    tcp_server.enable()
 
3615
2034
    tcp_server.server_activate()
 
3617
2036
    # Find out what port we got
 
3619
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2037
    service.port = tcp_server.socket.getsockname()[1]
 
3621
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
3622
 
                 " 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())
 
3624
 
        log.info("Now listening on address %r, port %d",
 
3625
 
                 *tcp_server.socket.getsockname())
 
3627
 
    # 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]
 
3631
 
            # From the Avahi example code
 
3634
 
            except dbus.exceptions.DBusException as error:
 
3635
 
                log.critical("D-Bus Exception", exc_info=error)
 
3638
 
            # End of Avahi example code
 
3641
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3642
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3643
 
            lambda *args, **kwargs: (tcp_server.handle_request
 
3644
 
                                     (*args[2:], **kwargs) or True))
 
3646
 
        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")
 
3647
2064
        main_loop.run()
 
3648
2065
    except AvahiError as error:
 
3649
 
        log.critical("Avahi Error", exc_info=error)
 
 
2066
        logger.critical("AvahiError: %s", error)
 
3652
2069
    except KeyboardInterrupt:
 
3654
2071
            print("", file=sys.stderr)
 
3655
 
        log.debug("Server received KeyboardInterrupt")
 
3656
 
    log.debug("Server exiting")
 
 
2072
        logger.debug("Server received KeyboardInterrupt")
 
 
2073
    logger.debug("Server exiting")
 
3657
2074
    # Must run before the D-Bus bus name gets deregistered
 
3661
 
def parse_test_args():
 
3662
 
    # type: () -> argparse.Namespace
 
3663
 
    parser = argparse.ArgumentParser(add_help=False)
 
3664
 
    parser.add_argument("--check", action="store_true")
 
3665
 
    parser.add_argument("--prefix", )
 
3666
 
    args, unknown_args = parser.parse_known_args()
 
3668
 
        # Remove test options from sys.argv
 
3669
 
        sys.argv[1:] = unknown_args
 
3672
 
# Add all tests from doctest strings
 
3673
 
def load_tests(loader, tests, none):
 
3675
 
    tests.addTests(doctest.DocTestSuite())
 
3678
 
if __name__ == "__main__":
 
3679
 
    options = parse_test_args()
 
3682
 
            extra_test_prefix = options.prefix
 
3683
 
            if extra_test_prefix is not None:
 
3684
 
                if not (unittest.main(argv=[""], exit=False)
 
3685
 
                        .result.wasSuccessful()):
 
3687
 
                class ExtraTestLoader(unittest.TestLoader):
 
3688
 
                    testMethodPrefix = extra_test_prefix
 
3689
 
                # Call using ./scriptname --test [--verbose]
 
3690
 
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
 
3692
 
                unittest.main(argv=[""])
 
3700
 
# (lambda (&optional extra)
 
3701
 
#   (if (not (funcall run-tests-in-test-buffer default-directory
 
3703
 
#       (funcall show-test-buffer-in-test-window)
 
3704
 
#     (funcall remove-test-window)
 
3705
 
#     (if extra (message "Extra tests run successfully!"))))
 
3706
 
# run-tests-in-test-buffer:
 
3707
 
# (lambda (dir &optional extra)
 
3708
 
#   (with-current-buffer (get-buffer-create "*Test*")
 
3709
 
#     (setq buffer-read-only nil
 
3710
 
#           default-directory dir)
 
3712
 
#     (compilation-mode))
 
3713
 
#   (let ((process-result
 
3714
 
#          (let ((inhibit-read-only t))
 
3715
 
#            (process-file-shell-command
 
3716
 
#             (funcall get-command-line extra) nil "*Test*"))))
 
3717
 
#     (and (numberp process-result)
 
3718
 
#          (= process-result 0))))
 
3720
 
# (lambda (&optional extra)
 
3721
 
#   (let ((quoted-script
 
3722
 
#          (shell-quote-argument (funcall get-script-name))))
 
3724
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
 
3728
 
#   (if (fboundp 'file-local-name)
 
3729
 
#       (file-local-name (buffer-file-name))
 
3730
 
#     (or (file-remote-p (buffer-file-name) 'localname)
 
3731
 
#         (buffer-file-name))))
 
3732
 
# remove-test-window:
 
3734
 
#   (let ((test-window (get-buffer-window "*Test*")))
 
3735
 
#     (if test-window (delete-window test-window))))
 
3736
 
# show-test-buffer-in-test-window:
 
3738
 
#   (when (not (get-buffer-window-list "*Test*"))
 
3739
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
 
3740
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
 
3741
 
#            (display-buffer-overriding-action
 
3742
 
#             `((display-buffer-in-side-window) (side . ,side)
 
3743
 
#               (window-height . fit-window-to-buffer)
 
3744
 
#               (window-width . fit-window-to-buffer))))
 
3745
 
#       (display-buffer "*Test*"))))
 
3748
 
#   (let* ((run-extra-tests (lambda () (interactive)
 
3749
 
#                             (funcall run-tests t)))
 
3750
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
 
3751
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
 
3752
 
#     (setq minor-mode-overriding-map-alist
 
3753
 
#           (cons `(run-tests . ,outer-keymap)
 
3754
 
#                 minor-mode-overriding-map-alist)))
 
3755
 
#   (add-hook 'after-save-hook run-tests 90 t))
 
 
2077
if __name__ == '__main__':