2
 
# -*- mode: python; coding: utf-8 -*-
 
 
2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-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-2020 Teddy Hogeborn
 
 
15
# Copyright © 2008-2020 Björn Påhlsson
 
 
17
# This file is part of Mandos.
 
 
19
# Mandos is free software: you can redistribute it and/or modify it
 
 
20
# under the terms of the GNU General Public License as published by
 
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
35
from __future__ import (division, absolute_import, print_function,
 
37
 
from future_builtins import *
 
 
39
    from future_builtins import *
 
39
 
import SocketServer as socketserver
 
 
44
    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
 
 
52
    import ConfigParser as configparser
 
 
65
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
66
73
import multiprocessing
 
73
85
import dbus.service
 
 
87
from gi.repository import GLib
 
76
88
from dbus.mainloop.glib import DBusGMainLoop
 
79
91
import xml.dom.minidom
 
 
94
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
149
logger = logging.getLogger()
 
95
 
syslogger = (logging.handlers.SysLogHandler
 
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
 
              address = str("/dev/log")))
 
 
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
192
                           ('Mandos [%(process)d]: %(levelname)s:'
 
122
194
    logger.addHandler(syslogger)
 
125
197
        console = logging.StreamHandler()
 
126
198
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
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
353
    name: string; Example: 'Mandos'
 
235
354
    type: string; Example: '_mandos._tcp'.
 
236
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
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
517
                                    follow_name_owner_changes=True),
 
377
518
                avahi.DBUS_INTERFACE_SERVER)
 
378
519
        self.server.connect_to_signal("StateChanged",
 
379
 
                                 self.server_state_changed)
 
 
520
                                      self.server_state_changed)
 
380
521
        self.server_state_changed(self.server.GetState())
 
383
524
class AvahiServiceToSyslog(AvahiService):
 
 
525
    def rename(self, *args, **kwargs):
 
385
526
        """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'
 
 
527
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
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)
 
 
597
            return super(gnutls.Error, self).__init__(
 
 
600
    class CertificateSecurityError(Error):
 
 
606
            self._c_object = gnutls.certificate_credentials_t()
 
 
607
            gnutls.certificate_allocate_credentials(
 
 
608
                ctypes.byref(self._c_object))
 
 
609
            self.type = gnutls.CRD_CERTIFICATE
 
 
612
            gnutls.certificate_free_credentials(self._c_object)
 
 
615
        def __init__(self, socket, credentials=None):
 
 
616
            self._c_object = gnutls.session_t()
 
 
617
            gnutls_flags = gnutls.CLIENT
 
 
618
            if gnutls.check_version(b"3.5.6"):
 
 
619
                gnutls_flags |= gnutls.NO_TICKETS
 
 
621
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
622
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
624
            gnutls.set_default_priority(self._c_object)
 
 
625
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
626
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
629
            if credentials is None:
 
 
630
                credentials = gnutls.Credentials()
 
 
631
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
632
                                   ctypes.cast(credentials._c_object,
 
 
634
            self.credentials = credentials
 
 
637
            gnutls.deinit(self._c_object)
 
 
640
            return gnutls.handshake(self._c_object)
 
 
642
        def send(self, data):
 
 
646
                data_len -= gnutls.record_send(self._c_object,
 
 
651
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
653
    # Error handling functions
 
 
654
    def _error_code(result):
 
 
655
        """A function to raise exceptions on errors, suitable
 
 
656
        for the 'restype' attribute on ctypes functions"""
 
 
659
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
660
            raise gnutls.CertificateSecurityError(code=result)
 
 
661
        raise gnutls.Error(code=result)
 
 
663
    def _retry_on_error(result, func, arguments):
 
 
664
        """A function to retry on some errors, suitable
 
 
665
        for the 'errcheck' attribute on ctypes functions"""
 
 
667
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
668
                return _error_code(result)
 
 
669
            result = func(*arguments)
 
 
672
    # Unless otherwise indicated, the function declarations below are
 
 
673
    # all from the gnutls/gnutls.h C header file.
 
 
676
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
677
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
678
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
679
    priority_set_direct.restype = _error_code
 
 
681
    init = _library.gnutls_init
 
 
682
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
683
    init.restype = _error_code
 
 
685
    set_default_priority = _library.gnutls_set_default_priority
 
 
686
    set_default_priority.argtypes = [session_t]
 
 
687
    set_default_priority.restype = _error_code
 
 
689
    record_send = _library.gnutls_record_send
 
 
690
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
692
    record_send.restype = ctypes.c_ssize_t
 
 
693
    record_send.errcheck = _retry_on_error
 
 
695
    certificate_allocate_credentials = (
 
 
696
        _library.gnutls_certificate_allocate_credentials)
 
 
697
    certificate_allocate_credentials.argtypes = [
 
 
698
        ctypes.POINTER(certificate_credentials_t)]
 
 
699
    certificate_allocate_credentials.restype = _error_code
 
 
701
    certificate_free_credentials = (
 
 
702
        _library.gnutls_certificate_free_credentials)
 
 
703
    certificate_free_credentials.argtypes = [
 
 
704
        certificate_credentials_t]
 
 
705
    certificate_free_credentials.restype = None
 
 
707
    handshake_set_private_extensions = (
 
 
708
        _library.gnutls_handshake_set_private_extensions)
 
 
709
    handshake_set_private_extensions.argtypes = [session_t,
 
 
711
    handshake_set_private_extensions.restype = None
 
 
713
    credentials_set = _library.gnutls_credentials_set
 
 
714
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
716
    credentials_set.restype = _error_code
 
 
718
    strerror = _library.gnutls_strerror
 
 
719
    strerror.argtypes = [ctypes.c_int]
 
 
720
    strerror.restype = ctypes.c_char_p
 
 
722
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
723
    certificate_type_get.argtypes = [session_t]
 
 
724
    certificate_type_get.restype = _error_code
 
 
726
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
727
    certificate_get_peers.argtypes = [session_t,
 
 
728
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
729
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
731
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
732
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
733
    global_set_log_level.restype = None
 
 
735
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
736
    global_set_log_function.argtypes = [log_func]
 
 
737
    global_set_log_function.restype = None
 
 
739
    deinit = _library.gnutls_deinit
 
 
740
    deinit.argtypes = [session_t]
 
 
741
    deinit.restype = None
 
 
743
    handshake = _library.gnutls_handshake
 
 
744
    handshake.argtypes = [session_t]
 
 
745
    handshake.restype = _error_code
 
 
746
    handshake.errcheck = _retry_on_error
 
 
748
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
749
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
750
    transport_set_ptr.restype = None
 
 
752
    bye = _library.gnutls_bye
 
 
753
    bye.argtypes = [session_t, close_request_t]
 
 
754
    bye.restype = _error_code
 
 
755
    bye.errcheck = _retry_on_error
 
 
757
    check_version = _library.gnutls_check_version
 
 
758
    check_version.argtypes = [ctypes.c_char_p]
 
 
759
    check_version.restype = ctypes.c_char_p
 
 
761
    _need_version = b"3.3.0"
 
 
762
    if check_version(_need_version) is None:
 
 
763
        raise self.Error("Needs GnuTLS {} or later"
 
 
764
                         .format(_need_version))
 
 
766
    _tls_rawpk_version = b"3.6.6"
 
 
767
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
771
        class pubkey_st(ctypes.Structure):
 
 
773
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
775
        x509_crt_fmt_t = ctypes.c_int
 
 
777
        # All the function declarations below are from gnutls/abstract.h
 
 
778
        pubkey_init = _library.gnutls_pubkey_init
 
 
779
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
780
        pubkey_init.restype = _error_code
 
 
782
        pubkey_import = _library.gnutls_pubkey_import
 
 
783
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
785
        pubkey_import.restype = _error_code
 
 
787
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
788
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
789
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
790
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
791
        pubkey_get_key_id.restype = _error_code
 
 
793
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
794
        pubkey_deinit.argtypes = [pubkey_t]
 
 
795
        pubkey_deinit.restype = None
 
 
797
        # All the function declarations below are from gnutls/openpgp.h
 
 
799
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
800
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
801
        openpgp_crt_init.restype = _error_code
 
 
803
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
804
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
805
                                       ctypes.POINTER(datum_t),
 
 
807
        openpgp_crt_import.restype = _error_code
 
 
809
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
810
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
811
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
812
        openpgp_crt_verify_self.restype = _error_code
 
 
814
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
815
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
816
        openpgp_crt_deinit.restype = None
 
 
818
        openpgp_crt_get_fingerprint = (
 
 
819
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
820
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
824
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
826
    if check_version(b"3.6.4"):
 
 
827
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
828
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
829
        certificate_type_get2.restype = _error_code
 
 
831
    # Remove non-public functions
 
 
832
    del _error_code, _retry_on_error
 
 
835
def call_pipe(connection,       # : multiprocessing.Connection
 
 
836
              func, *args, **kwargs):
 
 
837
    """This function is meant to be called by multiprocessing.Process
 
 
839
    This function runs func(*args, **kwargs), and writes the resulting
 
 
840
    return value on the provided multiprocessing.Connection.
 
 
842
    connection.send(func(*args, **kwargs))
 
402
847
    """A representation of a client host served by this server.
 
405
850
    approved:   bool(); 'None' if not yet approved/disapproved
 
406
851
    approval_delay: datetime.timedelta(); Time to wait for approval
 
407
852
    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
 
 
853
    checker: multiprocessing.Process(); a running checker process used
 
 
854
             to see if the client lives. 'None' if no process is
 
 
856
    checker_callback_tag: a GLib event source tag, or None
 
412
857
    checker_command: string; External command which is run to check
 
413
858
                     if client lives.  %() expansions are done at
 
414
859
                     runtime with vars(self) as dict, so that for
 
415
860
                     instance %(name)s can be used in the command.
 
416
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
861
    checker_initiator_tag: a GLib event source tag, or None
 
417
862
    created:    datetime.datetime(); (UTC) object creation
 
418
863
    client_structure: Object describing what attributes a client has
 
419
864
                      and is used for storing the client at exit
 
420
865
    current_checker_command: string; current running checker_command
 
421
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
866
    disable_initiator_tag: a GLib event source tag, or None
 
423
868
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
424
 
                 uniquely identify the client
 
 
869
                 uniquely identify an OpenPGP client
 
 
870
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
871
            a client using raw public keys
 
425
872
    host:       string; available for use by the checker command
 
426
873
    interval:   datetime.timedelta(); How often to start a new checker
 
427
874
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
590
1031
            logger.info("Disabling client %s", self.name)
 
591
1032
        if getattr(self, "disable_initiator_tag", None) is not None:
 
592
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1033
            GLib.source_remove(self.disable_initiator_tag)
 
593
1034
            self.disable_initiator_tag = None
 
594
1035
        self.expires = None
 
595
1036
        if getattr(self, "checker_initiator_tag", None) is not None:
 
596
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1037
            GLib.source_remove(self.checker_initiator_tag)
 
597
1038
            self.checker_initiator_tag = None
 
598
1039
        self.stop_checker()
 
599
1040
        self.enabled = False
 
601
1042
            self.send_changedstate()
 
602
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1043
        # Do not run this again if called by a GLib.timeout_add
 
605
1046
    def __del__(self):
 
608
1049
    def init_checker(self):
 
609
1050
        # Schedule a new checker to be started an 'interval' from now,
 
610
1051
        # and every interval from then on.
 
611
1052
        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(),
 
 
1053
            GLib.source_remove(self.checker_initiator_tag)
 
 
1054
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1055
            random.randrange(int(self.interval.total_seconds() * 1000
 
616
1058
        # Schedule a disable() when 'timeout' has passed
 
617
1059
        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(),
 
 
1060
            GLib.source_remove(self.disable_initiator_tag)
 
 
1061
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1062
            int(self.timeout.total_seconds() * 1000), self.disable)
 
622
1063
        # Also start a new checker *right now*.
 
623
1064
        self.start_checker()
 
625
 
    def checker_callback(self, pid, condition, command):
 
 
1066
    def checker_callback(self, source, condition, connection,
 
626
1068
        """The checker has completed, so take appropriate actions."""
 
 
1069
        # Read return code from connection (see call_pipe)
 
 
1070
        returncode = connection.recv()
 
 
1072
        if self.checker is not None:
 
627
1074
        self.checker_callback_tag = None
 
628
1075
        self.checker = None
 
629
 
        if os.WIFEXITED(condition):
 
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1078
            self.last_checker_status = returncode
 
 
1079
            self.last_checker_signal = None
 
631
1080
            if self.last_checker_status == 0:
 
632
1081
                logger.info("Checker for %(name)s succeeded",
 
634
1083
                self.checked_ok()
 
636
 
                logger.info("Checker for %(name)s failed",
 
 
1085
                logger.info("Checker for %(name)s failed", vars(self))
 
639
1087
            self.last_checker_status = -1
 
 
1088
            self.last_checker_signal = -returncode
 
640
1089
            logger.warning("Checker for %(name)s crashed?",
 
643
1093
    def checked_ok(self):
 
644
1094
        """Assert that the client has been seen, alive and well."""
 
645
1095
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
1096
        self.last_checker_status = 0
 
 
1097
        self.last_checker_signal = None
 
647
1098
        self.bump_timeout()
 
649
1100
    def bump_timeout(self, timeout=None):
 
650
1101
        """Bump up the timeout for this client."""
 
651
1102
        if timeout is None:
 
652
1103
            timeout = self.timeout
 
653
1104
        if self.disable_initiator_tag is not None:
 
654
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1105
            GLib.source_remove(self.disable_initiator_tag)
 
655
1106
            self.disable_initiator_tag = None
 
656
1107
        if getattr(self, "enabled", False):
 
657
 
            self.disable_initiator_tag = (gobject.timeout_add
 
658
 
                                          (timedelta_to_milliseconds
 
659
 
                                           (timeout), self.disable))
 
 
1108
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1109
                int(timeout.total_seconds() * 1000), self.disable)
 
660
1110
            self.expires = datetime.datetime.utcnow() + timeout
 
662
1112
    def need_approval(self):
 
663
1113
        self.last_approval_request = datetime.datetime.utcnow()
 
665
1115
    def start_checker(self):
 
666
1116
        """Start a new checker subprocess if one is not running.
 
668
1118
        If a checker already exists, leave it running and do
 
670
1120
        # The reason for not killing a running checker is that if we
 
 
675
1125
        # checkers alone, the checker would have to take more time
 
676
1126
        # 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)
 
 
1129
        if self.checker is not None and not self.checker.is_alive():
 
 
1130
            logger.warning("Checker was not alive; joining")
 
692
1133
        # Start a new checker if needed
 
693
1134
        if self.checker is None:
 
694
1135
            # Escape attributes for the shell
 
695
 
            escaped_attrs = dict(
 
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
 
                self.runtime_expansions)
 
 
1137
                attr: shlex.quote(str(getattr(self, attr)))
 
 
1138
                for attr in self.runtime_expansions}
 
700
1140
                command = self.checker_command % escaped_attrs
 
701
1141
            except TypeError as error:
 
702
1142
                logger.error('Could not format string "%s"',
 
703
 
                             self.checker_command, exc_info=error)
 
704
 
                return True # Try again later
 
 
1143
                             self.checker_command,
 
 
1145
                return True     # Try again later
 
705
1146
            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
 
 
