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,
 
 
529
        syslogger.setFormatter(logging.Formatter(
 
 
530
            '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):
 
 
535
# Pretend that we have a GnuTLS module
 
 
537
    """This isn't so much a class as it is a module-like namespace."""
 
 
539
    library = ctypes.util.find_library("gnutls")
 
 
541
        library = ctypes.util.find_library("gnutls-deb0")
 
 
542
    _library = ctypes.cdll.LoadLibrary(library)
 
 
545
    # Unless otherwise indicated, the constants and types below are
 
 
546
    # all from the gnutls/gnutls.h C header file.
 
 
557
    E_NO_CERTIFICATE_FOUND = -49
 
 
562
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
 
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
566
    class session_int(ctypes.Structure):
 
 
568
    session_t = ctypes.POINTER(session_int)
 
 
570
    class certificate_credentials_st(ctypes.Structure):
 
 
572
    certificate_credentials_t = ctypes.POINTER(
 
 
573
        certificate_credentials_st)
 
 
574
    certificate_type_t = ctypes.c_int
 
 
576
    class datum_t(ctypes.Structure):
 
 
577
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
578
                    ('size', ctypes.c_uint)]
 
 
580
    class openpgp_crt_int(ctypes.Structure):
 
 
582
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
583
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
 
584
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
585
    credentials_type_t = ctypes.c_int
 
 
586
    transport_ptr_t = ctypes.c_void_p
 
 
587
    close_request_t = ctypes.c_int
 
 
590
    class Error(Exception):
 
 
591
        def __init__(self, message=None, code=None, args=()):
 
 
592
            # Default usage is by a message string, but if a return
 
 
593
            # code is passed, convert it to a string with
 
 
596
            if message is None and code is not None:
 
 
597
                message = gnutls.strerror(code)
 
 
598
            return super(gnutls.Error, self).__init__(
 
 
601
    class CertificateSecurityError(Error):
 
 
607
            self._c_object = gnutls.certificate_credentials_t()
 
 
608
            gnutls.certificate_allocate_credentials(
 
 
609
                ctypes.byref(self._c_object))
 
 
610
            self.type = gnutls.CRD_CERTIFICATE
 
 
613
            gnutls.certificate_free_credentials(self._c_object)
 
 
616
        def __init__(self, socket, credentials=None):
 
 
617
            self._c_object = gnutls.session_t()
 
 
618
            gnutls_flags = gnutls.CLIENT
 
 
619
            if gnutls.check_version(b"3.5.6"):
 
 
620
                gnutls_flags |= gnutls.NO_TICKETS
 
 
622
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
623
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
625
            gnutls.set_default_priority(self._c_object)
 
 
626
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
627
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
630
            if credentials is None:
 
 
631
                credentials = gnutls.Credentials()
 
 
632
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
633
                                   ctypes.cast(credentials._c_object,
 
 
635
            self.credentials = credentials
 
 
638
            gnutls.deinit(self._c_object)
 
 
641
            return gnutls.handshake(self._c_object)
 
 
643
        def send(self, data):
 
 
647
                data_len -= gnutls.record_send(self._c_object,
 
 
652
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
654
    # Error handling functions
 
 
655
    def _error_code(result):
 
 
656
        """A function to raise exceptions on errors, suitable
 
 
657
        for the 'restype' attribute on ctypes functions"""
 
 
660
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
661
            raise gnutls.CertificateSecurityError(code=result)
 
 
662
        raise gnutls.Error(code=result)
 
 
664
    def _retry_on_error(result, func, arguments):
 
 
665
        """A function to retry on some errors, suitable
 
 
666
        for the 'errcheck' attribute on ctypes functions"""
 
 
668
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
669
                return _error_code(result)
 
 
670
            result = func(*arguments)
 
 
673
    # Unless otherwise indicated, the function declarations below are
 
 
674
    # all from the gnutls/gnutls.h C header file.
 
 
677
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
678
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
679
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
680
    priority_set_direct.restype = _error_code
 
 
682
    init = _library.gnutls_init
 
 
683
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
684
    init.restype = _error_code
 
 
686
    set_default_priority = _library.gnutls_set_default_priority
 
 
687
    set_default_priority.argtypes = [session_t]
 
 
688
    set_default_priority.restype = _error_code
 
 
690
    record_send = _library.gnutls_record_send
 
 
691
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
693
    record_send.restype = ctypes.c_ssize_t
 
 
694
    record_send.errcheck = _retry_on_error
 
 
696
    certificate_allocate_credentials = (
 
 
697
        _library.gnutls_certificate_allocate_credentials)
 
 
698
    certificate_allocate_credentials.argtypes = [
 
 
699
        ctypes.POINTER(certificate_credentials_t)]
 
 
700
    certificate_allocate_credentials.restype = _error_code
 
 
702
    certificate_free_credentials = (
 
 
703
        _library.gnutls_certificate_free_credentials)
 
 
704
    certificate_free_credentials.argtypes = [
 
 
705
        certificate_credentials_t]
 
 
706
    certificate_free_credentials.restype = None
 
 
708
    handshake_set_private_extensions = (
 
 
709
        _library.gnutls_handshake_set_private_extensions)
 
 
710
    handshake_set_private_extensions.argtypes = [session_t,
 
 
712
    handshake_set_private_extensions.restype = None
 
 
714
    credentials_set = _library.gnutls_credentials_set
 
 
715
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
717
    credentials_set.restype = _error_code
 
 
719
    strerror = _library.gnutls_strerror
 
 
720
    strerror.argtypes = [ctypes.c_int]
 
 
721
    strerror.restype = ctypes.c_char_p
 
 
723
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
724
    certificate_type_get.argtypes = [session_t]
 
 
725
    certificate_type_get.restype = _error_code
 
 
727
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
728
    certificate_get_peers.argtypes = [session_t,
 
 
729
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
730
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
732
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
733
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
734
    global_set_log_level.restype = None
 
 
736
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
737
    global_set_log_function.argtypes = [log_func]
 
 
738
    global_set_log_function.restype = None
 
 
740
    deinit = _library.gnutls_deinit
 
 
741
    deinit.argtypes = [session_t]
 
 
742
    deinit.restype = None
 
 
744
    handshake = _library.gnutls_handshake
 
 
745
    handshake.argtypes = [session_t]
 
 
746
    handshake.restype = _error_code
 
 
747
    handshake.errcheck = _retry_on_error
 
 
749
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
750
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
751
    transport_set_ptr.restype = None
 
 
753
    bye = _library.gnutls_bye
 
 
754
    bye.argtypes = [session_t, close_request_t]
 
 
755
    bye.restype = _error_code
 
 
756
    bye.errcheck = _retry_on_error
 
 
758
    check_version = _library.gnutls_check_version
 
 
759
    check_version.argtypes = [ctypes.c_char_p]
 
 
760
    check_version.restype = ctypes.c_char_p
 
 
762
    _need_version = b"3.3.0"
 
 
763
    if check_version(_need_version) is None:
 
 
764
        raise self.Error("Needs GnuTLS {} or later"
 
 
765
                         .format(_need_version))
 
 
767
    _tls_rawpk_version = b"3.6.6"
 
 
768
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
772
        class pubkey_st(ctypes.Structure):
 
 
774
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
776
        x509_crt_fmt_t = ctypes.c_int
 
 
778
        # All the function declarations below are from
 
 
780
        pubkey_init = _library.gnutls_pubkey_init
 
 
781
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
782
        pubkey_init.restype = _error_code
 
 
784
        pubkey_import = _library.gnutls_pubkey_import
 
 
785
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
787
        pubkey_import.restype = _error_code
 
 
789
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
790
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
791
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
792
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
793
        pubkey_get_key_id.restype = _error_code
 
 
795
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
796
        pubkey_deinit.argtypes = [pubkey_t]
 
 
797
        pubkey_deinit.restype = None
 
 
799
        # All the function declarations below are from
 
 
802
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
803
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
804
        openpgp_crt_init.restype = _error_code
 
 
806
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
807
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
808
                                       ctypes.POINTER(datum_t),
 
 
810
        openpgp_crt_import.restype = _error_code
 
 
812
        openpgp_crt_verify_self = \
 
 
813
            _library.gnutls_openpgp_crt_verify_self
 
 
814
        openpgp_crt_verify_self.argtypes = [
 
 
817
            ctypes.POINTER(ctypes.c_uint),
 
 
819
        openpgp_crt_verify_self.restype = _error_code
 
 
821
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
822
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
823
        openpgp_crt_deinit.restype = None
 
 
825
        openpgp_crt_get_fingerprint = (
 
 
826
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
827
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
831
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
833
    if check_version(b"3.6.4"):
 
 
834
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
835
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
836
        certificate_type_get2.restype = _error_code
 
 
838
    # Remove non-public functions
 
 
839
    del _error_code, _retry_on_error
 
 
842
def call_pipe(connection,       # : multiprocessing.Connection
 
 
843
              func, *args, **kwargs):
 
 
844
    """This function is meant to be called by multiprocessing.Process
 
 
846
    This function runs func(*args, **kwargs), and writes the resulting
 
 
847
    return value on the provided multiprocessing.Connection.
 
 
849
    connection.send(func(*args, **kwargs))
 
402
854
    """A representation of a client host served by this server.
 
405
857
    approved:   bool(); 'None' if not yet approved/disapproved
 
406
858
    approval_delay: datetime.timedelta(); Time to wait for approval
 
407
859
    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
 
 
860
    checker: multiprocessing.Process(); a running checker process used
 
 
861
             to see if the client lives. 'None' if no process is
 
 
863
    checker_callback_tag: a GLib event source tag, or None
 
412
864
    checker_command: string; External command which is run to check
 
413
865
                     if client lives.  %() expansions are done at
 
414
866
                     runtime with vars(self) as dict, so that for
 
415
867
                     instance %(name)s can be used in the command.
 
416
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
868
    checker_initiator_tag: a GLib event source tag, or None
 
417
869
    created:    datetime.datetime(); (UTC) object creation
 
418
870
    client_structure: Object describing what attributes a client has
 
419
871
                      and is used for storing the client at exit
 
420
872
    current_checker_command: string; current running checker_command
 
421
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
873
    disable_initiator_tag: a GLib event source tag, or None
 
423
875
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
424
 
                 uniquely identify the client
 
 
876
                 uniquely identify an OpenPGP client
 
 
877
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
878
            a client using raw public keys
 
425
879
    host:       string; available for use by the checker command
 
426
880
    interval:   datetime.timedelta(); How often to start a new checker
 
427
881
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
590
1038
            logger.info("Disabling client %s", self.name)
 
591
1039
        if getattr(self, "disable_initiator_tag", None) is not None:
 
592
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1040
            GLib.source_remove(self.disable_initiator_tag)
 
593
1041
            self.disable_initiator_tag = None
 
594
1042
        self.expires = None
 
595
1043
        if getattr(self, "checker_initiator_tag", None) is not None:
 
596
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1044
            GLib.source_remove(self.checker_initiator_tag)
 
597
1045
            self.checker_initiator_tag = None
 
598
1046
        self.stop_checker()
 
599
1047
        self.enabled = False
 
601
1049
            self.send_changedstate()
 
602
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1050
        # Do not run this again if called by a GLib.timeout_add
 
605
1053
    def __del__(self):
 
608
1056
    def init_checker(self):
 
609
1057
        # Schedule a new checker to be started an 'interval' from now,
 
610
1058
        # and every interval from then on.
 
611
1059
        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(),
 
 
1060
            GLib.source_remove(self.checker_initiator_tag)
 
 
1061
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1062
            random.randrange(int(self.interval.total_seconds() * 1000
 
616
1065
        # Schedule a disable() when 'timeout' has passed
 
617
1066
        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(),
 
 
1067
            GLib.source_remove(self.disable_initiator_tag)
 
 
1068
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1069
            int(self.timeout.total_seconds() * 1000), self.disable)
 
622
1070
        # Also start a new checker *right now*.
 
623
1071
        self.start_checker()
 
625
 
    def checker_callback(self, pid, condition, command):
 
 
1073
    def checker_callback(self, source, condition, connection,
 
626
1075
        """The checker has completed, so take appropriate actions."""
 
 
1076
        # Read return code from connection (see call_pipe)
 
 
1077
        returncode = connection.recv()
 
 
1079
        if self.checker is not None:
 
627
1081
        self.checker_callback_tag = None
 
628
1082
        self.checker = None
 
629
 
        if os.WIFEXITED(condition):
 
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1085
            self.last_checker_status = returncode
 
 
1086
            self.last_checker_signal = None
 
631
1087
            if self.last_checker_status == 0:
 
632
1088
                logger.info("Checker for %(name)s succeeded",
 
634
1090
                self.checked_ok()
 
636
 
                logger.info("Checker for %(name)s failed",
 
 
1092
                logger.info("Checker for %(name)s failed", vars(self))
 
639
1094
            self.last_checker_status = -1
 
 
1095
            self.last_checker_signal = -returncode
 
640
1096
            logger.warning("Checker for %(name)s crashed?",
 
643
1100
    def checked_ok(self):
 
644
1101
        """Assert that the client has been seen, alive and well."""
 
645
1102
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
1103
        self.last_checker_status = 0
 
 
1104
        self.last_checker_signal = None
 
647
1105
        self.bump_timeout()
 
649
1107
    def bump_timeout(self, timeout=None):
 
650
1108
        """Bump up the timeout for this client."""
 
651
1109
        if timeout is None:
 
652
1110
            timeout = self.timeout
 
653
1111
        if self.disable_initiator_tag is not None:
 
654
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1112
            GLib.source_remove(self.disable_initiator_tag)
 
655
1113
            self.disable_initiator_tag = None
 
656
1114
        if getattr(self, "enabled", False):
 
657
 
            self.disable_initiator_tag = (gobject.timeout_add
 
658
 
                                          (timedelta_to_milliseconds
 
659
 
                                           (timeout), self.disable))
 
 
1115
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1116
                int(timeout.total_seconds() * 1000), self.disable)
 
660
1117
            self.expires = datetime.datetime.utcnow() + timeout
 
662
1119
    def need_approval(self):
 
663
1120
        self.last_approval_request = datetime.datetime.utcnow()
 
665
1122
    def start_checker(self):
 
666
1123
        """Start a new checker subprocess if one is not running.
 
668
1125
        If a checker already exists, leave it running and do
 
670
1127
        # The reason for not killing a running checker is that if we
 
 
675
1132
        # checkers alone, the checker would have to take more time
 
676
1133
        # 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)
 
 
1136
        if self.checker is not None and not self.checker.is_alive():
 
 
1137
            logger.warning("Checker was not alive; joining")
 
692
1140
        # Start a new checker if needed
 
693
1141
        if self.checker is None:
 
694
1142
            # Escape attributes for the shell
 
695
 
            escaped_attrs = dict(
 
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
 
                self.runtime_expansions)
 
 
1144
                attr: shlex.quote(str(getattr(self, attr)))
 
 
1145
                for attr in self.runtime_expansions}
 
700
1147
                command = self.checker_command % escaped_attrs
 
701
1148
            except TypeError as error:
 
702
1149
                logger.error('Could not format string "%s"',
 
703
 
                             self.checker_command, exc_info=error)
 
704
 
                return True # Try again later
 
 
1150
                             self.checker_command,
 
 
1152
                return True     # Try again later
 
705
1153
            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
 
 
1154
            logger.info("Starting checker %r for %s", command,
 
 
1156
            # We don't need to redirect stdout and stderr, since
 
 
1157
            # in normal mode, that is already done by daemon(),
 
 
1158
            # and in debug mode we don't want to.  (Stdin is
 
 
1159
            # always replaced by /dev/null.)
 
 
1160
            # The exception is when not debugging but nevertheless
 
 
1161
            # running in the foreground; use the previously
 
 
1163
            popen_args = {"close_fds": True,
 
 
1166
            if (not self.server_settings["debug"]
 
 
1167
                and self.server_settings["foreground"]):
 
 
1168
                popen_args.update({"stdout": wnull,
 
 
1170
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1171
            self.checker = multiprocessing.Process(
 
 
1173
                args=(pipe[1], subprocess.call, command),
 
 
1175
            self.checker.start()
 
 
1176
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1177
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
 
1178
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
 
1179
                self.checker_callback, pipe[0], command)
 
 
1180
        # Re-run this periodically if run by GLib.timeout_add
 
732
1183
    def stop_checker(self):
 
733
1184
        """Force the checker process, if any, to stop."""
 
734
1185
        if self.checker_callback_tag:
 
735
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1186
            GLib.source_remove(self.checker_callback_tag)
 
736
1187
            self.checker_callback_tag = None
 
737
1188
        if getattr(self, "checker", None) is None:
 
739
1190
        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
 
 
1191
        self.checker.terminate()
 
748
1192
        self.checker = None
 
751
 
def dbus_service_property(dbus_interface, signature="v",
 
752
 
                          access="readwrite", byte_arrays=False):
 
 
1195
def dbus_service_property(dbus_interface,
 
753
1199
    """Decorators for marking methods of a DBusObjectWithProperties to
 
754
1200
    become properties on the D-Bus.
 
756
1202
    The decorated method will be called with no arguments by "Get"
 
757
1203
    and with one argument by "Set".
 
759
1205
    The parameters, where they are supported, are the same as
 
760
1206
    dbus.service.method, except there is only "signature", since the
 
761
1207
    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.
 
 
1290
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1291
    """A D-Bus object with annotations.
 
 
1293
    Classes inheriting from this can use the dbus_annotations
 
 
1294
    decorator to add annotations to methods or signals.
 
846
1298
    def _is_dbus_thing(thing):
 
847
1299
        """Returns a function testing if an attribute is a D-Bus thing
 
849
1301
        If called like _is_dbus_thing("method") it returns a function
 
850
1302
        suitable for use as predicate to inspect.getmembers().
 
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1304
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
855
1307
    def _get_all_dbus_things(self, thing):
 
856
1308
        """Returns a generator of (name, attribute) pairs
 
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1310
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
860
1311
                 athing.__get__(self))
 
861
1312
                for cls in self.__class__.__mro__
 
862
1313
                for name, athing in
 
863
 
                inspect.getmembers(cls,
 
864
 
                                   self._is_dbus_thing(thing)))
 
 
1314
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1316
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1318
                         path_keyword='object_path',
 
 
1319
                         connection_keyword='connection')
 
 
1320
    def Introspect(self, object_path, connection):
 
 
1321
        """Overloading of standard D-Bus method.
 
 
1323
        Inserts annotation tags on methods and signals.
 
 
1325
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1328
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1330
            for if_tag in document.getElementsByTagName("interface"):
 
 
1331
                # Add annotation tags
 
 
1332
                for typ in ("method", "signal"):
 
 
1333
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1335
                        for name, prop in (self.
 
 
1336
                                           _get_all_dbus_things(typ)):
 
 
1337
                            if (name == tag.getAttribute("name")
 
 
1338
                                and prop._dbus_interface
 
 
1339
                                == if_tag.getAttribute("name")):
 
 
1340
                                annots.update(getattr(
 
 
1341
                                    prop, "_dbus_annotations", {}))
 
 
1342
                        for name, value in annots.items():
 
 
1343
                            ann_tag = document.createElement(
 
 
1345
                            ann_tag.setAttribute("name", name)
 
 
1346
                            ann_tag.setAttribute("value", value)
 
 
1347
                            tag.appendChild(ann_tag)
 
 
1348
                # Add interface annotation tags
 
 
1349
                for annotation, value in dict(
 
 
1350
                    itertools.chain.from_iterable(
 
 
1351
                        annotations().items()
 
 
1352
                        for name, annotations
 
 
1353
                        in self._get_all_dbus_things("interface")
 
 
1354
                        if name == if_tag.getAttribute("name")
 
 
1356
                    ann_tag = document.createElement("annotation")
 
 
1357
                    ann_tag.setAttribute("name", annotation)
 
 
1358
                    ann_tag.setAttribute("value", value)
 
 
1359
                    if_tag.appendChild(ann_tag)
 
 
1360
                # Fix argument name for the Introspect method itself
 
 
1361
                if (if_tag.getAttribute("name")
 
 
1362
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1363
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1364
                        if cn.getAttribute("name") == "Introspect":
 
 
1365
                            for arg in cn.getElementsByTagName("arg"):
 
 
1366
                                if (arg.getAttribute("direction")
 
 
1368
                                    arg.setAttribute("name",
 
 
1370
            xmlstring = document.toxml("utf-8")
 
 
1372
        except (AttributeError, xml.dom.DOMException,
 
 
1373
                xml.parsers.expat.ExpatError) as error:
 
 
1374
            logger.error("Failed to override Introspection method",
 
 
1379
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1380
    """A D-Bus object with properties.
 
 
1382
    Classes inheriting from this can use the dbus_service_property
 
 
1383
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1384
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
866
1387
    def _get_dbus_property(self, interface_name, property_name):
 
867
1388
        """Returns a bound method if one exists which is a D-Bus
 
868
1389
        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"))):
 
 
1391
        for cls in self.__class__.__mro__:
 
 
1392
            for name, value in inspect.getmembers(
 
 
1393
                    cls, self._is_dbus_thing("property")):
 
874
1394
                if (value._dbus_name == property_name
 
875
1395
                    and value._dbus_interface == interface_name):
 
876
1396
                    return value.__get__(self)
 
878
1398
        # No such property
 
879
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
880
 
                                   + interface_name + "."
 
883
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1399
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1400
            self.dbus_object_path, interface_name, property_name))
 
 
1403
    def _get_all_interface_names(cls):
 
 
1404
        """Get a sequence of all interfaces supported by an object"""
 
 
1405
        return (name for name in set(getattr(getattr(x, attr),
 
 
1406
                                             "_dbus_interface", None)
 
 
1407
                                     for x in (inspect.getmro(cls))
 
 
1409
                if name is not None)
 
 
1411
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
884
1413
                         out_signature="v")
 
885
1414
    def Get(self, interface_name, property_name):
 
886
1415
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1016
1543
        return xmlstring
 
 
1547
    dbus.OBJECT_MANAGER_IFACE
 
 
1548
except AttributeError:
 
 
1549
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1552
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1553
    """A D-Bus object with an ObjectManager.
 
 
1555
    Classes inheriting from this exposes the standard
 
 
1556
    GetManagedObjects call and the InterfacesAdded and
 
 
1557
    InterfacesRemoved signals on the standard
 
 
1558
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1560
    Note: No signals are sent automatically; they must be sent
 
 
1563
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1564
                         out_signature="a{oa{sa{sv}}}")
 
 
1565
    def GetManagedObjects(self):
 
 
1566
        """This function must be overridden"""
 
 
1567
        raise NotImplementedError()
 
 
1569
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1570
                         signature="oa{sa{sv}}")
 
 
1571
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1574
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1575
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1578
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1580
                         path_keyword='object_path',
 
 
1581
                         connection_keyword='connection')
 
 
1582
    def Introspect(self, object_path, connection):
 
 
1583
        """Overloading of standard D-Bus method.
 
 
1585
        Override return argument name of GetManagedObjects to be
 
 
1586
        "objpath_interfaces_and_properties"
 
 
1588
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1592
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1594
            for if_tag in document.getElementsByTagName("interface"):
 
 
1595
                # Fix argument name for the GetManagedObjects method
 
 
1596
                if (if_tag.getAttribute("name")
 
 
1597
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1598
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1599
                        if (cn.getAttribute("name")
 
 
1600
                            == "GetManagedObjects"):
 
 
1601
                            for arg in cn.getElementsByTagName("arg"):
 
 
1602
                                if (arg.getAttribute("direction")
 
 
1606
                                        "objpath_interfaces"
 
 
1608
            xmlstring = document.toxml("utf-8")
 
 
1610
        except (AttributeError, xml.dom.DOMException,
 
 
1611
                xml.parsers.expat.ExpatError) as error:
 
 
1612
            logger.error("Failed to override Introspection method",
 
1019
1617
def datetime_to_dbus(dt, variant_level=0):
 
1020
1618
    """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)
 
 
1620
        return dbus.String("", variant_level=variant_level)
 
 
1621
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1027
1624
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1380
1985
        server to mandos-client
 
1384
1989
    # Rejected - signal
 
1385
1990
    @dbus.service.signal(_interface, signature="s")
 
1386
1991
    def Rejected(self, reason):
 
1390
1995
    # NeedApproval - signal
 
1391
1996
    @dbus.service.signal(_interface, signature="tb")
 
1392
1997
    def NeedApproval(self, timeout, default):
 
1394
1999
        return self.need_approval()
 
1398
2003
    # Approve - method
 
1399
2004
    @dbus.service.method(_interface, in_signature="b")
 
1400
2005
    def Approve(self, value):
 
1401
2006
        self.approve(value)
 
1403
2008
    # CheckedOK - method
 
1404
2009
    @dbus.service.method(_interface)
 
1405
2010
    def CheckedOK(self):
 
1406
2011
        self.checked_ok()
 
1408
2013
    # Enable - method
 
 
2014
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1409
2015
    @dbus.service.method(_interface)
 
1410
2016
    def Enable(self):
 
1414
2020
    # StartChecker - method
 
 
2021
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1415
2022
    @dbus.service.method(_interface)
 
1416
2023
    def StartChecker(self):
 
1418
2025
        self.start_checker()
 
1420
2027
    # Disable - method
 
 
2028
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1421
2029
    @dbus.service.method(_interface)
 
1422
2030
    def Disable(self):
 
1426
2034
    # StopChecker - method
 
 
2035
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1427
2036
    @dbus.service.method(_interface)
 
1428
2037
    def StopChecker(self):
 
1429
2038
        self.stop_checker()
 
1433
2042
    # ApprovalPending - property
 
1434
2043
    @dbus_service_property(_interface, signature="b", access="read")
 
1435
2044
    def ApprovalPending_dbus_property(self):
 
1436
2045
        return dbus.Boolean(bool(self.approvals_pending))
 
1438
2047
    # ApprovedByDefault - property
 
1439
 
    @dbus_service_property(_interface, signature="b",
 
 
2048
    @dbus_service_property(_interface,
 
1440
2050
                           access="readwrite")
 
1441
2051
    def ApprovedByDefault_dbus_property(self, value=None):
 
1442
2052
        if value is None:       # get
 
1443
2053
            return dbus.Boolean(self.approved_by_default)
 
1444
2054
        self.approved_by_default = bool(value)
 
1446
2056
    # ApprovalDelay - property
 
1447
 
    @dbus_service_property(_interface, signature="t",
 
 
2057
    @dbus_service_property(_interface,
 
1448
2059
                           access="readwrite")
 
1449
2060
    def ApprovalDelay_dbus_property(self, value=None):
 
1450
2061
        if value is None:       # get
 
1451
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2062
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1452
2064
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1454
2066
    # ApprovalDuration - property
 
1455
 
    @dbus_service_property(_interface, signature="t",
 
 
2067
    @dbus_service_property(_interface,
 
1456
2069
                           access="readwrite")
 
1457
2070
    def ApprovalDuration_dbus_property(self, value=None):
 
1458
2071
        if value is None:       # get
 
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1460
 
                    self.approval_duration))
 
 
2072
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1461
2074
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1463
2076
    # Name - property
 
 
2078
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1464
2079
    @dbus_service_property(_interface, signature="s", access="read")
 
1465
2080
    def Name_dbus_property(self):
 
1466
2081
        return dbus.String(self.name)
 
 
2085
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2086
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2087
    def KeyID_dbus_property(self):
 
 
2088
        return dbus.String(self.key_id)
 
1468
2090
    # Fingerprint - property
 
 
2092
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1469
2093
    @dbus_service_property(_interface, signature="s", access="read")
 
1470
2094
    def Fingerprint_dbus_property(self):
 
1471
2095
        return dbus.String(self.fingerprint)
 
1473
2097
    # Host - property
 
1474
 
    @dbus_service_property(_interface, signature="s",
 
 
2098
    @dbus_service_property(_interface,
 
1475
2100
                           access="readwrite")
 
1476
2101
    def Host_dbus_property(self, value=None):
 
1477
2102
        if value is None:       # get
 
1478
2103
            return dbus.String(self.host)
 
1479
 
        self.host = unicode(value)
 
 
2104
        self.host = str(value)
 
1481
2106
    # Created - property
 
 
2108
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1482
2109
    @dbus_service_property(_interface, signature="s", access="read")
 
1483
2110
    def Created_dbus_property(self):
 
1484
2111
        return datetime_to_dbus(self.created)
 
1486
2113
    # LastEnabled - property
 
1487
2114
    @dbus_service_property(_interface, signature="s", access="read")
 
1488
2115
    def LastEnabled_dbus_property(self):
 
1489
2116
        return datetime_to_dbus(self.last_enabled)
 
1491
2118
    # Enabled - property
 
1492
 
    @dbus_service_property(_interface, signature="b",
 
 
2119
    @dbus_service_property(_interface,
 
1493
2121
                           access="readwrite")
 
1494
2122
    def Enabled_dbus_property(self, value=None):
 
1495
2123
        if value is None:       # get
 
 
1543
2172
                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),
 
 
2175
                GLib.source_remove(self.disable_initiator_tag)
 
 
2176
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2177
                    int((self.expires - now).total_seconds() * 1000),
 
1552
2180
    # ExtendedTimeout - property
 
1553
 
    @dbus_service_property(_interface, signature="t",
 
 
2181
    @dbus_service_property(_interface,
 
1554
2183
                           access="readwrite")
 
1555
2184
    def ExtendedTimeout_dbus_property(self, value=None):
 
1556
2185
        if value is None:       # get
 
1557
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2186
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1558
2188
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1560
2190
    # Interval - property
 
1561
 
    @dbus_service_property(_interface, signature="t",
 
 
2191
    @dbus_service_property(_interface,
 
1562
2193
                           access="readwrite")
 
1563
2194
    def Interval_dbus_property(self, value=None):
 
1564
2195
        if value is None:       # get
 
1565
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2196
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1566
2197
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1567
2198
        if getattr(self, "checker_initiator_tag", None) is None:
 
1569
2200
        if self.enabled:
 
1570
2201
            # 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
 
 
2202
            GLib.source_remove(self.checker_initiator_tag)
 
 
2203
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2204
                value, self.start_checker)
 
 
2205
            self.start_checker()  # Start one now, too
 
1576
2207
    # Checker - property
 
1577
 
    @dbus_service_property(_interface, signature="s",
 
 
2208
    @dbus_service_property(_interface,
 
1578
2210
                           access="readwrite")
 
1579
2211
    def Checker_dbus_property(self, value=None):
 
1580
2212
        if value is None:       # get
 
1581
2213
            return dbus.String(self.checker_command)
 
1582
 
        self.checker_command = unicode(value)
 
 
2214
        self.checker_command = str(value)
 
1584
2216
    # CheckerRunning - property
 
1585
 
    @dbus_service_property(_interface, signature="b",
 
 
2217
    @dbus_service_property(_interface,
 
1586
2219
                           access="readwrite")
 
1587
2220
    def CheckerRunning_dbus_property(self, value=None):
 
1588
2221
        if value is None:       # get
 
 
1635
2278
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1636
2279
    """A class to handle client connections.
 
1638
2281
    Instantiated once for each connection to handle it.
 
1639
2282
    Note: This will run in its own forked process."""
 
1641
2284
    def handle(self):
 
1642
2285
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1643
2286
            logger.info("TCP connection from: %s",
 
1644
 
                        unicode(self.client_address))
 
 
2287
                        str(self.client_address))
 
1645
2288
            logger.debug("Pipe FD: %d",
 
1646
2289
                         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",
 
 
2291
            session = gnutls.ClientSession(self.request)
 
 
2293
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2294
            #                       "+AES-256-CBC", "+SHA1",
 
 
2295
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1662
2297
            # Use a fallback default, since this MUST be set.
 
1663
2298
            priority = self.server.gnutls_priority
 
1664
2299
            if priority is None:
 
1665
2300
                priority = "NORMAL"
 
1666
 
            (gnutls.library.functions
 
1667
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2301
            gnutls.priority_set_direct(session._c_object,
 
 
2302
                                       priority.encode("utf-8"),
 
1670
2305
            # Start communication using the Mandos protocol
 
1671
2306
            # Get protocol number
 
1672
2307
            line = self.request.makefile().readline()
 
1673
2308
            logger.debug("Protocol version: %r", line)
 
1675
2310
                if int(line.strip().split()[0]) > 1:
 
 
2311
                    raise RuntimeError(line)
 
1677
2312
            except (ValueError, IndexError, RuntimeError) as error:
 
1678
2313
                logger.error("Unknown protocol version: %s", error)
 
1681
2316
            # Start GnuTLS connection
 
1683
2318
                session.handshake()
 
1684
 
            except gnutls.errors.GNUTLSError as error:
 
 
2319
            except gnutls.Error as error:
 
1685
2320
                logger.warning("Handshake failed: %s", error)
 
1686
2321
                # Do not run session.bye() here: the session is not
 
1687
2322
                # established.  Just abandon the request.
 
1689
2324
            logger.debug("Handshake succeeded")
 
1691
2326
            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,
 
 
2328
                if gnutls.has_rawpk:
 
 
2331
                        key_id = self.key_id(
 
 
2332
                            self.peer_certificate(session))
 
 
2333
                    except (TypeError, gnutls.Error) as error:
 
 
2334
                        logger.warning("Bad certificate: %s", error)
 
 
2336
                    logger.debug("Key ID: %s", key_id)
 
 
2341
                        fpr = self.fingerprint(
 
 
2342
                            self.peer_certificate(session))
 
 
2343
                    except (TypeError, gnutls.Error) as error:
 
 
2344
                        logger.warning("Bad certificate: %s", error)
 
 
2346
                    logger.debug("Fingerprint: %s", fpr)
 
 
2349
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1704
2350
                                         self.client_address)
 
1705
2351
                except KeyError:
 
1708
2354
                if client.approval_delay:
 
1709
2355
                    delay = client.approval_delay
 
1710
2356
                    client.approvals_pending += 1
 
1711
2357
                    approval_required = True
 
1714
2360
                    if not client.enabled:
 
1715
2361
                        logger.info("Client %s is disabled",
 
1717
2363
                        if self.server.use_dbus:
 
1718
2364
                            # Emit D-Bus signal
 
1719
2365
                            client.Rejected("Disabled")
 
1722
2368
                    if client.approved or not client.approval_delay:
 
1723
 
                        #We are approved or approval is disabled
 
 
2369
                        # We are approved or approval is disabled
 
1725
2371
                    elif client.approved is None:
 
1726
2372
                        logger.info("Client %s needs approval",
 
 
1761
2405
                        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))
 
 
2408
                    session.send(client.secret)
 
 
2409
                except gnutls.Error as error:
 
 
2410
                    logger.warning("gnutls send failed",
 
1776
2414
                logger.info("Sending secret to %s", client.name)
 
1777
2415
                # bump the timeout using extended_timeout
 
1778
2416
                client.bump_timeout(client.extended_timeout)
 
1779
2417
                if self.server.use_dbus:
 
1780
2418
                    # Emit D-Bus signal
 
1781
2419
                    client.GotSecret()
 
1784
2422
                if approval_required:
 
1785
2423
                    client.approvals_pending -= 1
 
1788
 
                except gnutls.errors.GNUTLSError as error:
 
 
2426
                except gnutls.Error as error:
 
1789
2427
                    logger.warning("GnuTLS bye failed",
 
1790
2428
                                   exc_info=error)
 
1793
2431
    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
 
 
2432
        "Return the peer's certificate as a bytestring"
 
 
2434
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2436
        except AttributeError:
 
 
2437
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2438
        if gnutls.has_rawpk:
 
 
2439
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2441
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2442
        # If not a valid certificate type...
 
 
2443
        if cert_type not in valid_cert_types:
 
 
2444
            logger.info("Cert type %r not in %r", cert_type,
 
 
2446
            # ...return invalid data
 
1801
2448
        list_size = ctypes.c_uint(1)
 
1802
 
        cert_list = (gnutls.library.functions
 
1803
 
                     .gnutls_certificate_get_peers
 
 
2449
        cert_list = (gnutls.certificate_get_peers
 
1804
2450
                     (session._c_object, ctypes.byref(list_size)))
 
1805
2451
        if not bool(cert_list) and list_size.value != 0:
 
1806
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2452
            raise gnutls.Error("error getting peer certificate")
 
1808
2453
        if list_size.value == 0:
 
1810
2455
        cert = cert_list[0]
 
1811
2456
        return ctypes.string_at(cert.data, cert.size)
 
 
2459
    def key_id(certificate):
 
 
2460
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2461
        # New GnuTLS "datum" with the public key
 
 
2462
        datum = gnutls.datum_t(
 
 
2463
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2464
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2465
            ctypes.c_uint(len(certificate)))
 
 
2466
        # XXX all these need to be created in the gnutls "module"
 
 
2467
        # New empty GnuTLS certificate
 
 
2468
        pubkey = gnutls.pubkey_t()
 
 
2469
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2470
        # Import the raw public key into the certificate
 
 
2471
        gnutls.pubkey_import(pubkey,
 
 
2472
                             ctypes.byref(datum),
 
 
2473
                             gnutls.X509_FMT_DER)
 
 
2474
        # New buffer for the key ID
 
 
2475
        buf = ctypes.create_string_buffer(32)
 
 
2476
        buf_len = ctypes.c_size_t(len(buf))
 
 
2477
        # Get the key ID from the raw public key into the buffer
 
 
2478
        gnutls.pubkey_get_key_id(
 
 
2480
            gnutls.KEYID_USE_SHA256,
 
 
2481
            ctypes.cast(ctypes.byref(buf),
 
 
2482
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2483
            ctypes.byref(buf_len))
 
 
2484
        # Deinit the certificate
 
 
2485
        gnutls.pubkey_deinit(pubkey)
 
 
2487
        # Convert the buffer to a Python bytestring
 
 
2488
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2489
        # Convert the bytestring to hexadecimal notation
 
 
2490
        hex_key_id = binascii.hexlify(key_id).upper()
 
1814
2494
    def fingerprint(openpgp):
 
1815
2495
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1816
2496
        # 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))))
 
 
2497
        datum = gnutls.datum_t(
 
 
2498
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2499
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2500
            ctypes.c_uint(len(openpgp)))
 
1822
2501
        # 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)))
 
 
2502
        crt = gnutls.openpgp_crt_t()
 
 
2503
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1826
2504
        # 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))
 
 
2505
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2506
                                  gnutls.OPENPGP_FMT_RAW)
 
1831
2507
        # Verify the self signature in the key
 
1832
2508
        crtverify = ctypes.c_uint()
 
1833
 
        (gnutls.library.functions
 
1834
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1835
 
                                         ctypes.byref(crtverify)))
 
 
2509
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2510
                                       ctypes.byref(crtverify))
 
1836
2511
        if crtverify.value != 0:
 
1837
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1838
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2512
            gnutls.openpgp_crt_deinit(crt)
 
 
2513
            raise gnutls.CertificateSecurityError(code
 
1840
2515
        # New buffer for the fingerprint
 
1841
2516
        buf = ctypes.create_string_buffer(20)
 
1842
2517
        buf_len = ctypes.c_size_t()
 
1843
2518
        # 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)))
 
 
2519
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2520
                                           ctypes.byref(buf_len))
 
1847
2521
        # Deinit the certificate
 
1848
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2522
        gnutls.openpgp_crt_deinit(crt)
 
1849
2523
        # Convert the buffer to a Python bytestring
 
1850
2524
        fpr = ctypes.string_at(buf, buf_len.value)
 
1851
2525
        # Convert the bytestring to hexadecimal notation
 
 
1934
2614
        # socket_wrapper(), if socketfd was set.
 
1935
2615
        socketserver.TCPServer.__init__(self, server_address,
 
1936
2616
                                        RequestHandlerClass)
 
1938
2618
    def server_bind(self):
 
1939
2619
        """This overrides the normal server_bind() function
 
1940
2620
        to bind to an interface if one was specified, and also NOT to
 
1941
2621
        bind to an address or port if they were not specified."""
 
 
2622
        global SO_BINDTODEVICE
 
1942
2623
        if self.interface is not None:
 
1943
2624
            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",
 
 
2625
                # Fall back to a hard-coded value which seems to be
 
 
2627
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2628
                SO_BINDTODEVICE = 25
 
 
2630
                self.socket.setsockopt(
 
 
2631
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2632
                    (self.interface + "\0").encode("utf-8"))
 
 
2633
            except socket.error as error:
 
 
2634
                if error.errno == errno.EPERM:
 
 
2635
                    logger.error("No permission to bind to"
 
 
2636
                                 " interface %s", self.interface)
 
 
2637
                elif error.errno == errno.ENOPROTOOPT:
 
 
2638
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2639
                                 " cannot bind to interface %s",
 
 
2641
                elif error.errno == errno.ENODEV:
 
 
2642
                    logger.error("Interface %s does not exist,"
 
 
2643
                                 " cannot bind", self.interface)
 
1968
2646
        # Only bind(2) the socket if we really need to.
 
1969
2647
        if self.server_address[0] or self.server_address[1]:
 
 
2648
            if self.server_address[1]:
 
 
2649
                self.allow_reuse_address = True
 
1970
2650
            if not self.server_address[0]:
 
1971
2651
                if self.address_family == socket.AF_INET6:
 
1972
 
                    any_address = "::" # in6addr_any
 
 
2652
                    any_address = "::"  # in6addr_any
 
1974
 
                    any_address = socket.INADDR_ANY
 
 
2654
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1975
2655
                self.server_address = (any_address,
 
1976
2656
                                       self.server_address[1])
 
1977
2657
            elif not self.server_address[1]:
 
1978
 
                self.server_address = (self.server_address[0],
 
 
2658
                self.server_address = (self.server_address[0], 0)
 
1980
2659
#                 if self.interface:
 
1981
2660
#                     self.server_address = (self.server_address[0],
 
 
2007
2691
        self.gnutls_priority = gnutls_priority
 
2008
2692
        IPv6_TCPServer.__init__(self, server_address,
 
2009
2693
                                RequestHandlerClass,
 
2010
 
                                interface = interface,
 
2011
 
                                use_ipv6 = use_ipv6,
 
2012
 
                                socketfd = socketfd)
 
 
2694
                                interface=interface,
 
2013
2698
    def server_activate(self):
 
2014
2699
        if self.enabled:
 
2015
2700
            return socketserver.TCPServer.server_activate(self)
 
2017
2702
    def enable(self):
 
2018
2703
        self.enabled = True
 
2020
2705
    def add_pipe(self, parent_pipe, proc):
 
2021
2706
        # 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):
 
 
2708
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2709
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2710
            functools.partial(self.handle_ipc,
 
 
2711
                              parent_pipe=parent_pipe,
 
 
2714
    def handle_ipc(self, source, condition,
 
 
2717
                   client_object=None):
 
2031
2718
        # error, or the other end of multiprocessing.Pipe has closed
 
2032
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2719
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2033
2720
            # Wait for other process to exit
 
2037
2724
        # Read a request from the child
 
2038
2725
        request = parent_pipe.recv()
 
2039
2726
        command = request[0]
 
2041
2728
        if command == 'init':
 
2043
 
            address = request[2]
 
2045
 
            for c in self.clients.itervalues():
 
2046
 
                if c.fingerprint == fpr:
 
 
2729
            key_id = request[1].decode("ascii")
 
 
2730
            fpr = request[2].decode("ascii")
 
 
2731
            address = request[3]
 
 
2733
            for c in self.clients.values():
 
 
2734
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
 
2735
                              "27AE41E4649B934CA495991B7852B855"):
 
 
2737
                if key_id and c.key_id == key_id:
 
 
2740
                if fpr and c.fingerprint == fpr:
 
2050
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2051
 
                            "dress: %s", fpr, address)
 
 
2744
                logger.info("Client not found for key ID: %s, address"
 
 
2745
                            ": %s", key_id or fpr, address)
 
2052
2746
                if self.use_dbus:
 
2053
2747
                    # Emit D-Bus signal
 
2054
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2748
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2056
2750
                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,
 
 
2754
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2755
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2756
                functools.partial(self.handle_ipc,
 
 
2757
                                  parent_pipe=parent_pipe,
 
 
2759
                                  client_object=client))
 
2067
2760
            parent_pipe.send(True)
 
2068
2761
            # remove the old hook in favor of the new above hook on
 
 
2072
2765
            funcname = request[1]
 
2073
2766
            args = request[2]
 
2074
2767
            kwargs = request[3]
 
2076
2769
            parent_pipe.send(('data', getattr(client_object,
 
2077
2770
                                              funcname)(*args,
 
2080
2773
        if command == 'getattr':
 
2081
2774
            attrname = request[1]
 
2082
 
            if callable(client_object.__getattribute__(attrname)):
 
2083
 
                parent_pipe.send(('function',))
 
 
2775
            if isinstance(client_object.__getattribute__(attrname),
 
 
2776
                          collections.abc.Callable):
 
 
2777
                parent_pipe.send(('function', ))
 
2085
 
                parent_pipe.send(('data', client_object
 
2086
 
                                  .__getattribute__(attrname)))
 
 
2780
                    'data', client_object.__getattribute__(attrname)))
 
2088
2782
        if command == 'setattr':
 
2089
2783
            attrname = request[1]
 
2090
2784
            value = request[2]
 
2091
2785
            setattr(client_object, attrname, value)
 
 
2790
def rfc3339_duration_to_delta(duration):
 
 
2791
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2793
    >>> timedelta = datetime.timedelta
 
 
2794
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
 
2796
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
 
2798
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
 
2800
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
 
2802
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
 
2804
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
 
2806
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
 
2811
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2812
    # possible - there would have to be multiple places for the same
 
 
2813
    # values, like seconds.  The current code, while more esoteric, is
 
 
2814
    # cleaner without depending on a parsing library.  If Python had a
 
 
2815
    # built-in library for parsing we would use it, but we'd like to
 
 
2816
    # avoid excessive use of external libraries.
 
 
2818
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2819
    Token = collections.namedtuple("Token", (
 
 
2820
        "regexp",  # To match token; if "value" is not None, must have
 
 
2821
                   # a "group" containing digits
 
 
2822
        "value",   # datetime.timedelta or None
 
 
2823
        "followers"))           # Tokens valid after this token
 
 
2824
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2825
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2826
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2827
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2828
                         datetime.timedelta(seconds=1),
 
 
2829
                         frozenset((token_end, )))
 
 
2830
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2831
                         datetime.timedelta(minutes=1),
 
 
2832
                         frozenset((token_second, token_end)))
 
 
2833
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2834
                       datetime.timedelta(hours=1),
 
 
2835
                       frozenset((token_minute, token_end)))
 
 
2836
    token_time = Token(re.compile(r"T"),
 
 
2838
                       frozenset((token_hour, token_minute,
 
 
2840
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2841
                      datetime.timedelta(days=1),
 
 
2842
                      frozenset((token_time, token_end)))
 
 
2843
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2844
                        datetime.timedelta(weeks=4),
 
 
2845
                        frozenset((token_day, token_end)))
 
 
2846
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2847
                       datetime.timedelta(weeks=52),
 
 
2848
                       frozenset((token_month, token_end)))
 
 
2849
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2850
                       datetime.timedelta(weeks=1),
 
 
2851
                       frozenset((token_end, )))
 
 
2852
    token_duration = Token(re.compile(r"P"), None,
 
 
2853
                           frozenset((token_year, token_month,
 
 
2854
                                      token_day, token_time,
 
 
2856
    # Define starting values:
 
 
2858
    value = datetime.timedelta()
 
 
2860
    # Following valid tokens
 
 
2861
    followers = frozenset((token_duration, ))
 
 
2862
    # String left to parse
 
 
2864
    # Loop until end token is found
 
 
2865
    while found_token is not token_end:
 
 
2866
        # Search for any currently valid tokens
 
 
2867
        for token in followers:
 
 
2868
            match = token.regexp.match(s)
 
 
2869
            if match is not None:
 
 
2871
                if token.value is not None:
 
 
2872
                    # Value found, parse digits
 
 
2873
                    factor = int(match.group(1), 10)
 
 
2874
                    # Add to value so far
 
 
2875
                    value += factor * token.value
 
 
2876
                # Strip token from string
 
 
2877
                s = token.regexp.sub("", s, 1)
 
 
2880
                # Set valid next tokens
 
 
2881
                followers = found_token.followers
 
 
2884
            # No currently valid tokens were found
 
 
2885
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2096
2891
def string_to_delta(interval):
 
2097
2892
    """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)
 
 
2894
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
 
2896
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
 
2898
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
 
2900
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
 
2902
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
 
2904
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
 
2909
        return rfc3339_duration_to_delta(interval)
 
2112
2913
    timevalue = datetime.timedelta(0)
 
2113
2914
    for s in interval.split():
 
2115
 
            suffix = unicode(s[-1])
 
2116
2917
            value = int(s[:-1])
 
2117
2918
            if suffix == "d":
 
2118
2919
                delta = datetime.timedelta(value)
 
 
2191
2991
    parser.add_argument("--no-dbus", action="store_false",
 
2192
2992
                        dest="use_dbus", help="Do not provide D-Bus"
 
2193
 
                        " system bus interface")
 
 
2993
                        " system bus interface", default=None)
 
2194
2994
    parser.add_argument("--no-ipv6", action="store_false",
 
2195
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2995
                        dest="use_ipv6", help="Do not use IPv6",
 
2196
2997
    parser.add_argument("--no-restore", action="store_false",
 
2197
2998
                        dest="restore", help="Do not restore stored"
 
 
2999
                        " state", default=None)
 
2199
3000
    parser.add_argument("--socket", type=int,
 
2200
3001
                        help="Specify a file descriptor to a network"
 
2201
3002
                        " socket to use instead of creating one")
 
2202
3003
    parser.add_argument("--statedir", metavar="DIR",
 
2203
3004
                        help="Directory to save/restore state in")
 
 
3005
    parser.add_argument("--foreground", action="store_true",
 
 
3006
                        help="Run in foreground", default=None)
 
 
3007
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
3008
                        dest="zeroconf", help="Do not use Zeroconf",
 
2205
3011
    options = parser.parse_args()
 
2212
3013
    # 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"
 
 
3014
    if gnutls.has_rawpk:
 
 
3015
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
3016
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
3018
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
3019
                    ":+SIGN-DSA-SHA256")
 
 
3020
    server_defaults = {"interface": "",
 
 
3024
                       "priority": priority,
 
 
3025
                       "servicename": "Mandos",
 
 
3031
                       "statedir": "/var/lib/mandos",
 
 
3032
                       "foreground": "False",
 
2228
3037
    # Parse config file for server-global settings
 
2229
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3038
    server_config = configparser.ConfigParser(server_defaults)
 
2230
3039
    del server_defaults
 
2231
 
    server_config.read(os.path.join(options.configdir,
 
2233
 
    # Convert the SafeConfigParser object to a dict
 
 
3040
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3041
    # Convert the ConfigParser object to a dict
 
2234
3042
    server_settings = server_config.defaults()
 
2235
3043
    # Use the appropriate methods on the non-string config options
 
2236
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3044
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3045
                   "foreground", "zeroconf"):
 
2237
3046
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2239
3048
    if server_settings["port"]:
 
 
 
3164
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2336
3166
    except OSError as error:
 
 
3167
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3168
                       .format(uid, gid, os.strerror(error.errno)))
 
2337
3169
        if error.errno != errno.EPERM:
 
2341
3173
        # Enable all possible GnuTLS debugging
 
2343
3175
        # "Use a log level over 10 to enable all debugging options."
 
2344
3176
        # - GnuTLS manual
 
2345
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2347
 
        @gnutls.library.types.gnutls_log_func
 
 
3177
        gnutls.global_set_log_level(11)
 
2348
3180
        def debug_gnutls(level, string):
 
2349
3181
            logger.debug("GnuTLS: %s", string[:-1])
 
2351
 
        (gnutls.library.functions
 
2352
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3183
        gnutls.global_set_log_function(debug_gnutls)
 
2354
3185
        # Redirect stdin so all checkers get /dev/null
 
2355
3186
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2356
3187
        os.dup2(null, sys.stdin.fileno())
 
2360
3191
    # Need to fork before connecting to D-Bus
 
2362
3193
        # 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()
 
 
3196
    if gi.version_info < (3, 10, 2):
 
 
3197
        # multiprocessing will use threads, so before we use GLib we
 
 
3198
        # need to inform GLib that threads will be used.
 
2369
3201
    global main_loop
 
2370
3202
    # From the Avahi example code
 
2371
3203
    DBusGMainLoop(set_as_default=True)
 
2372
 
    main_loop = gobject.MainLoop()
 
 
3204
    main_loop = GLib.MainLoop()
 
2373
3205
    bus = dbus.SystemBus()
 
2374
3206
    # End of Avahi example code
 
2377
3209
            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:
 
 
3212
            old_bus_name = dbus.service.BusName(
 
 
3213
                "se.bsnet.fukt.Mandos", bus,
 
 
3215
        except dbus.exceptions.DBusException as e:
 
2383
3216
            logger.error("Disabling D-Bus:", exc_info=e)
 
2384
3217
            use_dbus = False
 
2385
3218
            server_settings["use_dbus"] = False
 
2386
3219
            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"])))
 
 
3221
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3222
        service = AvahiServiceToSyslog(
 
 
3223
            name=server_settings["servicename"],
 
 
3224
            servicetype="_mandos._tcp",
 
 
3227
        if server_settings["interface"]:
 
 
3228
            service.interface = if_nametoindex(
 
 
3229
                server_settings["interface"].encode("utf-8"))
 
2396
3231
    global multiprocessing_manager
 
2397
3232
    multiprocessing_manager = multiprocessing.Manager()
 
2399
3234
    client_class = Client
 
2401
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3236
        client_class = functools.partial(ClientDBus, bus=bus)
 
2403
3238
    client_settings = Client.config_parser(client_config)
 
2404
3239
    old_client_settings = {}
 
2405
3240
    clients_data = {}
 
 
3242
    # This is used to redirect stdout and stderr for checker processes
 
 
3244
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3245
    # Only used if server is running in foreground but not in debug
 
 
3247
    if debug or not foreground:
 
2407
3250
    # Get client data and settings from last running state.
 
2408
3251
    if server_settings["restore"]:
 
2410
3253
            with open(stored_state_path, "rb") as stored_state:
 
2411
 
                clients_data, old_client_settings = (pickle.load
 
 
3254
                if sys.version_info.major == 2:
 
 
3255
                    clients_data, old_client_settings = pickle.load(
 
 
3258
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3259
                        pickle.load(stored_state, encoding="bytes"))
 
 
3260
                    #   Fix bytes to strings
 
 
3263
                    clients_data = {(key.decode("utf-8")
 
 
3264
                                     if isinstance(key, bytes)
 
 
3267
                                    bytes_clients_data.items()}
 
 
3268
                    del bytes_clients_data
 
 
3269
                    for key in clients_data:
 
 
3270
                        value = {(k.decode("utf-8")
 
 
3271
                                  if isinstance(k, bytes) else k): v
 
 
3273
                                 clients_data[key].items()}
 
 
3274
                        clients_data[key] = value
 
 
3276
                        value["client_structure"] = [
 
 
3278
                             if isinstance(s, bytes)
 
 
3280
                            value["client_structure"]]
 
 
3281
                        # .name, .host, and .checker_command
 
 
3282
                        for k in ("name", "host", "checker_command"):
 
 
3283
                            if isinstance(value[k], bytes):
 
 
3284
                                value[k] = value[k].decode("utf-8")
 
 
3285
                        if "key_id" not in value:
 
 
3286
                            value["key_id"] = ""
 
 
3287
                        elif "fingerprint" not in value:
 
 
3288
                            value["fingerprint"] = ""
 
 
3289
                    #  old_client_settings
 
 
3291
                    old_client_settings = {
 
 
3292
                        (key.decode("utf-8")
 
 
3293
                         if isinstance(key, bytes)
 
 
3296
                        bytes_old_client_settings.items()}
 
 
3297
                    del bytes_old_client_settings
 
 
3298
                    # .host and .checker_command
 
 
3299
                    for value in old_client_settings.values():
 
 
3300
                        for attribute in ("host", "checker_command"):
 
 
3301
                            if isinstance(value[attribute], bytes):
 
 
3302
                                value[attribute] = (value[attribute]
 
2413
3304
            os.remove(stored_state_path)
 
2414
3305
        except IOError as e:
 
2415
3306
            if e.errno == errno.ENOENT:
 
2416
 
                logger.warning("Could not load persistent state: {0}"
 
2417
 
                                .format(os.strerror(e.errno)))
 
 
3307
                logger.warning("Could not load persistent state:"
 
 
3308
                               " {}".format(os.strerror(e.errno)))
 
2419
3310
                logger.critical("Could not load persistent state:",
 
2422
3313
        except EOFError as e:
 
2423
3314
            logger.warning("Could not load persistent state: "
 
2424
 
                           "EOFError:", exc_info=e)
 
2426
3318
    with PGPEngine() as pgp:
 
2427
 
        for client_name, client in clients_data.iteritems():
 
 
3319
        for client_name, client in clients_data.items():
 
 
3320
            # Skip removed clients
 
 
3321
            if client_name not in client_settings:
 
2428
3324
            # Decide which value to use after restoring saved state.
 
2429
3325
            # We have three different values: Old config file,
 
2430
3326
            # new config file, and saved state.
 
 
2488
3384
    for client_name in (set(client_settings)
 
2489
3385
                        - set(old_client_settings)):
 
2490
3386
        clients_data[client_name] = client_settings[client_name]
 
2492
3388
    # Create all client objects
 
2493
 
    for client_name, client in clients_data.iteritems():
 
 
3389
    for client_name, client in clients_data.items():
 
2494
3390
        tcp_server.clients[client_name] = client_class(
 
2495
 
            name = client_name, settings = client)
 
 
3393
            server_settings=server_settings)
 
2497
3395
    if not tcp_server.clients:
 
2498
3396
        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
 
 
3399
        if pidfile is not None:
 
 
3403
                    print(pid, file=pidfile)
 
 
3405
                logger.error("Could not write to file %r with PID %d",
 
2512
3408
        del pidfilename
 
2514
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2515
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3410
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3411
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3412
                             lambda: main_loop.quit() and False)
 
2518
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2519
 
                                        "se.bsnet.fukt.Mandos"})
 
2520
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3416
        @alternate_dbus_interfaces(
 
 
3417
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3418
        class MandosDBusService(DBusObjectWithObjectManager):
 
2521
3419
            """A D-Bus proxy object"""
 
2522
3421
            def __init__(self):
 
2523
3422
                dbus.service.Object.__init__(self, bus, "/")
 
2524
3424
            _interface = "se.recompile.Mandos"
 
2526
 
            @dbus_interface_annotations(_interface)
 
2528
 
                return { "org.freedesktop.DBus.Property"
 
2529
 
                         ".EmitsChangedSignal":
 
2532
3426
            @dbus.service.signal(_interface, signature="o")
 
2533
3427
            def ClientAdded(self, objpath):
 
2537
3431
            @dbus.service.signal(_interface, signature="ss")
 
2538
 
            def ClientNotFound(self, fingerprint, address):
 
 
3432
            def ClientNotFound(self, key_id, address):
 
 
3436
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2542
3438
            @dbus.service.signal(_interface, signature="os")
 
2543
3439
            def ClientRemoved(self, objpath, name):
 
 
3443
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2547
3445
            @dbus.service.method(_interface, out_signature="ao")
 
2548
3446
            def GetAllClients(self):
 
2550
 
                return dbus.Array(c.dbus_object_path
 
2552
 
                                  tcp_server.clients.itervalues())
 
 
3448
                return dbus.Array(c.dbus_object_path for c in
 
 
3449
                                  tcp_server.clients.values())
 
 
3451
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2554
3453
            @dbus.service.method(_interface,
 
2555
3454
                                 out_signature="a{oa{sv}}")
 
2556
3455
            def GetAllClientsWithProperties(self):
 
2558
3457
                return dbus.Dictionary(
 
2559
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2560
 
                     for c in tcp_server.clients.itervalues()),
 
 
3458
                    {c.dbus_object_path: c.GetAll(
 
 
3459
                        "se.recompile.Mandos.Client")
 
 
3460
                     for c in tcp_server.clients.values()},
 
2561
3461
                    signature="oa{sv}")
 
2563
3463
            @dbus.service.method(_interface, in_signature="o")
 
2564
3464
            def RemoveClient(self, object_path):
 
2566
 
                for c in tcp_server.clients.itervalues():
 
 
3466
                for c in tcp_server.clients.values():
 
2567
3467
                    if c.dbus_object_path == object_path:
 
2568
3468
                        del tcp_server.clients[c.name]
 
2569
3469
                        c.remove_from_connection()
 
2570
 
                        # Don't signal anything except ClientRemoved
 
 
3470
                        # Don't signal the disabling
 
2571
3471
                        c.disable(quiet=True)
 
2573
 
                        self.ClientRemoved(object_path, c.name)
 
 
3472
                        # Emit D-Bus signal for removal
 
 
3473
                        self.client_removed_signal(c)
 
2575
3475
                raise KeyError(object_path)
 
 
3479
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3480
                                 out_signature="a{oa{sa{sv}}}")
 
 
3481
            def GetManagedObjects(self):
 
 
3483
                return dbus.Dictionary(
 
 
3484
                    {client.dbus_object_path:
 
 
3486
                         {interface: client.GetAll(interface)
 
 
3488
                          client._get_all_interface_names()})
 
 
3489
                     for client in tcp_server.clients.values()})
 
 
3491
            def client_added_signal(self, client):
 
 
3492
                """Send the new standard signal and the old signal"""
 
 
3494
                    # New standard signal
 
 
3495
                    self.InterfacesAdded(
 
 
3496
                        client.dbus_object_path,
 
 
3498
                            {interface: client.GetAll(interface)
 
 
3500
                             client._get_all_interface_names()}))
 
 
3502
                    self.ClientAdded(client.dbus_object_path)
 
 
3504
            def client_removed_signal(self, client):
 
 
3505
                """Send the new standard signal and the old signal"""
 
 
3507
                    # New standard signal
 
 
3508
                    self.InterfacesRemoved(
 
 
3509
                        client.dbus_object_path,
 
 
3510
                        client._get_all_interface_names())
 
 
3512
                    self.ClientRemoved(client.dbus_object_path,
 
2579
3515
        mandos_dbus_service = MandosDBusService()
 
 
3517
    # Save modules to variables to exempt the modules from being
 
 
3518
    # unloaded before the function registered with atexit() is run.
 
 
3519
    mp = multiprocessing
 
2582
3523
        "Cleanup function; run on exit"
 
2585
 
        multiprocessing.active_children()
 
 
3527
        mp.active_children()
 
2586
3529
        if not (tcp_server.clients or client_settings):
 
2589
3532
        # Store client before exiting. Secrets are encrypted with key
 
2590
3533
        # based on what config file has. If config file is
 
2591
3534
        # removed/edited, old secret will thus be unrecovable.
 
2593
3536
        with PGPEngine() as pgp:
 
2594
 
            for client in tcp_server.clients.itervalues():
 
 
3537
            for client in tcp_server.clients.values():
 
2595
3538
                key = client_settings[client.name]["secret"]
 
2596
3539
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2598
3541
                client_dict = {}
 
2600
3543
                # 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)):
 
 
3545
                exclude = {"bus", "changedstate", "secret",
 
 
3546
                           "checker", "server_settings"}
 
 
3547
                for name, typ in inspect.getmembers(dbus.service
 
2606
3549
                    exclude.add(name)
 
2608
3551
                client_dict["encrypted_secret"] = (client
 
2609
3552
                                                   .encrypted_secret)
 
2610
3553
                for attr in client.client_structure:
 
2611
3554
                    if attr not in exclude:
 
2612
3555
                        client_dict[attr] = getattr(client, attr)
 
2614
3557
                clients[client.name] = client_dict
 
2615
3558
                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
 
 
3561
            with tempfile.NamedTemporaryFile(
 
 
3565
                    dir=os.path.dirname(stored_state_path),
 
 
3566
                    delete=False) as stored_state:
 
 
3567
                pickle.dump((clients, client_settings), stored_state,
 
 
3569
                tempname = stored_state.name
 
2624
3570
            os.rename(tempname, stored_state_path)
 
2625
3571
        except (IOError, OSError) as e: