2
 
# -*- mode: python; coding: utf-8 -*-
 
 
2
# -*- coding: utf-8; lexical-binding: t -*-
 
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-2012 Teddy Hogeborn
 
15
 
# Copyright © 2008-2012 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
 
 
14
# Copyright © 2008-2022 Teddy Hogeborn
 
 
15
# Copyright © 2008-2022 Björn Påhlsson
 
 
17
# This file is part of Mandos.
 
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
 
20
# under the terms of the GNU General Public License as published by
 
19
21
# the Free Software Foundation, either version 3 of the License, or
 
20
22
# (at your option) any later version.
 
22
 
#     This program is distributed in the hope that it will be useful,
 
23
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
24
#     Mandos is distributed in the hope that it will be useful, but
 
 
25
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
24
26
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
25
27
#     GNU General Public License for more details.
 
27
29
# You should have received a copy of the GNU General Public License
 
28
 
# along with this program.  If not, see
 
29
 
# <http://www.gnu.org/licenses/>.
 
 
30
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
31
32
# Contact the authors at <mandos@recompile.se>.
 
34
34
from __future__ import (division, absolute_import, print_function,
 
37
 
from future_builtins import *
 
 
38
    from future_builtins import *
 
39
 
import SocketServer as socketserver
 
 
48
    import SocketServer as socketserver
 
45
 
import gnutls.connection
 
47
 
import gnutls.library.functions
 
48
 
import gnutls.library.constants
 
49
 
import gnutls.library.types
 
50
 
import ConfigParser as configparser
 
 
55
    import ConfigParser as configparser
 
59
63
import logging.handlers
 
65
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
66
73
import multiprocessing
 
73
84
import dbus.service
 
 
86
from gi.repository import GLib
 
76
87
from dbus.mainloop.glib import DBusGMainLoop
 
79
90
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:
 
84
122
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
85
123
except AttributeError:
 
 
125
        # This is where SO_BINDTODEVICE was up to and including Python
 
87
127
        from IN import SO_BINDTODEVICE
 
88
128
    except ImportError:
 
89
 
        SO_BINDTODEVICE = None
 
 
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
 
92
147
stored_state_file = "clients.pickle"
 
94
 
logger = logging.getLogger()
 
95
 
syslogger = (logging.handlers.SysLogHandler
 
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
 
              address = str("/dev/log")))
 
 
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
 
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
 
                      (ctypes.util.find_library("c"))
 
 
154
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
155
        ctypes.util.find_library("c")).if_nametoindex
 
103
156
except (OSError, AttributeError):
 
104
158
    def if_nametoindex(interface):
 
105
159
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
160
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
161
        with contextlib.closing(socket.socket()) as s:
 