1147
            logger.info("Starting checker %r for %s", command,
 
 
1149
            # We don't need to redirect stdout and stderr, since
 
 
1150
            # in normal mode, that is already done by daemon(),
 
 
1151
            # and in debug mode we don't want to.  (Stdin is
 
 
1152
            # always replaced by /dev/null.)
 
 
1153
            # The exception is when not debugging but nevertheless
 
 
1154
            # running in the foreground; use the previously
 
 
1156
            popen_args = {"close_fds": True,
 
 
1159
            if (not self.server_settings["debug"]
 
 
1160
                and self.server_settings["foreground"]):
 
 
1161
                popen_args.update({"stdout": wnull,
 
 
1163
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1164
            self.checker = multiprocessing.Process(
 
 
1166
                args=(pipe[1], subprocess.call, command),
 
 
1168
            self.checker.start()
 
 
1169
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1170
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
 
1171
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
 
1172
                self.checker_callback, pipe[0], command)
 
 
1173
        # Re-run this periodically if run by GLib.timeout_add
 
732
1176
    def stop_checker(self):
 
733
1177
        """Force the checker process, if any, to stop."""
 
734
1178
        if self.checker_callback_tag:
 
735
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1179
            GLib.source_remove(self.checker_callback_tag)
 
736
1180
            self.checker_callback_tag = None
 
737
1181
        if getattr(self, "checker", None) is None:
 
739
1183
        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
 
 
1184
        self.checker.terminate()
 
748
1185
        self.checker = None
 
751
 
def dbus_service_property(dbus_interface, signature="v",
 
752
 
                          access="readwrite", byte_arrays=False):
 
 
1188
def dbus_service_property(dbus_interface,
 
753
1192
    """Decorators for marking methods of a DBusObjectWithProperties to
 
754
1193
    become properties on the D-Bus.
 
756
1195
    The decorated method will be called with no arguments by "Get"
 
757
1196
    and with one argument by "Set".
 
759
1198
    The parameters, where they are supported, are the same as
 
760
1199
    dbus.service.method, except there is only "signature", since the
 
761
1200
    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.
 
 
1283
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1284
    """A D-Bus object with annotations.
 
 
1286
    Classes inheriting from this can use the dbus_annotations
 
 
1287
    decorator to add annotations to methods or signals.
 
846
1291
    def _is_dbus_thing(thing):
 
847
1292
        """Returns a function testing if an attribute is a D-Bus thing
 
849
1294
        If called like _is_dbus_thing("method") it returns a function
 
850
1295
        suitable for use as predicate to inspect.getmembers().
 
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1297
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
855
1300
    def _get_all_dbus_things(self, thing):
 
856
1301
        """Returns a generator of (name, attribute) pairs
 
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1303
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
860
1304
                 athing.__get__(self))
 
861
1305
                for cls in self.__class__.__mro__
 
862
1306
                for name, athing in
 
863
 
                inspect.getmembers(cls,
 
864
 
                                   self._is_dbus_thing(thing)))
 
 
1307
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1309
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1311
                         path_keyword='object_path',
 
 
1312
                         connection_keyword='connection')
 
 
1313
    def Introspect(self, object_path, connection):
 
 
1314
        """Overloading of standard D-Bus method.
 
 
1316
        Inserts annotation tags on methods and signals.
 
 
1318
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1321
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1323
            for if_tag in document.getElementsByTagName("interface"):
 
 
1324
                # Add annotation tags
 
 
1325
                for typ in ("method", "signal"):
 
 
1326
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1328
                        for name, prop in (self.
 
 
1329
                                           _get_all_dbus_things(typ)):
 
 
1330
                            if (name == tag.getAttribute("name")
 
 
1331
                                and prop._dbus_interface
 
 
1332
                                == if_tag.getAttribute("name")):
 
 
1333
                                annots.update(getattr(
 
 
1334
                                    prop, "_dbus_annotations", {}))
 
 
1335
                        for name, value in annots.items():
 
 
1336
                            ann_tag = document.createElement(
 
 
1338
                            ann_tag.setAttribute("name", name)
 
 
1339
                            ann_tag.setAttribute("value", value)
 
 
1340
                            tag.appendChild(ann_tag)
 
 
1341
                # Add interface annotation tags
 
 
1342
                for annotation, value in dict(
 
 
1343
                    itertools.chain.from_iterable(
 
 
1344
                        annotations().items()
 
 
1345
                        for name, annotations
 
 
1346
                        in self._get_all_dbus_things("interface")
 
 
1347
                        if name == if_tag.getAttribute("name")
 
 
1349
                    ann_tag = document.createElement("annotation")
 
 
1350
                    ann_tag.setAttribute("name", annotation)
 
 
1351
                    ann_tag.setAttribute("value", value)
 
 
1352
                    if_tag.appendChild(ann_tag)
 
 
1353
                # Fix argument name for the Introspect method itself
 
 
1354
                if (if_tag.getAttribute("name")
 
 
1355
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1356
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1357
                        if cn.getAttribute("name") == "Introspect":
 
 
1358
                            for arg in cn.getElementsByTagName("arg"):
 
 
1359
                                if (arg.getAttribute("direction")
 
 
1361
                                    arg.setAttribute("name",
 
 
1363
            xmlstring = document.toxml("utf-8")
 
 
1365
        except (AttributeError, xml.dom.DOMException,
 
 
1366
                xml.parsers.expat.ExpatError) as error:
 
 
1367
            logger.error("Failed to override Introspection method",
 
 
1372
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1373
    """A D-Bus object with properties.
 
 
1375
    Classes inheriting from this can use the dbus_service_property
 
 
1376
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1377
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
866
1380
    def _get_dbus_property(self, interface_name, property_name):
 
867
1381
        """Returns a bound method if one exists which is a D-Bus
 
868
1382
        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"))):
 
 
1384
        for cls in self.__class__.__mro__:
 
 
1385
            for name, value in inspect.getmembers(
 
 
1386
                    cls, self._is_dbus_thing("property")):
 
874
1387
                if (value._dbus_name == property_name
 
875
1388
                    and value._dbus_interface == interface_name):
 
876
1389
                    return value.__get__(self)
 
878
1391
        # No such property
 
879
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
880
 
                                   + interface_name + "."
 
883
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1392
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1393
            self.dbus_object_path, interface_name, property_name))
 
 
1396
    def _get_all_interface_names(cls):
 
 
1397
        """Get a sequence of all interfaces supported by an object"""
 
 
1398
        return (name for name in set(getattr(getattr(x, attr),
 
 
1399
                                             "_dbus_interface", None)
 
 
1400
                                     for x in (inspect.getmro(cls))
 
 
1402
                if name is not None)
 
 
1404
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
884
1406
                         out_signature="v")
 
885
1407
    def Get(self, interface_name, property_name):
 
886
1408
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1016
1536
        return xmlstring
 
 
1540
    dbus.OBJECT_MANAGER_IFACE
 
 
1541
except AttributeError:
 
 
1542
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1545
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1546
    """A D-Bus object with an ObjectManager.
 
 
1548
    Classes inheriting from this exposes the standard
 
 
1549
    GetManagedObjects call and the InterfacesAdded and
 
 
1550
    InterfacesRemoved signals on the standard
 
 
1551
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1553
    Note: No signals are sent automatically; they must be sent
 
 
1556
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1557
                         out_signature="a{oa{sa{sv}}}")
 
 
1558
    def GetManagedObjects(self):
 
 
1559
        """This function must be overridden"""
 
 
1560
        raise NotImplementedError()
 
 
1562
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1563
                         signature="oa{sa{sv}}")
 
 
1564
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1567
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1568
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1571
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1573
                         path_keyword='object_path',
 
 
1574
                         connection_keyword='connection')
 
 
1575
    def Introspect(self, object_path, connection):
 
 
1576
        """Overloading of standard D-Bus method.
 
 
1578
        Override return argument name of GetManagedObjects to be
 
 
1579
        "objpath_interfaces_and_properties"
 
 
1581
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1585
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1587
            for if_tag in document.getElementsByTagName("interface"):
 
 
1588
                # Fix argument name for the GetManagedObjects method
 
 
1589
                if (if_tag.getAttribute("name")
 
 
1590
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1591
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1592
                        if (cn.getAttribute("name")
 
 
1593
                            == "GetManagedObjects"):
 
 
1594
                            for arg in cn.getElementsByTagName("arg"):
 
 
1595
                                if (arg.getAttribute("direction")
 
 
1599
                                        "objpath_interfaces"
 
 
1601
            xmlstring = document.toxml("utf-8")
 
 
1603
        except (AttributeError, xml.dom.DOMException,
 
 
1604
                xml.parsers.expat.ExpatError) as error:
 
 
1605
            logger.error("Failed to override Introspection method",
 
1019
1610
def datetime_to_dbus(dt, variant_level=0):
 
1020
1611
    """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)
 
 
1613
        return dbus.String("", variant_level=variant_level)
 
 
1614
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1027
1617
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1380
1978
        server to mandos-client
 
1384
1982
    # Rejected - signal
 
1385
1983
    @dbus.service.signal(_interface, signature="s")
 
1386
1984
    def Rejected(self, reason):
 
1390
1988
    # NeedApproval - signal
 
1391
1989
    @dbus.service.signal(_interface, signature="tb")
 
1392
1990
    def NeedApproval(self, timeout, default):
 
1394
1992
        return self.need_approval()
 
1398
1996
    # Approve - method
 
1399
1997
    @dbus.service.method(_interface, in_signature="b")
 
1400
1998
    def Approve(self, value):
 
1401
1999
        self.approve(value)
 
1403
2001
    # CheckedOK - method
 
1404
2002
    @dbus.service.method(_interface)
 
1405
2003
    def CheckedOK(self):
 
1406
2004
        self.checked_ok()
 
1408
2006
    # Enable - method
 
 
2007
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1409
2008
    @dbus.service.method(_interface)
 
1410
2009
    def Enable(self):
 
1414
2013
    # StartChecker - method
 
 
2014
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1415
2015
    @dbus.service.method(_interface)
 
1416
2016
    def StartChecker(self):
 
1418
2018
        self.start_checker()
 
1420
2020
    # Disable - method
 
 
2021
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1421
2022
    @dbus.service.method(_interface)
 
1422
2023
    def Disable(self):
 
1426
2027
    # StopChecker - method
 
 
2028
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1427
2029
    @dbus.service.method(_interface)
 
1428
2030
    def StopChecker(self):
 
1429
2031
        self.stop_checker()
 
1433
2035
    # ApprovalPending - property
 
1434
2036
    @dbus_service_property(_interface, signature="b", access="read")
 
1435
2037
    def ApprovalPending_dbus_property(self):
 
1436
2038
        return dbus.Boolean(bool(self.approvals_pending))
 
1438
2040
    # ApprovedByDefault - property
 