108
162
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
 
                                struct.pack(str("16s16x"),
 
111
 
        interface_index = struct.unpack(str("I"),
 
 
163
                                struct.pack(b"16s16x", interface))
 
 
164
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
113
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__,
 
116
184
def initlogger(debug, level=logging.WARNING):
 
117
185
    """init logger and add loglevel"""
 
 
188
    syslogger = (logging.handlers.SysLogHandler(
 
 
189
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
119
191
    syslogger.setFormatter(logging.Formatter
 
120
 
                           ('Mandos [%(process)d]: %(levelname)s:'
 
122
 
    logger.addHandler(syslogger)
 
 
192
                           ("Mandos [%(process)d]: %(levelname)s:"
 
 
194
    log.addHandler(syslogger)
 
125
197
        console = logging.StreamHandler()
 
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
130
 
        logger.addHandler(console)
 
131
 
    logger.setLevel(level)
 
 
198
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
 
 
202
        log.addHandler(console)
 
134
206
class PGPError(Exception):
 
 
171
255
            os.rmdir(self.tempdir)
 
172
256
            self.tempdir = None
 
174
258
    def password_encode(self, password):
 
175
259
        # Passphrase can not be empty and can not contain newlines or
 
176
260
        # NUL bytes.  So we prefix it and hex encode it.
 
177
 
        return b"mandos" + binascii.hexlify(password)
 
 
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"))
 
179
269
    def encrypt(self, data, password):
 
180
 
        self.gnupg.passphrase = self.password_encode(password)
 
181
 
        with open(os.devnull, "w") as devnull:
 
183
 
                proc = self.gnupg.run(['--symmetric'],
 
184
 
                                      create_fhs=['stdin', 'stdout'],
 
185
 
                                      attach_fhs={'stderr': devnull})
 
186
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
188
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
 
                    ciphertext = f.read()
 
193
 
        self.gnupg.passphrase = None
 
 
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:
 
194
285
        return ciphertext
 
196
287
    def decrypt(self, data, password):
 
197
 
        self.gnupg.passphrase = self.password_encode(password)
 
198
 
        with open(os.devnull, "w") as devnull:
 
200
 
                proc = self.gnupg.run(['--decrypt'],
 
201
 
                                      create_fhs=['stdin', 'stdout'],
 
202
 
                                      attach_fhs={'stderr': devnull})
 
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
205
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
 
                    decrypted_plaintext = f.read()
 
210
 
        self.gnupg.passphrase = None
 
 
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:
 
211
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
 
214
332
class AvahiError(Exception):
 
215
333
    def __init__(self, value, *args, **kwargs):
 
216
334
        self.value = value
 
217
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
218
 
    def __unicode__(self):
 
219
 
        return unicode(repr(self.value))
 
 
335
        return super(AvahiError, self).__init__(value, *args,
 
221
339
class AvahiServiceError(AvahiError):
 
224
343
class AvahiGroupError(AvahiError):
 
228
 
class AvahiService(object):
 
229
348
    """An Avahi (Zeroconf) service.
 
232
351
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
233
352
               Used to optionally bind to the specified interface.
 
234
 
    name: string; Example: 'Mandos'
 
235
 
    type: string; Example: '_mandos._tcp'.
 
236
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
353
    name: string; Example: "Mandos"
 
 
354
    type: string; Example: "_mandos._tcp".
 
 
355
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
237
356
    port: integer; what port to announce
 
238
357
    TXT: list of strings; TXT record for the service
 
239
358
    domain: string; Domain to publish on, default to .local if empty.
 
 
376
516
                                    follow_name_owner_changes=True),
 
377
517
                avahi.DBUS_INTERFACE_SERVER)
 
378
518
        self.server.connect_to_signal("StateChanged",
 
379
 
                                 self.server_state_changed)
 
 
519
                                      self.server_state_changed)
 
380
520
        self.server_state_changed(self.server.GetState())
 
383
523
class AvahiServiceToSyslog(AvahiService):
 
 
524
    def rename(self, *args, **kwargs):
 
385
525
        """Add the new name to the syslog messages"""
 
386
 
        ret = AvahiService.rename(self)
 
387
 
        syslogger.setFormatter(logging.Formatter
 
388
 
                               ('Mandos ({0}) [%(process)d]:'
 
389
 
                                ' %(levelname)s: %(message)s'
 
 
526
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
 
528
        syslogger.setFormatter(logging.Formatter(
 
 
529
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
394
 
def timedelta_to_milliseconds(td):
 
395
 
    "Convert a datetime.timedelta() to milliseconds"
 
396
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
397
 
            + (td.seconds * 1000)
 
398
 
            + (td.microseconds // 1000))
 
401
 
class Client(object):
 
 
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))
 
402
875
    """A representation of a client host served by this server.
 
405
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
878
    approved:   bool(); None if not yet approved/disapproved
 
406
879
    approval_delay: datetime.timedelta(); Time to wait for approval
 
407
880
    approval_duration: datetime.timedelta(); Duration of one approval
 
408
 
    checker:    subprocess.Popen(); a running checker process used
 
409
 
                                    to see if the client lives.
 
410
 
                                    'None' if no process is running.
 
411
 
    checker_callback_tag: a gobject event source tag, or None
 
 
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
 
412
885
    checker_command: string; External command which is run to check
 
413
886
                     if client lives.  %() expansions are done at
 
414
887
                     runtime with vars(self) as dict, so that for
 
415
888
                     instance %(name)s can be used in the command.
 
416
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
889
    checker_initiator_tag: a GLib event source tag, or None
 
417
890
    created:    datetime.datetime(); (UTC) object creation
 
418
891
    client_structure: Object describing what attributes a client has
 
419
892
                      and is used for storing the client at exit
 
420
893
    current_checker_command: string; current running checker_command
 
421
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
894
    disable_initiator_tag: a GLib event source tag, or None
 
423
896
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
424
 
                 uniquely identify the client
 
 
897
                 uniquely identify an OpenPGP client
 
 
898
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
899
            a client using raw public keys
 
425
900
    host:       string; available for use by the checker command
 
426
901
    interval:   datetime.timedelta(); How often to start a new checker
 
427
902
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
581
1050
        self.last_enabled = datetime.datetime.utcnow()
 
582
1051
        self.init_checker()
 
583
1052
        self.send_changedstate()
 
585
1054
    def disable(self, quiet=True):
 
586
1055
        """Disable this client."""
 
587
1056
        if not getattr(self, "enabled", False):
 
590
 
            logger.info("Disabling client %s", self.name)
 
 
1059
            log.info("Disabling client %s", self.name)
 
591
1060
        if getattr(self, "disable_initiator_tag", None) is not None:
 
592
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1061
            GLib.source_remove(self.disable_initiator_tag)
 
593
1062
            self.disable_initiator_tag = None
 
594
1063
        self.expires = None
 
595
1064
        if getattr(self, "checker_initiator_tag", None) is not None:
 
596
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1065
            GLib.source_remove(self.checker_initiator_tag)
 
597
1066
            self.checker_initiator_tag = None
 
598
1067
        self.stop_checker()
 
599
1068
        self.enabled = False
 
601
1070
            self.send_changedstate()
 
602
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1071
        # Do not run this again if called by a GLib.timeout_add
 
605
1074
    def __del__(self):
 
608
1077
    def init_checker(self):
 
609
1078
        # Schedule a new checker to be started an 'interval' from now,
 
610
1079
        # and every interval from then on.
 
611
1080
        if self.checker_initiator_tag is not None:
 
612
 
            gobject.source_remove(self.checker_initiator_tag)
 
613
 
        self.checker_initiator_tag = (gobject.timeout_add
 
614
 
                                      (self.interval_milliseconds(),
 
 
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
 
616
1086
        # Schedule a disable() when 'timeout' has passed
 
617
1087
        if self.disable_initiator_tag is not None:
 
618
 
            gobject.source_remove(self.disable_initiator_tag)
 
619
 
        self.disable_initiator_tag = (gobject.timeout_add
 
620
 
                                   (self.timeout_milliseconds(),
 
 
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)
 
622
1091
        # Also start a new checker *right now*.
 
623
1092
        self.start_checker()
 
625
 
    def checker_callback(self, pid, condition, command):
 
 
1094
    def checker_callback(self, source, condition, connection,
 
626
1096
        """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:
 
627
1102
        self.checker_callback_tag = None
 
628
1103
        self.checker = None
 
629
 
        if os.WIFEXITED(condition):
 
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1106
            self.last_checker_status = returncode
 
 
1107
            self.last_checker_signal = None
 
631
1108
            if self.last_checker_status == 0:
 
632
 
                logger.info("Checker for %(name)s succeeded",
 
 
1109
                log.info("Checker for %(name)s succeeded", vars(self))
 
634
1110
                self.checked_ok()
 
636
 
                logger.info("Checker for %(name)s failed",
 
 
1112
                log.info("Checker for %(name)s failed", vars(self))
 
639
1114
            self.last_checker_status = -1
 
640
 
            logger.warning("Checker for %(name)s crashed?",
 
 
1115
            self.last_checker_signal = -returncode
 
 
1116
            log.warning("Checker for %(name)s crashed?", vars(self))
 
643
1119
    def checked_ok(self):
 
644
1120
        """Assert that the client has been seen, alive and well."""
 
645
1121
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
1122
        self.last_checker_status = 0
 
 
1123
        self.last_checker_signal = None
 
647
1124
        self.bump_timeout()
 
649
1126
    def bump_timeout(self, timeout=None):
 
650
1127
        """Bump up the timeout for this client."""
 
651
1128
        if timeout is None:
 
652
1129
            timeout = self.timeout
 
653
1130
        if self.disable_initiator_tag is not None:
 
654
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1131
            GLib.source_remove(self.disable_initiator_tag)
 
655
1132
            self.disable_initiator_tag = None
 
656
1133
        if getattr(self, "enabled", False):
 
657
 
            self.disable_initiator_tag = (gobject.timeout_add
 
658
 
                                          (timedelta_to_milliseconds
 
659
 
                                           (timeout), self.disable))
 
 
1134
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1135
                int(timeout.total_seconds() * 1000), self.disable)
 
660
1136
            self.expires = datetime.datetime.utcnow() + timeout
 
662
1138
    def need_approval(self):
 
663
1139
        self.last_approval_request = datetime.datetime.utcnow()
 
665
1141
    def start_checker(self):
 
666
1142
        """Start a new checker subprocess if one is not running.
 
668
1144
        If a checker already exists, leave it running and do
 
670
1146
        # The reason for not killing a running checker is that if we
 
 
675
1151
        # checkers alone, the checker would have to take more time
 
676
1152
        # than 'timeout' for the client to be disabled, which is as it
 
679
 
        # If a checker exists, make sure it is not a zombie
 
681
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
682
 
        except (AttributeError, OSError) as error:
 
683
 
            if (isinstance(error, OSError)
 
684
 
                and error.errno != errno.ECHILD):
 
688
 
                logger.warning("Checker was a zombie")
 
689
 
                gobject.source_remove(self.checker_callback_tag)
 
690
 
                self.checker_callback(pid, status,
 
691
 
                                      self.current_checker_command)
 
 
1155
        if self.checker is not None and not self.checker.is_alive():
 
 
1156
            log.warning("Checker was not alive; joining")
 
692
1159
        # Start a new checker if needed
 
693
1160
        if self.checker is None:
 
694
1161
            # Escape attributes for the shell
 
695
 
            escaped_attrs = dict(
 
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
 
                self.runtime_expansions)
 
 
1163
                attr: shlex.quote(str(getattr(self, attr)))
 
 
1164
                for attr in self.runtime_expansions}
 
700
1166
                command = self.checker_command % escaped_attrs
 
701
1167
            except TypeError as error:
 
702
 
                logger.error('Could not format string "%s"',
 
703
 
                             self.checker_command, exc_info=error)
 
704
 
                return True # Try again later
 
 
1168
                log.error('Could not format string "%s"',
 
 
1169
                          self.checker_command, exc_info=error)
 
 
1170
                return True     # Try again later
 
705
1171
            self.current_checker_command = command
 
707
 
                logger.info("Starting checker %r for %s",
 
709
 
                # We don't need to redirect stdout and stderr, since
 
710
 
                # in normal mode, that is already done by daemon(),
 
711
 
                # and in debug mode we don't want to.  (Stdin is
 
712
 
                # always replaced by /dev/null.)
 
713
 
                self.checker = subprocess.Popen(command,
 
716
 
            except OSError as error:
 
717
 
                logger.error("Failed to start subprocess",
 
719
 
            self.checker_callback_tag = (gobject.child_watch_add
 
721
 
                                          self.checker_callback,
 
723
 
            # The checker may have completed before the gobject
 
724
 
            # watch was added.  Check for this.
 
725
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
727
 
                gobject.source_remove(self.checker_callback_tag)
 
728
 
                self.checker_callback(pid, status, command)
 
729
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
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
 
732
1200
    def stop_checker(self):
 
733
1201
        """Force the checker process, if any, to stop."""
 
734
1202
        if self.checker_callback_tag:
 
735
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1203
            GLib.source_remove(self.checker_callback_tag)
 
736
1204
            self.checker_callback_tag = None
 
737
1205
        if getattr(self, "checker", None) is None:
 
739
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
741
 
            self.checker.terminate()
 
743
 
            #if self.checker.poll() is None:
 
744
 
            #    self.checker.kill()
 
745
 
        except OSError as error:
 
746
 
            if error.errno != errno.ESRCH: # No such process
 
 
1207
        log.debug("Stopping checker for %(name)s", vars(self))
 
 
1208
        self.checker.terminate()
 
748
1209
        self.checker = None
 
751
 
def dbus_service_property(dbus_interface, signature="v",
 
752
 
                          access="readwrite", byte_arrays=False):
 
 
1212
def dbus_service_property(dbus_interface,
 
753
1216
    """Decorators for marking methods of a DBusObjectWithProperties to
 
754
1217
    become properties on the D-Bus.
 
756
1219
    The decorated method will be called with no arguments by "Get"
 
757
1220
    and with one argument by "Set".
 
759
1222
    The parameters, where they are supported, are the same as
 
760
1223
    dbus.service.method, except there is only "signature", since the
 
761
1224
    type from Get() and the type sent to Set() is the same.
 
 
837
 
class DBusObjectWithProperties(dbus.service.Object):
 
838
 
    """A D-Bus object with properties.
 
840
 
    Classes inheriting from this can use the dbus_service_property
 
841
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
842
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
1307
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1308
    """A D-Bus object with annotations.
 
 
1310
    Classes inheriting from this can use the dbus_annotations
 
 
1311
    decorator to add annotations to methods or signals.
 
846
1315
    def _is_dbus_thing(thing):
 
847
1316
        """Returns a function testing if an attribute is a D-Bus thing
 
849
1318
        If called like _is_dbus_thing("method") it returns a function
 
850
1319
        suitable for use as predicate to inspect.getmembers().
 
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1321
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
855
1324
    def _get_all_dbus_things(self, thing):
 
856
1325
        """Returns a generator of (name, attribute) pairs
 
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1327
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
860
1328
                 athing.__get__(self))
 
861
1329
                for cls in self.__class__.__mro__
 
862
1330
                for name, athing in
 
863
 
                inspect.getmembers(cls,
 
864
 
                                   self._is_dbus_thing(thing)))
 
 
1331
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1333
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1335
                         path_keyword="object_path",
 
 
1336
                         connection_keyword="connection")
 
 
1337
    def Introspect(self, object_path, connection):
 
 
1338
        """Overloading of standard D-Bus method.
 
 
1340
        Inserts annotation tags on methods and signals.
 
 
1342
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1345
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1347
            for if_tag in document.getElementsByTagName("interface"):
 
 
1348
                # Add annotation tags
 
 
1349
                for typ in ("method", "signal"):
 
 
1350
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1352
                        for name, prop in (self.
 
 
1353
                                           _get_all_dbus_things(typ)):
 
 
1354
                            if (name == tag.getAttribute("name")
 
 
1355
                                and prop._dbus_interface
 
 
1356
                                == if_tag.getAttribute("name")):
 
 
1357
                                annots.update(getattr(
 
 
1358
                                    prop, "_dbus_annotations", {}))
 
 
1359
                        for name, value in annots.items():
 
 
1360
                            ann_tag = document.createElement(
 
 
1362
                            ann_tag.setAttribute("name", name)
 
 
1363
                            ann_tag.setAttribute("value", value)
 
 
1364
                            tag.appendChild(ann_tag)
 
 
1365
                # Add interface annotation tags
 
 
1366
                for annotation, value in dict(
 
 
1367
                    itertools.chain.from_iterable(
 
 
1368
                        annotations().items()
 
 
1369
                        for name, annotations
 
 
1370
                        in self._get_all_dbus_things("interface")
 
 
1371
                        if name == if_tag.getAttribute("name")
 
 
1373
                    ann_tag = document.createElement("annotation")
 
 
1374
                    ann_tag.setAttribute("name", annotation)
 
 
1375
                    ann_tag.setAttribute("value", value)
 
 
1376
                    if_tag.appendChild(ann_tag)
 
 
1377
                # Fix argument name for the Introspect method itself
 
 
1378
                if (if_tag.getAttribute("name")
 
 
1379
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1380
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1381
                        if cn.getAttribute("name") == "Introspect":
 
 
1382
                            for arg in cn.getElementsByTagName("arg"):
 
 
1383
                                if (arg.getAttribute("direction")
 
 
1385
                                    arg.setAttribute("name",
 
 
1387
            xmlstring = document.toxml("utf-8")
 
 
1389
        except (AttributeError, xml.dom.DOMException,
 
 
1390
                xml.parsers.expat.ExpatError) as error:
 
 
1391
            log.error("Failed to override Introspection method",
 
 
1396
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1397
    """A D-Bus object with properties.
 
 
1399
    Classes inheriting from this can use the dbus_service_property
 
 
1400
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1401
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
866
1404
    def _get_dbus_property(self, interface_name, property_name):
 
867
1405
        """Returns a bound method if one exists which is a D-Bus
 
868
1406
        property with the specified name and interface.
 
870
 
        for cls in  self.__class__.__mro__:
 
871
 
            for name, value in (inspect.getmembers
 
873
 
                                 self._is_dbus_thing("property"))):
 
 
1408
        for cls in self.__class__.__mro__:
 
 
1409
            for name, value in inspect.getmembers(
 
 
1410
                    cls, self._is_dbus_thing("property")):
 
874
1411
                if (value._dbus_name == property_name
 
875
1412
                    and value._dbus_interface == interface_name):
 
876
1413
                    return value.__get__(self)
 
878
1415
        # No such property
 
879
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
880
 
                                   + interface_name + "."
 
883
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1416
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1417
            self.dbus_object_path, interface_name, property_name))
 
 
1420
    def _get_all_interface_names(cls):
 
 
1421
        """Get a sequence of all interfaces supported by an object"""
 
 
1422
        return (name for name in set(getattr(getattr(x, attr),
 
 
1423
                                             "_dbus_interface", None)
 
 
1424
                                     for x in (inspect.getmro(cls))
 
 
1426
                if name is not None)
 
 
1428
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
884
1430
                         out_signature="v")
 
885
1431
    def Get(self, interface_name, property_name):
 
886
1432
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1011
1555
            document.unlink()
 
1012
1556
        except (AttributeError, xml.dom.DOMException,
 
1013
1557
                xml.parsers.expat.ExpatError) as error:
 
1014
 
            logger.error("Failed to override Introspection method",
 
 
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",
 
1016
1631
        return xmlstring
 
1019
1634
def datetime_to_dbus(dt, variant_level=0):
 
1020
1635
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1022
 
        return dbus.String("", variant_level = variant_level)
 
1023
 
    return dbus.String(dt.isoformat(),
 
1024
 
                       variant_level=variant_level)
 
 
1637
        return dbus.String("", variant_level=variant_level)
 
 
1638
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1027
1641
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1380
2002
        server to mandos-client
 
1384
2006
    # Rejected - signal
 
1385
2007
    @dbus.service.signal(_interface, signature="s")
 
1386
2008
    def Rejected(self, reason):
 
1390
2012
    # NeedApproval - signal
 
1391
2013
    @dbus.service.signal(_interface, signature="tb")
 
1392
2014
    def NeedApproval(self, timeout, default):
 
1394
2016
        return self.need_approval()
 
1398
2020
    # Approve - method
 
1399
2021
    @dbus.service.method(_interface, in_signature="b")
 
1400
2022
    def Approve(self, value):
 
1401
2023
        self.approve(value)
 
1403
2025
    # CheckedOK - method
 
1404
2026
    @dbus.service.method(_interface)
 
1405
2027
    def CheckedOK(self):
 
1406
2028
        self.checked_ok()
 
1408
2030
    # Enable - method
 
 
2031
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1409
2032
    @dbus.service.method(_interface)
 
1410
2033
    def Enable(self):
 
1414
2037
    # StartChecker - method
 
 
2038
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1415
2039
    @dbus.service.method(_interface)
 
1416
2040
    def StartChecker(self):
 
1418
2042
        self.start_checker()
 
1420
2044
    # Disable - method
 
 
2045
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1421
2046
    @dbus.service.method(_interface)
 
1422
2047
    def Disable(self):
 
1426
2051
    # StopChecker - method
 
 
2052
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1427
2053
    @dbus.service.method(_interface)
 
1428
2054
    def StopChecker(self):
 
1429
2055
        self.stop_checker()
 
1433
2059
    # ApprovalPending - property
 
1434
2060
    @dbus_service_property(_interface, signature="b", access="read")
 
1435
2061
    def ApprovalPending_dbus_property(self):
 
1436
2062
        return dbus.Boolean(bool(self.approvals_pending))
 
1438
2064
    # ApprovedByDefault - property
 
1439
 
    @dbus_service_property(_interface, signature="b",
 
 
2065
    @dbus_service_property(_interface,
 
1440
2067
                           access="readwrite")
 
1441
2068
    def ApprovedByDefault_dbus_property(self, value=None):
 
1442
2069
        if value is None:       # get
 
1443
2070
            return dbus.Boolean(self.approved_by_default)
 
1444
2071
        self.approved_by_default = bool(value)
 
1446
2073
    # ApprovalDelay - property
 
1447
 
    @dbus_service_property(_interface, signature="t",
 
 
2074
    @dbus_service_property(_interface,
 
1448
2076
                           access="readwrite")
 
1449
2077
    def ApprovalDelay_dbus_property(self, value=None):
 
1450
2078
        if value is None:       # get
 
1451
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2079
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1452
2081
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1454
2083
    # ApprovalDuration - property
 
1455
 
    @dbus_service_property(_interface, signature="t",
 
 
2084
    @dbus_service_property(_interface,
 
1456
2086
                           access="readwrite")
 
1457
2087
    def ApprovalDuration_dbus_property(self, value=None):
 
1458
2088
        if value is None:       # get
 
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1460
 
                    self.approval_duration))
 
 
2089
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1461
2091
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1463
2093
    # Name - property
 
 
2095
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1464
2096
    @dbus_service_property(_interface, signature="s", access="read")
 
1465
2097
    def Name_dbus_property(self):
 
1466
2098
        return dbus.String(self.name)
 
 
2102
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2103
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2104
    def KeyID_dbus_property(self):
 
 
2105
        return dbus.String(self.key_id)
 
1468
2107
    # Fingerprint - property
 
 
2109
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1469
2110
    @dbus_service_property(_interface, signature="s", access="read")
 
1470
2111
    def Fingerprint_dbus_property(self):
 
1471
2112
        return dbus.String(self.fingerprint)
 
1473
2114
    # Host - property
 
1474
 
    @dbus_service_property(_interface, signature="s",
 
 
2115
    @dbus_service_property(_interface,
 
1475
2117
                           access="readwrite")
 
1476
2118
    def Host_dbus_property(self, value=None):
 
1477
2119
        if value is None:       # get
 
1478
2120
            return dbus.String(self.host)
 
1479
 
        self.host = unicode(value)
 
 
2121
        self.host = str(value)
 
1481
2123
    # Created - property
 
 
2125
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1482
2126
    @dbus_service_property(_interface, signature="s", access="read")
 
1483
2127
    def Created_dbus_property(self):
 
1484
2128
        return datetime_to_dbus(self.created)
 
1486
2130
    # LastEnabled - property
 
1487
2131
    @dbus_service_property(_interface, signature="s", access="read")
 
1488
2132
    def LastEnabled_dbus_property(self):
 
1489
2133
        return datetime_to_dbus(self.last_enabled)
 
1491
2135
    # Enabled - property
 
1492
 
    @dbus_service_property(_interface, signature="b",
 
 
2136
    @dbus_service_property(_interface,
 
1493
2138
                           access="readwrite")
 
1494
2139
    def Enabled_dbus_property(self, value=None):
 
1495
2140
        if value is None:       # get
 
 
1591
2241
            self.start_checker()
 
1593
2243
            self.stop_checker()
 
1595
2245
    # ObjectPath - property
 
 
2247
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
 
2248
         "org.freedesktop.DBus.Deprecated": "true"})
 
1596
2249
    @dbus_service_property(_interface, signature="o", access="read")
 
1597
2250
    def ObjectPath_dbus_property(self):
 
1598
 
        return self.dbus_object_path # is already a dbus.ObjectPath
 
 
2251
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
1600
2253
    # Secret = property
 
1601
 
    @dbus_service_property(_interface, signature="ay",
 
1602
 
                           access="write", byte_arrays=True)
 
 
2255
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
 
2257
    @dbus_service_property(_interface,
 
1603
2261
    def Secret_dbus_property(self, value):
 
1604
 
        self.secret = str(value)
 
 
2262
        self.secret = bytes(value)
 
1609
 
class ProxyClient(object):
 
1610
 
    def __init__(self, child_pipe, fpr, address):
 
 
2268
    def __init__(self, child_pipe, key_id, fpr, address):
 
1611
2269
        self._pipe = child_pipe
 
1612
 
        self._pipe.send(('init', fpr, address))
 
 
2270
        self._pipe.send(("init", key_id, fpr, address))
 
1613
2271
        if not self._pipe.recv():
 
 
2272
            raise KeyError(key_id or fpr)
 
1616
2274
    def __getattribute__(self, name):
 
1618
2276
            return super(ProxyClient, self).__getattribute__(name)
 
1619
 
        self._pipe.send(('getattr', name))
 
 
2277
        self._pipe.send(("getattr", name))
 
1620
2278
        data = self._pipe.recv()
 
1621
 
        if data[0] == 'data':
 
 
2279
        if data[0] == "data":
 
1623
 
        if data[0] == 'function':
 
 
2281
        if data[0] == "function":
 
1624
2283
            def func(*args, **kwargs):
 
1625
 
                self._pipe.send(('funcall', name, args, kwargs))
 
 
2284
                self._pipe.send(("funcall", name, args, kwargs))
 
1626
2285
                return self._pipe.recv()[1]
 
1629
2289
    def __setattr__(self, name, value):
 
1631
2291
            return super(ProxyClient, self).__setattr__(name, value)
 
1632
 
        self._pipe.send(('setattr', name, value))
 
 
2292
        self._pipe.send(("setattr", name, value))
 
1635
2295
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1636
2296
    """A class to handle client connections.
 
1638
2298
    Instantiated once for each connection to handle it.
 
1639
2299
    Note: This will run in its own forked process."""
 
1641
2301
    def handle(self):
 
1642
2302
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1643
 
            logger.info("TCP connection from: %s",
 
1644
 
                        unicode(self.client_address))
 
1645
 
            logger.debug("Pipe FD: %d",
 
1646
 
                         self.server.child_pipe.fileno())
 
1648
 
            session = (gnutls.connection
 
1649
 
                       .ClientSession(self.request,
 
1651
 
                                      .X509Credentials()))
 
1653
 
            # Note: gnutls.connection.X509Credentials is really a
 
1654
 
            # generic GnuTLS certificate credentials object so long as
 
1655
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1656
 
            # here despite using OpenPGP certificates.
 
1658
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1659
 
            #                      "+AES-256-CBC", "+SHA1",
 
1660
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
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",
 
1662
2313
            # Use a fallback default, since this MUST be set.
 
1663
2314
            priority = self.server.gnutls_priority
 
1664
2315
            if priority is None:
 
1665
2316
                priority = "NORMAL"
 
1666
 
            (gnutls.library.functions
 
1667
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2317
            gnutls.priority_set_direct(session,
 
 
2318
                                       priority.encode("utf-8"), None)
 
1670
2320
            # Start communication using the Mandos protocol
 
1671
2321
            # Get protocol number
 
1672
2322
            line = self.request.makefile().readline()
 
1673
 
            logger.debug("Protocol version: %r", line)
 
 
2323
            log.debug("Protocol version: %r", line)
 
1675
2325
                if int(line.strip().split()[0]) > 1:
 
 
2326
                    raise RuntimeError(line)
 
1677
2327
            except (ValueError, IndexError, RuntimeError) as error:
 
1678
 
                logger.error("Unknown protocol version: %s", error)
 
 
2328
                log.error("Unknown protocol version: %s", error)
 
1681
2331
            # Start GnuTLS connection
 
1683
2333
                session.handshake()
 
1684
 
            except gnutls.errors.GNUTLSError as error:
 
1685
 
                logger.warning("Handshake failed: %s", error)
 
 
2334
            except gnutls.Error as error:
 
 
2335
                log.warning("Handshake failed: %s", error)
 
1686
2336
                # Do not run session.bye() here: the session is not
 
1687
2337
                # established.  Just abandon the request.
 
1689
 
            logger.debug("Handshake succeeded")
 
 
2339
            log.debug("Handshake succeeded")
 
1691
2341
            approval_required = False
 
1694
 
                    fpr = self.fingerprint(self.peer_certificate
 
1697
 
                        gnutls.errors.GNUTLSError) as error:
 
1698
 
                    logger.warning("Bad certificate: %s", error)
 
1700
 
                logger.debug("Fingerprint: %s", fpr)
 
1703
 
                    client = ProxyClient(child_pipe, fpr,
 
 
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,
 
1704
2367
                                         self.client_address)
 
1705
2368
                except KeyError:
 
1708
2371
                if client.approval_delay:
 
1709
2372
                    delay = client.approval_delay
 
1710
2373
                    client.approvals_pending += 1
 
1711
2374
                    approval_required = True
 
1714
2377
                    if not client.enabled:
 
1715
 
                        logger.info("Client %s is disabled",
 
 
2378
                        log.info("Client %s is disabled", client.name)
 
1717
2379
                        if self.server.use_dbus:
 
1718
2380
                            # Emit D-Bus signal
 
1719
2381
                            client.Rejected("Disabled")
 
1722
2384
                    if client.approved or not client.approval_delay:
 
1723
 
                        #We are approved or approval is disabled
 
 
2385
                        # We are approved or approval is disabled
 
1725
2387
                    elif client.approved is None:
 
1726
 
                        logger.info("Client %s needs approval",
 
 
2388
                        log.info("Client %s needs approval",
 
 
2390
                        if self.server.use_dbus:
 
 
2392
                            client.NeedApproval(
 
 
2393
                                client.approval_delay.total_seconds()
 
 
2394
                                * 1000, client.approved_by_default)
 
 
2396
                        log.warning("Client %s was not approved",
 
1728
2398
                        if self.server.use_dbus:
 
1729
2399
                            # Emit D-Bus signal
 
1730
 
                            client.NeedApproval(
 
1731
 
                                client.approval_delay_milliseconds(),
 
1732
 
                                client.approved_by_default)
 
1734
 
                        logger.warning("Client %s was not approved",
 
1736
 
                        if self.server.use_dbus:
 
1738
2400
                            client.Rejected("Denied")
 
1741
 
                    #wait until timeout or approved
 
 
2403
                    # wait until timeout or approved
 
1742
2404
                    time = datetime.datetime.now()
 
1743
2405
                    client.changedstate.acquire()
 
1744
 
                    client.changedstate.wait(
 
1745
 
                        float(timedelta_to_milliseconds(delay)
 
 
2406
                    client.changedstate.wait(delay.total_seconds())
 
1747
2407
                    client.changedstate.release()
 
1748
2408
                    time2 = datetime.datetime.now()
 
1749
2409
                    if (time2 - time) >= delay:
 
1750
2410
                        if not client.approved_by_default:
 
1751
 
                            logger.warning("Client %s timed out while"
 
1752
 
                                           " waiting for approval",
 
 
2411
                            log.warning("Client %s timed out while"
 
 
2412
                                        " waiting for approval",
 
1754
2414
                            if self.server.use_dbus:
 
1755
2415
                                # Emit D-Bus signal
 
1756
2416
                                client.Rejected("Approval timed out")
 
 
1761
2421
                        delay -= time2 - time
 
1764
 
                while sent_size < len(client.secret):
 
1766
 
                        sent = session.send(client.secret[sent_size:])
 
1767
 
                    except gnutls.errors.GNUTLSError as error:
 
1768
 
                        logger.warning("gnutls send failed",
 
1771
 
                    logger.debug("Sent: %d, remaining: %d",
 
1772
 
                                 sent, len(client.secret)
 
1773
 
                                 - (sent_size + sent))
 
1776
 
                logger.info("Sending secret to %s", client.name)
 
 
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)
 
1777
2430
                # bump the timeout using extended_timeout
 
1778
2431
                client.bump_timeout(client.extended_timeout)
 
1779
2432
                if self.server.use_dbus:
 
1780
2433
                    # Emit D-Bus signal
 
1781
2434
                    client.GotSecret()
 
1784
2437
                if approval_required:
 
1785
2438
                    client.approvals_pending -= 1
 
1788
 
                except gnutls.errors.GNUTLSError as error:
 
1789
 
                    logger.warning("GnuTLS bye failed",
 
 
2441
                except gnutls.Error as error:
 
 
2442
                    log.warning("GnuTLS bye failed", exc_info=error)
 
1793
2445
    def peer_certificate(session):
 
1794
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1795
 
        # If not an OpenPGP certificate...
 
1796
 
        if (gnutls.library.functions
 
1797
 
            .gnutls_certificate_type_get(session._c_object)
 
1798
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1799
 
            # ...do the normal thing
 
1800
 
            return session.peer_certificate
 
 
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
 
1801
2462
        list_size = ctypes.c_uint(1)
 
1802
 
        cert_list = (gnutls.library.functions
 
1803
 
                     .gnutls_certificate_get_peers
 
1804
 
                     (session._c_object, ctypes.byref(list_size)))
 
 
2463
        cert_list = (gnutls.certificate_get_peers
 
 
2464
                     (session, ctypes.byref(list_size)))
 
1805
2465
        if not bool(cert_list) and list_size.value != 0:
 
1806
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2466
            raise gnutls.Error("error getting peer certificate")
 
1808
2467
        if list_size.value == 0:
 
1810
2469
        cert = cert_list[0]
 
1811
2470
        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()
 
1814
2508
    def fingerprint(openpgp):
 
1815
2509
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1816
2510
        # New GnuTLS "datum" with the OpenPGP public key
 
1817
 
        datum = (gnutls.library.types
 
1818
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1821
 
                                 ctypes.c_uint(len(openpgp))))
 
 
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)))
 
1822
2515
        # New empty GnuTLS certificate
 
1823
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1824
 
        (gnutls.library.functions
 
1825
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2516
        crt = gnutls.openpgp_crt_t()
 
 
2517
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1826
2518
        # Import the OpenPGP public key into the certificate
 
1827
 
        (gnutls.library.functions
 
1828
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1829
 
                                    gnutls.library.constants
 
1830
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2519
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2520
                                  gnutls.OPENPGP_FMT_RAW)
 
1831
2521
        # Verify the self signature in the key
 
1832
2522
        crtverify = ctypes.c_uint()
 
1833
 
        (gnutls.library.functions
 
1834
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1835
 
                                         ctypes.byref(crtverify)))
 
 
2523
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2524
                                       ctypes.byref(crtverify))
 
1836
2525
        if crtverify.value != 0:
 
1837
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1838
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2526
            gnutls.openpgp_crt_deinit(crt)
 
 
2527
            raise gnutls.CertificateSecurityError(code
 
1840
2529
        # New buffer for the fingerprint
 
1841
2530
        buf = ctypes.create_string_buffer(20)
 
1842
2531
        buf_len = ctypes.c_size_t()
 
1843
2532
        # Get the fingerprint from the certificate into the buffer
 
1844
 
        (gnutls.library.functions
 
1845
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1846
 
                                             ctypes.byref(buf_len)))
 
 
2533
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2534
                                           ctypes.byref(buf_len))
 
1847
2535
        # Deinit the certificate
 
1848
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2536
        gnutls.openpgp_crt_deinit(crt)
 
1849
2537
        # Convert the buffer to a Python bytestring
 
1850
2538
        fpr = ctypes.string_at(buf, buf_len.value)
 
1851
2539
        # Convert the bytestring to hexadecimal notation
 
 
2007
2704
        self.gnutls_priority = gnutls_priority
 
2008
2705
        IPv6_TCPServer.__init__(self, server_address,
 
2009
2706
                                RequestHandlerClass,
 
2010
 
                                interface = interface,
 
2011
 
                                use_ipv6 = use_ipv6,
 
2012
 
                                socketfd = socketfd)
 
 
2707
                                interface=interface,
 
2013
2711
    def server_activate(self):
 
2014
2712
        if self.enabled:
 
2015
2713
            return socketserver.TCPServer.server_activate(self)
 
2017
2715
    def enable(self):
 
2018
2716
        self.enabled = True
 
2020
2718
    def add_pipe(self, parent_pipe, proc):
 
2021
2719
        # Call "handle_ipc" for both data and EOF events
 
2022
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
2023
 
                             gobject.IO_IN | gobject.IO_HUP,
 
2024
 
                             functools.partial(self.handle_ipc,
 
2029
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2030
 
                   proc = None, client_object=None):
 
 
2721
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2722
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2723
            functools.partial(self.handle_ipc,
 
 
2724
                              parent_pipe=parent_pipe,
 
 
2727
    def handle_ipc(self, source, condition,
 
 
2730
                   client_object=None):
 
2031
2731
        # error, or the other end of multiprocessing.Pipe has closed
 
2032
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2732
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2033
2733
            # Wait for other process to exit
 
2037
2737
        # Read a request from the child
 
2038
2738
        request = parent_pipe.recv()
 
2039
2739
        command = request[0]
 
2041
 
        if command == 'init':
 
2043
 
            address = request[2]
 
2045
 
            for c in self.clients.itervalues():
 
2046
 
                if c.fingerprint == fpr:
 
 
2741
        if command == "init":
 
 
2742
            key_id = request[1].decode("ascii")
 
 
2743
            fpr = request[2].decode("ascii")
 
 
2744
            address = request[3]
 
 
2746
            for c in self.clients.values():
 
 
2747
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
 
2748
                              "27AE41E4649B934CA495991B7852B855"):
 
 
2750
                if key_id and c.key_id == key_id:
 
 
2753
                if fpr and c.fingerprint == fpr:
 
2050
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2051
 
                            "dress: %s", fpr, address)
 
 
2757
                log.info("Client not found for key ID: %s, address:"
 
 
2758
                         " %s", key_id or fpr, address)
 
2052
2759
                if self.use_dbus:
 
2053
2760
                    # Emit D-Bus signal
 
2054
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2761
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2056
2763
                parent_pipe.send(False)
 
2059
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
2060
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
2061
 
                                 functools.partial(self.handle_ipc,
 
 
2767
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2768
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2769
                functools.partial(self.handle_ipc,
 
 
2770
                                  parent_pipe=parent_pipe,
 
 
2772
                                  client_object=client))
 
2067
2773
            parent_pipe.send(True)
 
2068
2774
            # remove the old hook in favor of the new above hook on
 
2071
 
        if command == 'funcall':
 
 
2777
        if command == "funcall":
 
2072
2778
            funcname = request[1]
 
2073
2779
            args = request[2]
 
2074
2780
            kwargs = request[3]
 
2076
 
            parent_pipe.send(('data', getattr(client_object,
 
 
2782
            parent_pipe.send(("data", getattr(client_object,
 
2077
2783
                                              funcname)(*args,
 
2080
 
        if command == 'getattr':
 
 
2786
        if command == "getattr":
 
2081
2787
            attrname = request[1]
 
2082
 
            if callable(client_object.__getattribute__(attrname)):
 
2083
 
                parent_pipe.send(('function',))
 
 
2788
            if isinstance(client_object.__getattribute__(attrname),
 
 
2789
                          collections.abc.Callable):
 
 
2790
                parent_pipe.send(("function", ))
 
2085
 
                parent_pipe.send(('data', client_object
 
2086
 
                                  .__getattribute__(attrname)))
 
2088
 
        if command == 'setattr':
 
 
2793
                    "data", client_object.__getattribute__(attrname)))
 
 
2795
        if command == "setattr":
 
2089
2796
            attrname = request[1]
 
2090
2797
            value = request[2]
 
2091
2798
            setattr(client_object, attrname, value)
 
 
2803
def rfc3339_duration_to_delta(duration):
 
 
2804
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2806
    >>> timedelta = datetime.timedelta
 
 
2807
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
 
2809
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
 
2811
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
 
2813
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
 
2815
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
 
2817
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
 
2819
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
 
2824
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2825
    # possible - there would have to be multiple places for the same
 
 
2826
    # values, like seconds.  The current code, while more esoteric, is
 
 
2827
    # cleaner without depending on a parsing library.  If Python had a
 
 
2828
    # built-in library for parsing we would use it, but we'd like to
 
 
2829
    # avoid excessive use of external libraries.
 
 
2831
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2832
    Token = collections.namedtuple("Token", (
 
 
2833
        "regexp",  # To match token; if "value" is not None, must have
 
 
2834
                   # a "group" containing digits
 
 
2835
        "value",   # datetime.timedelta or None
 
 
2836
        "followers"))           # Tokens valid after this token
 
 
2837
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2838
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2839
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2840
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2841
                         datetime.timedelta(seconds=1),
 
 
2842
                         frozenset((token_end, )))
 
 
2843
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2844
                         datetime.timedelta(minutes=1),
 
 
2845
                         frozenset((token_second, token_end)))
 
 
2846
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2847
                       datetime.timedelta(hours=1),
 
 
2848
                       frozenset((token_minute, token_end)))
 
 
2849
    token_time = Token(re.compile(r"T"),
 
 
2851
                       frozenset((token_hour, token_minute,
 
 
2853
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2854
                      datetime.timedelta(days=1),
 
 
2855
                      frozenset((token_time, token_end)))
 
 
2856
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2857
                        datetime.timedelta(weeks=4),
 
 
2858
                        frozenset((token_day, token_end)))
 
 
2859
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2860
                       datetime.timedelta(weeks=52),
 
 
2861
                       frozenset((token_month, token_end)))
 
 
2862
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2863
                       datetime.timedelta(weeks=1),
 
 
2864
                       frozenset((token_end, )))
 
 
2865
    token_duration = Token(re.compile(r"P"), None,
 
 
2866
                           frozenset((token_year, token_month,
 
 
2867
                                      token_day, token_time,
 
 
2869
    # Define starting values:
 
 
2871
    value = datetime.timedelta()
 
 
2873
    # Following valid tokens
 
 
2874
    followers = frozenset((token_duration, ))
 
 
2875
    # String left to parse
 
 
2877
    # Loop until end token is found
 
 
2878
    while found_token is not token_end:
 
 
2879
        # Search for any currently valid tokens
 
 
2880
        for token in followers:
 
 
2881
            match = token.regexp.match(s)
 
 
2882
            if match is not None:
 
 
2884
                if token.value is not None:
 
 
2885
                    # Value found, parse digits
 
 
2886
                    factor = int(match.group(1), 10)
 
 
2887
                    # Add to value so far
 
 
2888
                    value += factor * token.value
 
 
2889
                # Strip token from string
 
 
2890
                s = token.regexp.sub("", s, 1)
 
 
2893
                # Set valid next tokens
 
 
2894
                followers = found_token.followers
 
 
2897
            # No currently valid tokens were found
 
 
2898
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2096
2904
def string_to_delta(interval):
 
2097
2905
    """Parse a string and return a datetime.timedelta
 
2099
 
    >>> string_to_delta('7d')
 
2100
 
    datetime.timedelta(7)
 
2101
 
    >>> string_to_delta('60s')
 
2102
 
    datetime.timedelta(0, 60)
 
2103
 
    >>> string_to_delta('60m')
 
2104
 
    datetime.timedelta(0, 3600)
 
2105
 
    >>> string_to_delta('24h')
 
2106
 
    datetime.timedelta(1)
 
2107
 
    >>> string_to_delta('1w')
 
2108
 
    datetime.timedelta(7)
 
2109
 
    >>> string_to_delta('5m 30s')
 
2110
 
    datetime.timedelta(0, 330)
 
 
2907
    >>> string_to_delta("7d") == datetime.timedelta(7)
 
 
2909
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
 
 
2911
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
 
 
2913
    >>> string_to_delta("24h") == datetime.timedelta(1)
 
 
2915
    >>> string_to_delta("1w") == datetime.timedelta(7)
 
 
2917
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
 
 
2922
        return rfc3339_duration_to_delta(interval)
 
2112
2926
    timevalue = datetime.timedelta(0)
 
2113
2927
    for s in interval.split():
 
2115
 
            suffix = unicode(s[-1])
 
2116
2930
            value = int(s[:-1])
 
2117
2931
            if suffix == "d":
 
2118
2932
                delta = datetime.timedelta(value)
 
 
2191
3004
    parser.add_argument("--no-dbus", action="store_false",
 
2192
3005
                        dest="use_dbus", help="Do not provide D-Bus"
 
2193
 
                        " system bus interface")
 
 
3006
                        " system bus interface", default=None)
 
2194
3007
    parser.add_argument("--no-ipv6", action="store_false",
 
2195
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
3008
                        dest="use_ipv6", help="Do not use IPv6",
 
2196
3010
    parser.add_argument("--no-restore", action="store_false",
 
2197
3011
                        dest="restore", help="Do not restore stored"
 
 
3012
                        " state", default=None)
 
2199
3013
    parser.add_argument("--socket", type=int,
 
2200
3014
                        help="Specify a file descriptor to a network"
 
2201
3015
                        " socket to use instead of creating one")
 
2202
3016
    parser.add_argument("--statedir", metavar="DIR",
 
2203
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",
 
2205
3024
    options = parser.parse_args()
 
2212
3026
    # Default values for config file for server-global settings
 
2213
 
    server_defaults = { "interface": "",
 
2218
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2219
 
                        "servicename": "Mandos",
 
2225
 
                        "statedir": "/var/lib/mandos"
 
 
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",
 
2228
3050
    # Parse config file for server-global settings
 
2229
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3051
    server_config = configparser.ConfigParser(server_defaults)
 
2230
3052
    del server_defaults
 
2231
 
    server_config.read(os.path.join(options.configdir,
 
2233
 
    # Convert the SafeConfigParser object to a dict
 
 
3053
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3054
    # Convert the ConfigParser object to a dict
 
2234
3055
    server_settings = server_config.defaults()
 
2235
3056
    # Use the appropriate methods on the non-string config options
 
2236
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3057
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3058
                   "foreground", "zeroconf"):
 
2237
3059
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2239
3061
    if server_settings["port"]:
 
 
 
3176
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
2336
3177
    except OSError as error:
 
 
3178
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
 
 
3179
                    os.strerror(error.errno))
 
2337
3180
        if error.errno != errno.EPERM:
 
2341
3184
        # Enable all possible GnuTLS debugging
 
2343
3186
        # "Use a log level over 10 to enable all debugging options."
 
2344
3187
        # - GnuTLS manual
 
2345
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2347
 
        @gnutls.library.types.gnutls_log_func
 
 
3188
        gnutls.global_set_log_level(11)
 
2348
3191
        def debug_gnutls(level, string):
 
2349
 
            logger.debug("GnuTLS: %s", string[:-1])
 
2351
 
        (gnutls.library.functions
 
2352
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3192
            log.debug("GnuTLS: %s",
 
 
3193
                      string[:-1].decode("utf-8", errors="replace"))
 
 
3195
        gnutls.global_set_log_function(debug_gnutls)
 
2354
3197
        # Redirect stdin so all checkers get /dev/null
 
2355
3198
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2356
3199
        os.dup2(null, sys.stdin.fileno())
 
2360
3203
    # Need to fork before connecting to D-Bus
 
2362
3205
        # Close all input and output, do double fork, etc.
 
2365
 
    # multiprocessing will use threads, so before we use gobject we
 
2366
 
    # need to inform gobject that threads will be used.
 
2367
 
    gobject.threads_init()
 
 
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.
 
2369
3213
    global main_loop
 
2370
3214
    # From the Avahi example code
 
2371
3215
    DBusGMainLoop(set_as_default=True)
 
2372
 
    main_loop = gobject.MainLoop()
 
 
3216
    main_loop = GLib.MainLoop()
 
2373
3217
    bus = dbus.SystemBus()
 
2374
3218
    # End of Avahi example code
 
2377
3221
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2378
 
                                            bus, do_not_queue=True)
 
2379
 
            old_bus_name = (dbus.service.BusName
 
2380
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2382
 
        except dbus.exceptions.NameExistsException as e:
 
2383
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
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)
 
2384
3229
            use_dbus = False
 
2385
3230
            server_settings["use_dbus"] = False
 
2386
3231
            tcp_server.use_dbus = False
 
2387
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2388
 
    service = AvahiServiceToSyslog(name =
 
2389
 
                                   server_settings["servicename"],
 
2390
 
                                   servicetype = "_mandos._tcp",
 
2391
 
                                   protocol = protocol, bus = bus)
 
2392
 
    if server_settings["interface"]:
 
2393
 
        service.interface = (if_nametoindex
 
2394
 
                             (str(server_settings["interface"])))
 
 
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"))
 
2396
3243
    global multiprocessing_manager
 
2397
3244
    multiprocessing_manager = multiprocessing.Manager()
 
2399
3246
    client_class = Client
 
2401
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3248
        client_class = functools.partial(ClientDBus, bus=bus)
 
2403
3250
    client_settings = Client.config_parser(client_config)
 
2404
3251
    old_client_settings = {}
 
2405
3252
    clients_data = {}
 
 
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:
 
2407
3262
    # Get client data and settings from last running state.
 
2408
3263
    if server_settings["restore"]:
 
2410
3265
            with open(stored_state_path, "rb") as stored_state:
 
2411
 
                clients_data, old_client_settings = (pickle.load
 
 
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]
 
2413
3316
            os.remove(stored_state_path)
 
2414
3317
        except IOError as e:
 
2415
3318
            if e.errno == errno.ENOENT:
 
2416
 
                logger.warning("Could not load persistent state: {0}"
 
2417
 
                                .format(os.strerror(e.errno)))
 
 
3319
                log.warning("Could not load persistent state:"
 
 
3320
                            " %s", os.strerror(e.errno))
 
2419
 
                logger.critical("Could not load persistent state:",
 
 
3322
                log.critical("Could not load persistent state:",
 
2422
3325
        except EOFError as e:
 
2423
 
            logger.warning("Could not load persistent state: "
 
2424
 
                           "EOFError:", exc_info=e)
 
 
3326
            log.warning("Could not load persistent state: EOFError:",
 
2426
3329
    with PGPEngine() as pgp:
 
2427
 
        for client_name, client in clients_data.iteritems():
 
 
3330
        for client_name, client in clients_data.items():
 
 
3331
            # Skip removed clients
 
 
3332
            if client_name not in client_settings:
 
2428
3335
            # Decide which value to use after restoring saved state.
 
2429
3336
            # We have three different values: Old config file,
 
2430
3337
            # new config file, and saved state.
 
 
2488
3391
    for client_name in (set(client_settings)
 
2489
3392
                        - set(old_client_settings)):
 
2490
3393
        clients_data[client_name] = client_settings[client_name]
 
2492
3395
    # Create all client objects
 
2493
 
    for client_name, client in clients_data.iteritems():
 
 
3396
    for client_name, client in clients_data.items():
 
2494
3397
        tcp_server.clients[client_name] = client_class(
 
2495
 
            name = client_name, settings = client)
 
 
3400
            server_settings=server_settings)
 
2497
3402
    if not tcp_server.clients:
 
2498
 
        logger.warning("No clients defined")
 
2504
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2507
 
            logger.error("Could not write to file %r with PID %d",
 
2510
 
            # "pidfile" was never created
 
 
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",
 
2512
3415
        del pidfilename
 
2514
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2515
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3417
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3418
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3419
                             lambda: main_loop.quit() and False)
 
2518
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2519
 
                                        "se.bsnet.fukt.Mandos"})
 
2520
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3423
        @alternate_dbus_interfaces(
 
 
3424
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3425
        class MandosDBusService(DBusObjectWithObjectManager):
 
2521
3426
            """A D-Bus proxy object"""
 
2522
3428
            def __init__(self):
 
2523
3429
                dbus.service.Object.__init__(self, bus, "/")
 
2524
3431
            _interface = "se.recompile.Mandos"
 
2526
 
            @dbus_interface_annotations(_interface)
 
2528
 
                return { "org.freedesktop.DBus.Property"
 
2529
 
                         ".EmitsChangedSignal":
 
2532
3433
            @dbus.service.signal(_interface, signature="o")
 
2533
3434
            def ClientAdded(self, objpath):
 
2537
3438
            @dbus.service.signal(_interface, signature="ss")
 
2538
 
            def ClientNotFound(self, fingerprint, address):
 
 
3439
            def ClientNotFound(self, key_id, address):
 
 
3443
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2542
3445
            @dbus.service.signal(_interface, signature="os")
 
2543
3446
            def ClientRemoved(self, objpath, name):
 
 
3450
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2547
3452
            @dbus.service.method(_interface, out_signature="ao")
 
2548
3453
            def GetAllClients(self):
 
2550
 
                return dbus.Array(c.dbus_object_path
 
2552
 
                                  tcp_server.clients.itervalues())
 
 
3455
                return dbus.Array(c.dbus_object_path for c in
 
 
3456
                                  tcp_server.clients.values())
 
 
3458
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2554
3460
            @dbus.service.method(_interface,
 
2555
3461
                                 out_signature="a{oa{sv}}")
 
2556
3462
            def GetAllClientsWithProperties(self):
 
2558
3464
                return dbus.Dictionary(
 
2559
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2560
 
                     for c in tcp_server.clients.itervalues()),
 
 
3465
                    {c.dbus_object_path: c.GetAll(
 
 
3466
                        "se.recompile.Mandos.Client")
 
 
3467
                     for c in tcp_server.clients.values()},
 
2561
3468
                    signature="oa{sv}")
 
2563
3470
            @dbus.service.method(_interface, in_signature="o")
 
2564
3471
            def RemoveClient(self, object_path):
 
2566
 
                for c in tcp_server.clients.itervalues():
 
 
3473
                for c in tcp_server.clients.values():
 
2567
3474
                    if c.dbus_object_path == object_path:
 
2568
3475
                        del tcp_server.clients[c.name]
 
2569
3476
                        c.remove_from_connection()
 
2570
 
                        # Don't signal anything except ClientRemoved
 
 
3477
                        # Don't signal the disabling
 
2571
3478
                        c.disable(quiet=True)
 
2573
 
                        self.ClientRemoved(object_path, c.name)
 
 
3479
                        # Emit D-Bus signal for removal
 
 
3480
                        self.client_removed_signal(c)
 
2575
3482
                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,
 
2579
3522
        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
 
2582
3530
        "Cleanup function; run on exit"
 
2585
 
        multiprocessing.active_children()
 
 
3534
        mp.active_children()
 
2586
3536
        if not (tcp_server.clients or client_settings):
 
2589
3539
        # Store client before exiting. Secrets are encrypted with key
 
2590
3540
        # based on what config file has. If config file is
 
2591
3541
        # removed/edited, old secret will thus be unrecovable.
 
2593
3543
        with PGPEngine() as pgp:
 
2594
 
            for client in tcp_server.clients.itervalues():
 
 
3544
            for client in tcp_server.clients.values():
 
2595
3545
                key = client_settings[client.name]["secret"]
 
2596
3546
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2598
3548
                client_dict = {}
 
2600
3550
                # A list of attributes that can not be pickled
 
2602
 
                exclude = set(("bus", "changedstate", "secret",
 
2604
 
                for name, typ in (inspect.getmembers
 
2605
 
                                  (dbus.service.Object)):
 
 
3552
                exclude = {"bus", "changedstate", "secret",
 
 
3553
                           "checker", "server_settings"}
 
 
3554
                for name, typ in inspect.getmembers(dbus.service
 
2606
3556
                    exclude.add(name)
 
2608
3558
                client_dict["encrypted_secret"] = (client
 
2609
3559
                                                   .encrypted_secret)
 
2610
3560
                for attr in client.client_structure:
 
2611
3561
                    if attr not in exclude:
 
2612
3562
                        client_dict[attr] = getattr(client, attr)
 
2614
3564
                clients[client.name] = client_dict
 
2615
3565
                del client_settings[client.name]["secret"]
 
2618
 
            with (tempfile.NamedTemporaryFile
 
2619
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2620
 
                   dir=os.path.dirname(stored_state_path),
 
2621
 
                   delete=False)) as stored_state:
 
2622
 
                pickle.dump((clients, client_settings), stored_state)
 
2623
 
                tempname=stored_state.name
 
 
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
 
2624
3577
            os.rename(tempname, stored_state_path)
 
2625
3578
        except (IOError, OSError) as e:
 
 
2629
3582
                except NameError:
 
2631
3584
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2632
 
                logger.warning("Could not save persistent state: {0}"
 
2633
 
                               .format(os.strerror(e.errno)))
 
 
3585
                log.warning("Could not save persistent state: %s",
 
 
3586
                            os.strerror(e.errno))
 
2635
 
                logger.warning("Could not save persistent state:",
 
 
3588
                log.warning("Could not save persistent state:",
 
2639
3592
        # Delete all clients, and settings from config
 
2640
3593
        while tcp_server.clients:
 
2641
3594
            name, client = tcp_server.clients.popitem()
 
2643
3596
                client.remove_from_connection()
 
2644
 
            # Don't signal anything except ClientRemoved
 
 
3597
            # Don't signal the disabling
 
2645
3598
            client.disable(quiet=True)
 
 
3599
            # Emit D-Bus signal for removal
 
2648
 
                mandos_dbus_service.ClientRemoved(client
 
 
3601
                mandos_dbus_service.client_removed_signal(client)
 
2651
3602
        client_settings.clear()
 
2653
3604
    atexit.register(cleanup)
 
2655
 
    for client in tcp_server.clients.itervalues():
 
 
3606
    for client in tcp_server.clients.values():
 
2658
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3608
            # Emit D-Bus signal for adding
 
 
3609
            mandos_dbus_service.client_added_signal(client)
 
2659
3610
        # Need to initiate checking of clients
 
2660
3611
        if client.enabled:
 
2661
3612
            client.init_checker()
 
2663
3614
    tcp_server.enable()
 
2664
3615
    tcp_server.server_activate()
 
2666
3617
    # Find out what port we got
 
2667
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3619
        service.port = tcp_server.socket.getsockname()[1]
 
2669
 
        logger.info("Now listening on address %r, port %d,"
 
2670
 
                    " flowinfo %d, scope_id %d",
 
2671
 
                    *tcp_server.socket.getsockname())
 
 
3621
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
 
3622
                 " scope_id %d", *tcp_server.socket.getsockname())
 
2673
 
        logger.info("Now listening on address %r, port %d",
 
2674
 
                    *tcp_server.socket.getsockname())
 
2676
 
    #service.interface = tcp_server.socket.getsockname()[3]
 
 
3624
        log.info("Now listening on address %r, port %d",
 
 
3625
                 *tcp_server.socket.getsockname())
 
 
3627
    # service.interface = tcp_server.socket.getsockname()[3]
 
2679
 
        # From the Avahi example code
 
2682
 
        except dbus.exceptions.DBusException as error:
 
2683
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2686
 
        # End of Avahi example code
 
2688
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2689
 
                             lambda *args, **kwargs:
 
2690
 
                             (tcp_server.handle_request
 
2691
 
                              (*args[2:], **kwargs) or True))
 
2693
 
        logger.debug("Starting main loop")
 
 
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")
 
2694
3647
        main_loop.run()
 
2695
3648
    except AvahiError as error:
 
2696
 
        logger.critical("Avahi Error", exc_info=error)
 
 
3649
        log.critical("Avahi Error", exc_info=error)
 
2699
3652
    except KeyboardInterrupt:
 
2701
3654
            print("", file=sys.stderr)
 
2702
 
        logger.debug("Server received KeyboardInterrupt")
 
2703
 
    logger.debug("Server exiting")
 
 
3655
        log.debug("Server received KeyboardInterrupt")
 
 
3656
    log.debug("Server exiting")
 
2704
3657
    # Must run before the D-Bus bus name gets deregistered
 
2707
 
if __name__ == '__main__':
 
 
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))