1439
 
    @dbus_service_property(_interface, signature="b",
 
 
2041
    @dbus_service_property(_interface,
 
1440
2043
                           access="readwrite")
 
1441
2044
    def ApprovedByDefault_dbus_property(self, value=None):
 
1442
2045
        if value is None:       # get
 
1443
2046
            return dbus.Boolean(self.approved_by_default)
 
1444
2047
        self.approved_by_default = bool(value)
 
1446
2049
    # ApprovalDelay - property
 
1447
 
    @dbus_service_property(_interface, signature="t",
 
 
2050
    @dbus_service_property(_interface,
 
1448
2052
                           access="readwrite")
 
1449
2053
    def ApprovalDelay_dbus_property(self, value=None):
 
1450
2054
        if value is None:       # get
 
1451
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2055
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1452
2057
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1454
2059
    # ApprovalDuration - property
 
1455
 
    @dbus_service_property(_interface, signature="t",
 
 
2060
    @dbus_service_property(_interface,
 
1456
2062
                           access="readwrite")
 
1457
2063
    def ApprovalDuration_dbus_property(self, value=None):
 
1458
2064
        if value is None:       # get
 
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1460
 
                    self.approval_duration))
 
 
2065
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1461
2067
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1463
2069
    # Name - property
 
 
2071
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1464
2072
    @dbus_service_property(_interface, signature="s", access="read")
 
1465
2073
    def Name_dbus_property(self):
 
1466
2074
        return dbus.String(self.name)
 
 
2078
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2079
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2080
    def KeyID_dbus_property(self):
 
 
2081
        return dbus.String(self.key_id)
 
1468
2083
    # Fingerprint - property
 
 
2085
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1469
2086
    @dbus_service_property(_interface, signature="s", access="read")
 
1470
2087
    def Fingerprint_dbus_property(self):
 
1471
2088
        return dbus.String(self.fingerprint)
 
1473
2090
    # Host - property
 
1474
 
    @dbus_service_property(_interface, signature="s",
 
 
2091
    @dbus_service_property(_interface,
 
1475
2093
                           access="readwrite")
 
1476
2094
    def Host_dbus_property(self, value=None):
 
1477
2095
        if value is None:       # get
 
1478
2096
            return dbus.String(self.host)
 
1479
 
        self.host = unicode(value)
 
 
2097
        self.host = str(value)
 
1481
2099
    # Created - property
 
 
2101
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1482
2102
    @dbus_service_property(_interface, signature="s", access="read")
 
1483
2103
    def Created_dbus_property(self):
 
1484
2104
        return datetime_to_dbus(self.created)
 
1486
2106
    # LastEnabled - property
 
1487
2107
    @dbus_service_property(_interface, signature="s", access="read")
 
1488
2108
    def LastEnabled_dbus_property(self):
 
1489
2109
        return datetime_to_dbus(self.last_enabled)
 
1491
2111
    # Enabled - property
 
1492
 
    @dbus_service_property(_interface, signature="b",
 
 
2112
    @dbus_service_property(_interface,
 
1493
2114
                           access="readwrite")
 
1494
2115
    def Enabled_dbus_property(self, value=None):
 
1495
2116
        if value is None:       # get
 
 
1543
2165
                if (getattr(self, "disable_initiator_tag", None)
 
1546
 
                gobject.source_remove(self.disable_initiator_tag)
 
1547
 
                self.disable_initiator_tag = (
 
1548
 
                    gobject.timeout_add(
 
1549
 
                        timedelta_to_milliseconds(self.expires - now),
 
 
2168
                GLib.source_remove(self.disable_initiator_tag)
 
 
2169
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2170
                    int((self.expires - now).total_seconds() * 1000),
 
1552
2173
    # ExtendedTimeout - property
 
1553
 
    @dbus_service_property(_interface, signature="t",
 
 
2174
    @dbus_service_property(_interface,
 
1554
2176
                           access="readwrite")
 
1555
2177
    def ExtendedTimeout_dbus_property(self, value=None):
 
1556
2178
        if value is None:       # get
 
1557
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2179
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1558
2181
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1560
2183
    # Interval - property
 
1561
 
    @dbus_service_property(_interface, signature="t",
 
 
2184
    @dbus_service_property(_interface,
 
1562
2186
                           access="readwrite")
 
1563
2187
    def Interval_dbus_property(self, value=None):
 
1564
2188
        if value is None:       # get
 
1565
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2189
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1566
2190
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1567
2191
        if getattr(self, "checker_initiator_tag", None) is None:
 
1569
2193
        if self.enabled:
 
1570
2194
            # Reschedule checker run
 
1571
 
            gobject.source_remove(self.checker_initiator_tag)
 
1572
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1573
 
                                          (value, self.start_checker))
 
1574
 
            self.start_checker()    # Start one now, too
 
 
2195
            GLib.source_remove(self.checker_initiator_tag)
 
 
2196
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2197
                value, self.start_checker)
 
 
2198
            self.start_checker()  # Start one now, too
 
1576
2200
    # Checker - property
 
1577
 
    @dbus_service_property(_interface, signature="s",
 
 
2201
    @dbus_service_property(_interface,
 
1578
2203
                           access="readwrite")
 
1579
2204
    def Checker_dbus_property(self, value=None):
 
1580
2205
        if value is None:       # get
 
1581
2206
            return dbus.String(self.checker_command)
 
1582
 
        self.checker_command = unicode(value)
 
 
2207
        self.checker_command = str(value)
 
1584
2209
    # CheckerRunning - property
 
1585
 
    @dbus_service_property(_interface, signature="b",
 
 
2210
    @dbus_service_property(_interface,
 
1586
2212
                           access="readwrite")
 
1587
2213
    def CheckerRunning_dbus_property(self, value=None):
 
1588
2214
        if value is None:       # get
 
 
1635
2271
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1636
2272
    """A class to handle client connections.
 
1638
2274
    Instantiated once for each connection to handle it.
 
1639
2275
    Note: This will run in its own forked process."""
 
1641
2277
    def handle(self):
 
1642
2278
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1643
2279
            logger.info("TCP connection from: %s",
 
1644
 
                        unicode(self.client_address))
 
 
2280
                        str(self.client_address))
 
1645
2281
            logger.debug("Pipe FD: %d",
 
1646
2282
                         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",
 
 
2284
            session = gnutls.ClientSession(self.request)
 
 
2286
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2287
            #                       "+AES-256-CBC", "+SHA1",
 
 
2288
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1662
2290
            # Use a fallback default, since this MUST be set.
 
1663
2291
            priority = self.server.gnutls_priority
 
1664
2292
            if priority is None:
 
1665
2293
                priority = "NORMAL"
 
1666
 
            (gnutls.library.functions
 
1667
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2294
            gnutls.priority_set_direct(session._c_object,
 
 
2295
                                       priority.encode("utf-8"),
 
1670
2298
            # Start communication using the Mandos protocol
 
1671
2299
            # Get protocol number
 
1672
2300
            line = self.request.makefile().readline()
 
1673
2301
            logger.debug("Protocol version: %r", line)
 
1675
2303
                if int(line.strip().split()[0]) > 1:
 
 
2304
                    raise RuntimeError(line)
 
1677
2305
            except (ValueError, IndexError, RuntimeError) as error:
 
1678
2306
                logger.error("Unknown protocol version: %s", error)
 
1681
2309
            # Start GnuTLS connection
 
1683
2311
                session.handshake()
 
1684
 
            except gnutls.errors.GNUTLSError as error:
 
 
2312
            except gnutls.Error as error:
 
1685
2313
                logger.warning("Handshake failed: %s", error)
 
1686
2314
                # Do not run session.bye() here: the session is not
 
1687
2315
                # established.  Just abandon the request.
 
1689
2317
            logger.debug("Handshake succeeded")
 
1691
2319
            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,
 
 
2321
                if gnutls.has_rawpk:
 
 
2324
                        key_id = self.key_id(
 
 
2325
                            self.peer_certificate(session))
 
 
2326
                    except (TypeError, gnutls.Error) as error:
 
 
2327
                        logger.warning("Bad certificate: %s", error)
 
 
2329
                    logger.debug("Key ID: %s", key_id)
 
 
2334
                        fpr = self.fingerprint(
 
 
2335
                            self.peer_certificate(session))
 
 
2336
                    except (TypeError, gnutls.Error) as error:
 
 
2337
                        logger.warning("Bad certificate: %s", error)
 
 
2339
                    logger.debug("Fingerprint: %s", fpr)
 
 
2342
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1704
2343
                                         self.client_address)
 
1705
2344
                except KeyError:
 
1708
2347
                if client.approval_delay:
 
1709
2348
                    delay = client.approval_delay
 
1710
2349
                    client.approvals_pending += 1
 
1711
2350
                    approval_required = True
 
1714
2353
                    if not client.enabled:
 
1715
2354
                        logger.info("Client %s is disabled",
 
1717
2356
                        if self.server.use_dbus:
 
1718
2357
                            # Emit D-Bus signal
 
1719
2358
                            client.Rejected("Disabled")
 
1722
2361
                    if client.approved or not client.approval_delay:
 
1723
 
                        #We are approved or approval is disabled
 
 
2362
                        # We are approved or approval is disabled
 
1725
2364
                    elif client.approved is None:
 
1726
2365
                        logger.info("Client %s needs approval",
 
 
1761
2398
                        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))
 
 
2401
                    session.send(client.secret)
 
 
2402
                except gnutls.Error as error:
 
 
2403
                    logger.warning("gnutls send failed",
 
1776
2407
                logger.info("Sending secret to %s", client.name)
 
1777
2408
                # bump the timeout using extended_timeout
 
1778
2409
                client.bump_timeout(client.extended_timeout)
 
1779
2410
                if self.server.use_dbus:
 
1780
2411
                    # Emit D-Bus signal
 
1781
2412
                    client.GotSecret()
 
1784
2415
                if approval_required:
 
1785
2416
                    client.approvals_pending -= 1
 
1788
 
                except gnutls.errors.GNUTLSError as error:
 
 
2419
                except gnutls.Error as error:
 
1789
2420
                    logger.warning("GnuTLS bye failed",
 
1790
2421
                                   exc_info=error)
 
1793
2424
    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
 
 
2425
        "Return the peer's certificate as a bytestring"
 
 
2427
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2429
        except AttributeError:
 
 
2430
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2431
        if gnutls.has_rawpk:
 
 
2432
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2434
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2435
        # If not a valid certificate type...
 
 
2436
        if cert_type not in valid_cert_types:
 
 
2437
            logger.info("Cert type %r not in %r", cert_type,
 
 
2439
            # ...return invalid data
 
1801
2441
        list_size = ctypes.c_uint(1)
 
1802
 
        cert_list = (gnutls.library.functions
 
1803
 
                     .gnutls_certificate_get_peers
 
 
2442
        cert_list = (gnutls.certificate_get_peers
 
1804
2443
                     (session._c_object, ctypes.byref(list_size)))
 
1805
2444
        if not bool(cert_list) and list_size.value != 0:
 
1806
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2445
            raise gnutls.Error("error getting peer certificate")
 
1808
2446
        if list_size.value == 0:
 
1810
2448
        cert = cert_list[0]
 
1811
2449
        return ctypes.string_at(cert.data, cert.size)
 
 
2452
    def key_id(certificate):
 
 
2453
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2454
        # New GnuTLS "datum" with the public key
 
 
2455
        datum = gnutls.datum_t(
 
 
2456
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2457
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2458
            ctypes.c_uint(len(certificate)))
 
 
2459
        # XXX all these need to be created in the gnutls "module"
 
 
2460
        # New empty GnuTLS certificate
 
 
2461
        pubkey = gnutls.pubkey_t()
 
 
2462
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2463
        # Import the raw public key into the certificate
 
 
2464
        gnutls.pubkey_import(pubkey,
 
 
2465
                             ctypes.byref(datum),
 
 
2466
                             gnutls.X509_FMT_DER)
 
 
2467
        # New buffer for the key ID
 
 
2468
        buf = ctypes.create_string_buffer(32)
 
 
2469
        buf_len = ctypes.c_size_t(len(buf))
 
 
2470
        # Get the key ID from the raw public key into the buffer
 
 
2471
        gnutls.pubkey_get_key_id(pubkey,
 
 
2472
                                 gnutls.KEYID_USE_SHA256,
 
 
2473
                                 ctypes.cast(ctypes.byref(buf),
 
 
2474
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2475
                                 ctypes.byref(buf_len))
 
 
2476
        # Deinit the certificate
 
 
2477
        gnutls.pubkey_deinit(pubkey)
 
 
2479
        # Convert the buffer to a Python bytestring
 
 
2480
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2481
        # Convert the bytestring to hexadecimal notation
 
 
2482
        hex_key_id = binascii.hexlify(key_id).upper()
 
1814
2486
    def fingerprint(openpgp):
 
1815
2487
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1816
2488
        # 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))))
 
 
2489
        datum = gnutls.datum_t(
 
 
2490
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2491
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2492
            ctypes.c_uint(len(openpgp)))
 
1822
2493
        # 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)))
 
 
2494
        crt = gnutls.openpgp_crt_t()
 
 
2495
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1826
2496
        # 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))
 
 
2497
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2498
                                  gnutls.OPENPGP_FMT_RAW)
 
1831
2499
        # Verify the self signature in the key
 
1832
2500
        crtverify = ctypes.c_uint()
 
1833
 
        (gnutls.library.functions
 
1834
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1835
 
                                         ctypes.byref(crtverify)))
 
 
2501
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2502
                                       ctypes.byref(crtverify))
 
1836
2503
        if crtverify.value != 0:
 
1837
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1838
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2504
            gnutls.openpgp_crt_deinit(crt)
 
 
2505
            raise gnutls.CertificateSecurityError(code
 
1840
2507
        # New buffer for the fingerprint
 
1841
2508
        buf = ctypes.create_string_buffer(20)
 
1842
2509
        buf_len = ctypes.c_size_t()
 
1843
2510
        # 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)))
 
 
2511
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2512
                                           ctypes.byref(buf_len))
 
1847
2513
        # Deinit the certificate
 
1848
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2514
        gnutls.openpgp_crt_deinit(crt)
 
1849
2515
        # Convert the buffer to a Python bytestring
 
1850
2516
        fpr = ctypes.string_at(buf, buf_len.value)
 
1851
2517
        # Convert the bytestring to hexadecimal notation
 
 
1934
2606
        # socket_wrapper(), if socketfd was set.
 
1935
2607
        socketserver.TCPServer.__init__(self, server_address,
 
1936
2608
                                        RequestHandlerClass)
 
1938
2610
    def server_bind(self):
 
1939
2611
        """This overrides the normal server_bind() function
 
1940
2612
        to bind to an interface if one was specified, and also NOT to
 
1941
2613
        bind to an address or port if they were not specified."""
 
 
2614
        global SO_BINDTODEVICE
 
1942
2615
        if self.interface is not None:
 
1943
2616
            if SO_BINDTODEVICE is None:
 
1944
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1945
 
                             " cannot bind to interface %s",
 
1949
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1953
 
                except socket.error as error:
 
1954
 
                    if error.errno == errno.EPERM:
 
1955
 
                        logger.error("No permission to"
 
1956
 
                                     " bind to interface %s",
 
1958
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1959
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1960
 
                                     " cannot bind to interface %s",
 
1962
 
                    elif error.errno == errno.ENODEV:
 
1963
 
                        logger.error("Interface %s does not"
 
1964
 
                                     " exist, cannot bind",
 
 
2617
                # Fall back to a hard-coded value which seems to be
 
 
2619
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2620
                SO_BINDTODEVICE = 25
 
 
2622
                self.socket.setsockopt(
 
 
2623
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2624
                    (self.interface + "\0").encode("utf-8"))
 
 
2625
            except socket.error as error:
 
 
2626
                if error.errno == errno.EPERM:
 
 
2627
                    logger.error("No permission to bind to"
 
 
2628
                                 " interface %s", self.interface)
 
 
2629
                elif error.errno == errno.ENOPROTOOPT:
 
 
2630
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2631
                                 " cannot bind to interface %s",
 
 
2633
                elif error.errno == errno.ENODEV:
 
 
2634
                    logger.error("Interface %s does not exist,"
 
 
2635
                                 " cannot bind", self.interface)
 
1968
2638
        # Only bind(2) the socket if we really need to.
 
1969
2639
        if self.server_address[0] or self.server_address[1]:
 
 
2640
            if self.server_address[1]:
 
 
2641
                self.allow_reuse_address = True
 
1970
2642
            if not self.server_address[0]:
 
1971
2643
                if self.address_family == socket.AF_INET6:
 
1972
 
                    any_address = "::" # in6addr_any
 
 
2644
                    any_address = "::"  # in6addr_any
 
1974
 
                    any_address = socket.INADDR_ANY
 
 
2646
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1975
2647
                self.server_address = (any_address,
 
1976
2648
                                       self.server_address[1])
 
1977
2649
            elif not self.server_address[1]:
 
1978
 
                self.server_address = (self.server_address[0],
 
 
2650
                self.server_address = (self.server_address[0], 0)
 
1980
2651
#                 if self.interface:
 
1981
2652
#                     self.server_address = (self.server_address[0],
 
 
2007
2683
        self.gnutls_priority = gnutls_priority
 
2008
2684
        IPv6_TCPServer.__init__(self, server_address,
 
2009
2685
                                RequestHandlerClass,
 
2010
 
                                interface = interface,
 
2011
 
                                use_ipv6 = use_ipv6,
 
2012
 
                                socketfd = socketfd)
 
 
2686
                                interface=interface,
 
2013
2690
    def server_activate(self):
 
2014
2691
        if self.enabled:
 
2015
2692
            return socketserver.TCPServer.server_activate(self)
 
2017
2694
    def enable(self):
 
2018
2695
        self.enabled = True
 
2020
2697
    def add_pipe(self, parent_pipe, proc):
 
2021
2698
        # 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):
 
 
2700
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2701
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2702
            functools.partial(self.handle_ipc,
 
 
2703
                              parent_pipe=parent_pipe,
 
 
2706
    def handle_ipc(self, source, condition,
 
 
2709
                   client_object=None):
 
2031
2710
        # error, or the other end of multiprocessing.Pipe has closed
 
2032
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2711
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2033
2712
            # Wait for other process to exit
 
2037
2716
        # Read a request from the child
 
2038
2717
        request = parent_pipe.recv()
 
2039
2718
        command = request[0]
 
2041
2720
        if command == 'init':
 
2043
 
            address = request[2]
 
2045
 
            for c in self.clients.itervalues():
 
2046
 
                if c.fingerprint == fpr:
 
 
2721
            key_id = request[1].decode("ascii")
 
 
2722
            fpr = request[2].decode("ascii")
 
 
2723
            address = request[3]
 
 
2725
            for c in self.clients.values():
 
 
2726
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2728
                if key_id and c.key_id == key_id:
 
 
2731
                if fpr and c.fingerprint == fpr:
 
2050
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2051
 
                            "dress: %s", fpr, address)
 
 
2735
                logger.info("Client not found for key ID: %s, address"
 
 
2736
                            ": %s", key_id or fpr, address)
 
2052
2737
                if self.use_dbus:
 
2053
2738
                    # Emit D-Bus signal
 
2054
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2739
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2056
2741
                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,
 
 
2745
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2746
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2747
                functools.partial(self.handle_ipc,
 
 
2748
                                  parent_pipe=parent_pipe,
 
 
2750
                                  client_object=client))
 
2067
2751
            parent_pipe.send(True)
 
2068
2752
            # remove the old hook in favor of the new above hook on
 
 
2072
2756
            funcname = request[1]
 
2073
2757
            args = request[2]
 
2074
2758
            kwargs = request[3]
 
2076
2760
            parent_pipe.send(('data', getattr(client_object,
 
2077
2761
                                              funcname)(*args,
 
2080
2764
        if command == 'getattr':
 
2081
2765
            attrname = request[1]
 
2082
 
            if callable(client_object.__getattribute__(attrname)):
 
2083
 
                parent_pipe.send(('function',))
 
 
2766
            if isinstance(client_object.__getattribute__(attrname),
 
 
2767
                          collections.abc.Callable):
 
 
2768
                parent_pipe.send(('function', ))
 
2085
 
                parent_pipe.send(('data', client_object
 
2086
 
                                  .__getattribute__(attrname)))
 
 
2771
                    'data', client_object.__getattribute__(attrname)))
 
2088
2773
        if command == 'setattr':
 
2089
2774
            attrname = request[1]
 
2090
2775
            value = request[2]
 
2091
2776
            setattr(client_object, attrname, value)
 
 
2781
def rfc3339_duration_to_delta(duration):
 
 
2782
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2784
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
 
2786
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
 
2788
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
 
2790
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
 
2792
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
 
2794
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
 
2796
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
 
2800
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2801
    # possible - there would have to be multiple places for the same
 
 
2802
    # values, like seconds.  The current code, while more esoteric, is
 
 
2803
    # cleaner without depending on a parsing library.  If Python had a
 
 
2804
    # built-in library for parsing we would use it, but we'd like to
 
 
2805
    # avoid excessive use of external libraries.
 
 
2807
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2808
    Token = collections.namedtuple("Token", (
 
 
2809
        "regexp",  # To match token; if "value" is not None, must have
 
 
2810
                   # a "group" containing digits
 
 
2811
        "value",   # datetime.timedelta or None
 
 
2812
        "followers"))           # Tokens valid after this token
 
 
2813
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2814
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2815
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2816
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2817
                         datetime.timedelta(seconds=1),
 
 
2818
                         frozenset((token_end, )))
 
 
2819
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2820
                         datetime.timedelta(minutes=1),
 
 
2821
                         frozenset((token_second, token_end)))
 
 
2822
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2823
                       datetime.timedelta(hours=1),
 
 
2824
                       frozenset((token_minute, token_end)))
 
 
2825
    token_time = Token(re.compile(r"T"),
 
 
2827
                       frozenset((token_hour, token_minute,
 
 
2829
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2830
                      datetime.timedelta(days=1),
 
 
2831
                      frozenset((token_time, token_end)))
 
 
2832
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2833
                        datetime.timedelta(weeks=4),
 
 
2834
                        frozenset((token_day, token_end)))
 
 
2835
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2836
                       datetime.timedelta(weeks=52),
 
 
2837
                       frozenset((token_month, token_end)))
 
 
2838
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2839
                       datetime.timedelta(weeks=1),
 
 
2840
                       frozenset((token_end, )))
 
 
2841
    token_duration = Token(re.compile(r"P"), None,
 
 
2842
                           frozenset((token_year, token_month,
 
 
2843
                                      token_day, token_time,
 
 
2845
    # Define starting values:
 
 
2847
    value = datetime.timedelta()
 
 
2849
    # Following valid tokens
 
 
2850
    followers = frozenset((token_duration, ))
 
 
2851
    # String left to parse
 
 
2853
    # Loop until end token is found
 
 
2854
    while found_token is not token_end:
 
 
2855
        # Search for any currently valid tokens
 
 
2856
        for token in followers:
 
 
2857
            match = token.regexp.match(s)
 
 
2858
            if match is not None:
 
 
2860
                if token.value is not None:
 
 
2861
                    # Value found, parse digits
 
 
2862
                    factor = int(match.group(1), 10)
 
 
2863
                    # Add to value so far
 
 
2864
                    value += factor * token.value
 
 
2865
                # Strip token from string
 
 
2866
                s = token.regexp.sub("", s, 1)
 
 
2869
                # Set valid next tokens
 
 
2870
                followers = found_token.followers
 
 
2873
            # No currently valid tokens were found
 
 
2874
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2096
2880
def string_to_delta(interval):
 
2097
2881
    """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)
 
 
2883
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
 
2885
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
 
2887
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
 
2889
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
 
2891
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
 
2893
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
 
2898
        return rfc3339_duration_to_delta(interval)
 
2112
2902
    timevalue = datetime.timedelta(0)
 
2113
2903
    for s in interval.split():
 
2115
 
            suffix = unicode(s[-1])
 
2116
2906
            value = int(s[:-1])
 
2117
2907
            if suffix == "d":
 
2118
2908
                delta = datetime.timedelta(value)
 
 
2191
2980
    parser.add_argument("--no-dbus", action="store_false",
 
2192
2981
                        dest="use_dbus", help="Do not provide D-Bus"
 
2193
 
                        " system bus interface")
 
 
2982
                        " system bus interface", default=None)
 
2194
2983
    parser.add_argument("--no-ipv6", action="store_false",
 
2195
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2984
                        dest="use_ipv6", help="Do not use IPv6",
 
2196
2986
    parser.add_argument("--no-restore", action="store_false",
 
2197
2987
                        dest="restore", help="Do not restore stored"
 
 
2988
                        " state", default=None)
 
2199
2989
    parser.add_argument("--socket", type=int,
 
2200
2990
                        help="Specify a file descriptor to a network"
 
2201
2991
                        " socket to use instead of creating one")
 
2202
2992
    parser.add_argument("--statedir", metavar="DIR",
 
2203
2993
                        help="Directory to save/restore state in")
 
 
2994
    parser.add_argument("--foreground", action="store_true",
 
 
2995
                        help="Run in foreground", default=None)
 
 
2996
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2997
                        dest="zeroconf", help="Do not use Zeroconf",
 
2205
3000
    options = parser.parse_args()
 
2212
3002
    # 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"
 
 
3003
    if gnutls.has_rawpk:
 
 
3004
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
3005
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
3007
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
3008
                    ":+SIGN-DSA-SHA256")
 
 
3009
    server_defaults = {"interface": "",
 
 
3013
                       "priority": priority,
 
 
3014
                       "servicename": "Mandos",
 
 
3020
                       "statedir": "/var/lib/mandos",
 
 
3021
                       "foreground": "False",
 
2228
3026
    # Parse config file for server-global settings
 
2229
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3027
    server_config = configparser.ConfigParser(server_defaults)
 
2230
3028
    del server_defaults
 
2231
 
    server_config.read(os.path.join(options.configdir,
 
2233
 
    # Convert the SafeConfigParser object to a dict
 
 
3029
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3030
    # Convert the ConfigParser object to a dict
 
2234
3031
    server_settings = server_config.defaults()
 
2235
3032
    # Use the appropriate methods on the non-string config options
 
2236
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3033
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3034
                   "foreground", "zeroconf"):
 
2237
3035
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2239
3037
    if server_settings["port"]:
 
 
 
3153
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2336
3155
    except OSError as error:
 
 
3156
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3157
                       .format(uid, gid, os.strerror(error.errno)))
 
2337
3158
        if error.errno != errno.EPERM:
 
2341
3162
        # Enable all possible GnuTLS debugging
 
2343
3164
        # "Use a log level over 10 to enable all debugging options."
 
2344
3165
        # - GnuTLS manual
 
2345
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2347
 
        @gnutls.library.types.gnutls_log_func
 
 
3166
        gnutls.global_set_log_level(11)
 
2348
3169
        def debug_gnutls(level, string):
 
2349
3170
            logger.debug("GnuTLS: %s", string[:-1])
 
2351
 
        (gnutls.library.functions
 
2352
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3172
        gnutls.global_set_log_function(debug_gnutls)
 
2354
3174
        # Redirect stdin so all checkers get /dev/null
 
2355
3175
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2356
3176
        os.dup2(null, sys.stdin.fileno())
 
2360
3180
    # Need to fork before connecting to D-Bus
 
2362
3182
        # 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()
 
 
3185
    if gi.version_info < (3, 10, 2):
 
 
3186
        # multiprocessing will use threads, so before we use GLib we
 
 
3187
        # need to inform GLib that threads will be used.
 
2369
3190
    global main_loop
 
2370
3191
    # From the Avahi example code
 
2371
3192
    DBusGMainLoop(set_as_default=True)
 
2372
 
    main_loop = gobject.MainLoop()
 
 
3193
    main_loop = GLib.MainLoop()
 
2373
3194
    bus = dbus.SystemBus()
 
2374
3195
    # End of Avahi example code
 
2377
3198
            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:
 
 
3201
            old_bus_name = dbus.service.BusName(
 
 
3202
                "se.bsnet.fukt.Mandos", bus,
 
 
3204
        except dbus.exceptions.DBusException as e:
 
2383
3205
            logger.error("Disabling D-Bus:", exc_info=e)
 
2384
3206
            use_dbus = False
 
2385
3207
            server_settings["use_dbus"] = False
 
2386
3208
            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"])))
 
 
3210
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3211
        service = AvahiServiceToSyslog(
 
 
3212
            name=server_settings["servicename"],
 
 
3213
            servicetype="_mandos._tcp",
 
 
3216
        if server_settings["interface"]:
 
 
3217
            service.interface = if_nametoindex(
 
 
3218
                server_settings["interface"].encode("utf-8"))
 
2396
3220
    global multiprocessing_manager
 
2397
3221
    multiprocessing_manager = multiprocessing.Manager()
 
2399
3223
    client_class = Client
 
2401
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3225
        client_class = functools.partial(ClientDBus, bus=bus)
 
2403
3227
    client_settings = Client.config_parser(client_config)
 
2404
3228
    old_client_settings = {}
 
2405
3229
    clients_data = {}
 
 
3231
    # This is used to redirect stdout and stderr for checker processes
 
 
3233
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3234
    # Only used if server is running in foreground but not in debug
 
 
3236
    if debug or not foreground:
 
2407
3239
    # Get client data and settings from last running state.
 
2408
3240
    if server_settings["restore"]:
 
2410
3242
            with open(stored_state_path, "rb") as stored_state:
 
2411
 
                clients_data, old_client_settings = (pickle.load
 
 
3243
                if sys.version_info.major == 2:
 
 
3244
                    clients_data, old_client_settings = pickle.load(
 
 
3247
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3248
                        pickle.load(stored_state, encoding="bytes"))
 
 
3249
                    #   Fix bytes to strings
 
 
3252
                    clients_data = {(key.decode("utf-8")
 
 
3253
                                     if isinstance(key, bytes)
 
 
3256
                                    bytes_clients_data.items()}
 
 
3257
                    del bytes_clients_data
 
 
3258
                    for key in clients_data:
 
 
3259
                        value = {(k.decode("utf-8")
 
 
3260
                                  if isinstance(k, bytes) else k): v
 
 
3262
                                 clients_data[key].items()}
 
 
3263
                        clients_data[key] = value
 
 
3265
                        value["client_structure"] = [
 
 
3267
                             if isinstance(s, bytes)
 
 
3269
                            value["client_structure"]]
 
 
3270
                        # .name, .host, and .checker_command
 
 
3271
                        for k in ("name", "host", "checker_command"):
 
 
3272
                            if isinstance(value[k], bytes):
 
 
3273
                                value[k] = value[k].decode("utf-8")
 
 
3274
                        if "key_id" not in value:
 
 
3275
                            value["key_id"] = ""
 
 
3276
                        elif "fingerprint" not in value:
 
 
3277
                            value["fingerprint"] = ""
 
 
3278
                    #  old_client_settings
 
 
3280
                    old_client_settings = {
 
 
3281
                        (key.decode("utf-8")
 
 
3282
                         if isinstance(key, bytes)
 
 
3285
                        bytes_old_client_settings.items()}
 
 
3286
                    del bytes_old_client_settings
 
 
3287
                    # .host and .checker_command
 
 
3288
                    for value in old_client_settings.values():
 
 
3289
                        for attribute in ("host", "checker_command"):
 
 
3290
                            if isinstance(value[attribute], bytes):
 
 
3291
                                value[attribute] = (value[attribute]
 
2413
3293
            os.remove(stored_state_path)
 
2414
3294
        except IOError as e:
 
2415
3295
            if e.errno == errno.ENOENT:
 
2416
 
                logger.warning("Could not load persistent state: {0}"
 
2417
 
                                .format(os.strerror(e.errno)))
 
 
3296
                logger.warning("Could not load persistent state:"
 
 
3297
                               " {}".format(os.strerror(e.errno)))
 
2419
3299
                logger.critical("Could not load persistent state:",
 
2422
3302
        except EOFError as e:
 
2423
3303
            logger.warning("Could not load persistent state: "
 
2424
 
                           "EOFError:", exc_info=e)
 
2426
3307
    with PGPEngine() as pgp:
 
2427
 
        for client_name, client in clients_data.iteritems():
 
 
3308
        for client_name, client in clients_data.items():
 
 
3309
            # Skip removed clients
 
 
3310
            if client_name not in client_settings:
 
2428
3313
            # Decide which value to use after restoring saved state.
 
2429
3314
            # We have three different values: Old config file,
 
2430
3315
            # new config file, and saved state.
 
 
2488
3373
    for client_name in (set(client_settings)
 
2489
3374
                        - set(old_client_settings)):
 
2490
3375
        clients_data[client_name] = client_settings[client_name]
 
2492
3377
    # Create all client objects
 
2493
 
    for client_name, client in clients_data.iteritems():
 
 
3378
    for client_name, client in clients_data.items():
 
2494
3379
        tcp_server.clients[client_name] = client_class(
 
2495
 
            name = client_name, settings = client)
 
 
3382
            server_settings=server_settings)
 
2497
3384
    if not tcp_server.clients:
 
2498
3385
        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
 
 
3388
        if pidfile is not None:
 
 
3392
                    print(pid, file=pidfile)
 
 
3394
                logger.error("Could not write to file %r with PID %d",
 
2512
3397
        del pidfilename
 
2514
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2515
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3399
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3400
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3401
                             lambda: main_loop.quit() and False)
 
2518
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2519
 
                                        "se.bsnet.fukt.Mandos"})
 
2520
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3405
        @alternate_dbus_interfaces(
 
 
3406
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3407
        class MandosDBusService(DBusObjectWithObjectManager):
 
2521
3408
            """A D-Bus proxy object"""
 
2522
3410
            def __init__(self):
 
2523
3411
                dbus.service.Object.__init__(self, bus, "/")
 
2524
3413
            _interface = "se.recompile.Mandos"
 
2526
 
            @dbus_interface_annotations(_interface)
 
2528
 
                return { "org.freedesktop.DBus.Property"
 
2529
 
                         ".EmitsChangedSignal":
 
2532
3415
            @dbus.service.signal(_interface, signature="o")
 
2533
3416
            def ClientAdded(self, objpath):
 
2537
3420
            @dbus.service.signal(_interface, signature="ss")
 
2538
 
            def ClientNotFound(self, fingerprint, address):
 
 
3421
            def ClientNotFound(self, key_id, address):
 
 
3425
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2542
3427
            @dbus.service.signal(_interface, signature="os")
 
2543
3428
            def ClientRemoved(self, objpath, name):
 
 
3432
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2547
3434
            @dbus.service.method(_interface, out_signature="ao")
 
2548
3435
            def GetAllClients(self):
 
2550
 
                return dbus.Array(c.dbus_object_path
 
2552
 
                                  tcp_server.clients.itervalues())
 
 
3437
                return dbus.Array(c.dbus_object_path for c in
 
 
3438
                                  tcp_server.clients.values())
 
 
3440
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2554
3442
            @dbus.service.method(_interface,
 
2555
3443
                                 out_signature="a{oa{sv}}")
 
2556
3444
            def GetAllClientsWithProperties(self):
 
2558
3446
                return dbus.Dictionary(
 
2559
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2560
 
                     for c in tcp_server.clients.itervalues()),
 
 
3447
                    {c.dbus_object_path: c.GetAll(
 
 
3448
                        "se.recompile.Mandos.Client")
 
 
3449
                     for c in tcp_server.clients.values()},
 
2561
3450
                    signature="oa{sv}")
 
2563
3452
            @dbus.service.method(_interface, in_signature="o")
 
2564
3453
            def RemoveClient(self, object_path):
 
2566
 
                for c in tcp_server.clients.itervalues():
 
 
3455
                for c in tcp_server.clients.values():
 
2567
3456
                    if c.dbus_object_path == object_path:
 
2568
3457
                        del tcp_server.clients[c.name]
 
2569
3458
                        c.remove_from_connection()
 
2570
 
                        # Don't signal anything except ClientRemoved
 
 
3459
                        # Don't signal the disabling
 
2571
3460
                        c.disable(quiet=True)
 
2573
 
                        self.ClientRemoved(object_path, c.name)
 
 
3461
                        # Emit D-Bus signal for removal
 
 
3462
                        self.client_removed_signal(c)
 
2575
3464
                raise KeyError(object_path)
 
 
3468
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3469
                                 out_signature="a{oa{sa{sv}}}")
 
 
3470
            def GetManagedObjects(self):
 
 
3472
                return dbus.Dictionary(
 
 
3473
                    {client.dbus_object_path:
 
 
3475
                         {interface: client.GetAll(interface)
 
 
3477
                          client._get_all_interface_names()})
 
 
3478
                     for client in tcp_server.clients.values()})
 
 
3480
            def client_added_signal(self, client):
 
 
3481
                """Send the new standard signal and the old signal"""
 
 
3483
                    # New standard signal
 
 
3484
                    self.InterfacesAdded(
 
 
3485
                        client.dbus_object_path,
 
 
3487
                            {interface: client.GetAll(interface)
 
 
3489
                             client._get_all_interface_names()}))
 
 
3491
                    self.ClientAdded(client.dbus_object_path)
 
 
3493
            def client_removed_signal(self, client):
 
 
3494
                """Send the new standard signal and the old signal"""
 
 
3496
                    # New standard signal
 
 
3497
                    self.InterfacesRemoved(
 
 
3498
                        client.dbus_object_path,
 
 
3499
                        client._get_all_interface_names())
 
 
3501
                    self.ClientRemoved(client.dbus_object_path,
 
2579
3504
        mandos_dbus_service = MandosDBusService()
 
 
3506
    # Save modules to variables to exempt the modules from being
 
 
3507
    # unloaded before the function registered with atexit() is run.
 
 
3508
    mp = multiprocessing
 
2582
3512
        "Cleanup function; run on exit"
 
2585
 
        multiprocessing.active_children()
 
 
3516
        mp.active_children()
 
2586
3518
        if not (tcp_server.clients or client_settings):
 
2589
3521
        # Store client before exiting. Secrets are encrypted with key
 
2590
3522
        # based on what config file has. If config file is
 
2591
3523
        # removed/edited, old secret will thus be unrecovable.
 
2593
3525
        with PGPEngine() as pgp:
 
2594
 
            for client in tcp_server.clients.itervalues():
 
 
3526
            for client in tcp_server.clients.values():
 
2595
3527
                key = client_settings[client.name]["secret"]
 
2596
3528
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2598
3530
                client_dict = {}
 
2600
3532
                # 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)):
 
 
3534
                exclude = {"bus", "changedstate", "secret",
 
 
3535
                           "checker", "server_settings"}
 
 
3536
                for name, typ in inspect.getmembers(dbus.service
 
2606
3538
                    exclude.add(name)
 
2608
3540
                client_dict["encrypted_secret"] = (client
 
2609
3541
                                                   .encrypted_secret)
 
2610
3542
                for attr in client.client_structure:
 
2611
3543
                    if attr not in exclude:
 
2612
3544
                        client_dict[attr] = getattr(client, attr)
 
2614
3546
                clients[client.name] = client_dict
 
2615
3547
                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
 
 
3550
            with tempfile.NamedTemporaryFile(
 
 
3554
                    dir=os.path.dirname(stored_state_path),
 
 
3555
                    delete=False) as stored_state:
 
 
3556
                pickle.dump((clients, client_settings), stored_state,
 
 
3558
                tempname = stored_state.name
 
2624
3559
            os.rename(tempname, stored_state_path)
 
2625
3560
        except (IOError, OSError) as e: