2
 
# -*- coding: utf-8; lexical-binding: t -*-
 
 
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos server - give out binary blobs to connecting clients.
 
6
6
# This program is partly derived from an example program for an Avahi
 
7
7
# service publisher, downloaded from
 
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
 
9
9
# methods "add", "remove", "server_state_changed",
 
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
 
11
11
# "AvahiService" class, and some lines in "main".
 
13
13
# Everything else is
 
14
 
# Copyright © 2008-2020 Teddy Hogeborn
 
15
 
# Copyright © 2008-2020 Björn Påhlsson
 
17
 
# This file is part of Mandos.
 
19
 
# Mandos is free software: you can redistribute it and/or modify it
 
20
 
# under the terms of the GNU General Public License as published by
 
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
 
15
# Copyright © 2008-2014 Björn Påhlsson
 
 
17
# This program is free software: you can redistribute it and/or modify
 
 
18
# it under the terms of the GNU General Public License as published by
 
21
19
# the Free Software Foundation, either version 3 of the License, or
 
22
20
# (at your option) any later version.
 
24
 
#     Mandos is distributed in the hope that it will be useful, but
 
25
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
22
#     This program is distributed in the hope that it will be useful,
 
 
23
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
26
24
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
27
25
#     GNU General Public License for more details.
 
29
27
# You should have received a copy of the GNU General Public License
 
30
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
 
28
# along with this program.  If not, see
 
 
29
# <http://www.gnu.org/licenses/>.
 
32
31
# Contact the authors at <mandos@recompile.se>.
 
34
34
from __future__ import (division, absolute_import, print_function,
 
38
 
    from future_builtins import *
 
 
37
from future_builtins import *
 
 
39
import SocketServer as socketserver
 
48
 
    import SocketServer as socketserver
 
55
 
    import ConfigParser as configparser
 
 
45
import gnutls.connection
 
 
47
import gnutls.library.functions
 
 
48
import gnutls.library.constants
 
 
49
import gnutls.library.types
 
 
50
import ConfigParser as configparser
 
63
59
import logging.handlers
 
70
 
    import cPickle as pickle
 
 
65
import cPickle as pickle
 
73
66
import multiprocessing
 
84
74
import dbus.service
 
86
 
from gi.repository import GLib
 
87
77
from dbus.mainloop.glib import DBusGMainLoop
 
90
80
import xml.dom.minidom
 
93
 
if sys.version_info.major == 2:
 
98
 
# Add collections.abc.Callable if it does not exist
 
100
 
    collections.abc.Callable
 
101
 
except AttributeError:
 
103
 
        Callable = collections.Callable
 
104
 
    collections.abc = abc
 
107
 
# Add shlex.quote if it does not exist
 
110
 
except AttributeError:
 
111
 
    shlex.quote = re.escape
 
113
 
# Show warnings by default
 
114
 
if not sys.warnoptions:
 
116
 
    warnings.simplefilter("default")
 
118
 
# Try to find the value of SO_BINDTODEVICE:
 
120
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
121
 
    # newer, and it is also the most natural place for it:
 
122
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
123
85
except AttributeError:
 
125
 
        # This is where SO_BINDTODEVICE was up to and including Python
 
127
87
        from IN import SO_BINDTODEVICE
 
128
88
    except ImportError:
 
129
 
        # In Python 2.7 it seems to have been removed entirely.
 
130
 
        # Try running the C preprocessor:
 
132
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
134
 
                                  stdin=subprocess.PIPE,
 
135
 
                                  stdout=subprocess.PIPE)
 
136
 
            stdout = cc.communicate(
 
137
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
138
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
139
 
        except (OSError, ValueError, IndexError):
 
141
 
            SO_BINDTODEVICE = None
 
143
 
if sys.version_info < (3, 2):
 
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
 
89
        SO_BINDTODEVICE = None
 
 
91
if sys.version_info.major == 2:
 
147
95
stored_state_file = "clients.pickle"
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
 
 
97
logger = logging.getLogger()
 
154
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
155
 
        ctypes.util.find_library("c")).if_nametoindex
 
 
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
 
102
                      (ctypes.util.find_library("c"))
 
156
104
except (OSError, AttributeError):
 
158
105
    def if_nametoindex(interface):
 
159
106
        "Get an interface index the hard way, i.e. using fcntl()"
 
160
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
 
265
183
                       .replace(b"\n", b"\\n")
 
266
184
                       .replace(b"\0", b"\\x00"))
 
269
187
    def encrypt(self, data, password):
 
270
188
        passphrase = self.password_encode(password)
 
271
 
        with tempfile.NamedTemporaryFile(
 
272
 
                dir=self.tempdir) as passfile:
 
 
189
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
273
191
            passfile.write(passphrase)
 
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
 
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
 
278
196
                                    + self.gnupgargs,
 
279
 
                                    stdin=subprocess.PIPE,
 
280
 
                                    stdout=subprocess.PIPE,
 
281
 
                                    stderr=subprocess.PIPE)
 
282
 
            ciphertext, err = proc.communicate(input=data)
 
 
197
                                    stdin = subprocess.PIPE,
 
 
198
                                    stdout = subprocess.PIPE,
 
 
199
                                    stderr = subprocess.PIPE)
 
 
200
            ciphertext, err = proc.communicate(input = data)
 
283
201
        if proc.returncode != 0:
 
284
202
            raise PGPError(err)
 
285
203
        return ciphertext
 
287
205
    def decrypt(self, data, password):
 
288
206
        passphrase = self.password_encode(password)
 
289
 
        with tempfile.NamedTemporaryFile(
 
290
 
                dir=self.tempdir) as passfile:
 
 
207
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
291
209
            passfile.write(passphrase)
 
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
 
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
 
296
214
                                    + self.gnupgargs,
 
297
 
                                    stdin=subprocess.PIPE,
 
298
 
                                    stdout=subprocess.PIPE,
 
299
 
                                    stderr=subprocess.PIPE)
 
300
 
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
215
                                    stdin = subprocess.PIPE,
 
 
216
                                    stdout = subprocess.PIPE,
 
 
217
                                    stderr = subprocess.PIPE)
 
 
218
            decrypted_plaintext, err = proc.communicate(input
 
301
220
        if proc.returncode != 0:
 
302
221
            raise PGPError(err)
 
303
222
        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
 
332
225
class AvahiError(Exception):
 
333
226
    def __init__(self, value, *args, **kwargs):
 
334
227
        self.value = value
 
335
228
        return super(AvahiError, self).__init__(value, *args,
 
339
231
class AvahiServiceError(AvahiError):
 
343
234
class AvahiGroupError(AvahiError):
 
 
238
class AvahiService(object):
 
348
239
    """An Avahi (Zeroconf) service.
 
351
242
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
352
243
               Used to optionally bind to the specified interface.
 
353
 
    name: string; Example: "Mandos"
 
354
 
    type: string; Example: "_mandos._tcp".
 
 
244
    name: string; Example: 'Mandos'
 
 
245
    type: string; Example: '_mandos._tcp'.
 
355
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
356
247
    port: integer; what port to announce
 
357
248
    TXT: list of strings; TXT record for the service
 
 
516
392
                                    follow_name_owner_changes=True),
 
517
393
                avahi.DBUS_INTERFACE_SERVER)
 
518
394
        self.server.connect_to_signal("StateChanged",
 
519
 
                                      self.server_state_changed)
 
 
395
                                 self.server_state_changed)
 
520
396
        self.server_state_changed(self.server.GetState())
 
523
399
class AvahiServiceToSyslog(AvahiService):
 
524
400
    def rename(self, *args, **kwargs):
 
525
401
        """Add the new name to the syslog messages"""
 
526
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
528
 
        syslogger.setFormatter(logging.Formatter(
 
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
 
402
        ret = AvahiService.rename(self, *args, **kwargs)
 
 
403
        syslogger.setFormatter(logging.Formatter
 
 
404
                               ('Mandos ({}) [%(process)d]:'
 
 
405
                                ' %(levelname)s: %(message)s'
 
534
 
# Pretend that we have a GnuTLS module
 
536
 
    """This isn't so much a class as it is a module-like namespace."""
 
538
 
    library = ctypes.util.find_library("gnutls")
 
540
 
        library = ctypes.util.find_library("gnutls-deb0")
 
541
 
    _library = ctypes.cdll.LoadLibrary(library)
 
544
 
    # Unless otherwise indicated, the constants and types below are
 
545
 
    # all from the gnutls/gnutls.h C header file.
 
556
 
    E_NO_CERTIFICATE_FOUND = -49
 
561
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
562
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
565
 
    class _session_int(ctypes.Structure):
 
567
 
    session_t = ctypes.POINTER(_session_int)
 
569
 
    class certificate_credentials_st(ctypes.Structure):
 
571
 
    certificate_credentials_t = ctypes.POINTER(
 
572
 
        certificate_credentials_st)
 
573
 
    certificate_type_t = ctypes.c_int
 
575
 
    class datum_t(ctypes.Structure):
 
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
 
577
 
                    ("size", ctypes.c_uint)]
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
 
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
582
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
583
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
584
 
    credentials_type_t = ctypes.c_int
 
585
 
    transport_ptr_t = ctypes.c_void_p
 
586
 
    close_request_t = ctypes.c_int
 
589
 
    class Error(Exception):
 
590
 
        def __init__(self, message=None, code=None, args=()):
 
591
 
            # Default usage is by a message string, but if a return
 
592
 
            # code is passed, convert it to a string with
 
595
 
            if message is None and code is not None:
 
596
 
                message = gnutls.strerror(code).decode(
 
597
 
                    "utf-8", errors="replace")
 
598
 
            return super(gnutls.Error, self).__init__(
 
601
 
    class CertificateSecurityError(Error):
 
605
 
        def __init__(self, cls):
 
608
 
        def from_param(self, obj):
 
609
 
            if not isinstance(obj, self.cls):
 
610
 
                raise TypeError("Not of type {}: {!r}"
 
611
 
                                .format(self.cls.__name__, obj))
 
612
 
            return ctypes.byref(obj.from_param(obj))
 
614
 
    class CastToVoidPointer:
 
615
 
        def __init__(self, cls):
 
618
 
        def from_param(self, obj):
 
619
 
            if not isinstance(obj, self.cls):
 
620
 
                raise TypeError("Not of type {}: {!r}"
 
621
 
                                .format(self.cls.__name__, obj))
 
622
 
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
 
624
 
    class With_from_param:
 
626
 
        def from_param(cls, obj):
 
627
 
            return obj._as_parameter_
 
630
 
    class Credentials(With_from_param):
 
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
633
 
            gnutls.certificate_allocate_credentials(self)
 
634
 
            self.type = gnutls.CRD_CERTIFICATE
 
637
 
            gnutls.certificate_free_credentials(self)
 
639
 
    class ClientSession(With_from_param):
 
640
 
        def __init__(self, socket, credentials=None):
 
641
 
            self._as_parameter_ = gnutls.session_t()
 
642
 
            gnutls_flags = gnutls.CLIENT
 
643
 
            if gnutls.check_version(b"3.5.6"):
 
644
 
                gnutls_flags |= gnutls.NO_TICKETS
 
646
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
647
 
            gnutls.init(self, gnutls_flags)
 
649
 
            gnutls.set_default_priority(self)
 
650
 
            gnutls.transport_set_ptr(self, socket.fileno())
 
651
 
            gnutls.handshake_set_private_extensions(self, True)
 
653
 
            if credentials is None:
 
654
 
                credentials = gnutls.Credentials()
 
655
 
            gnutls.credentials_set(self, credentials.type,
 
657
 
            self.credentials = credentials
 
663
 
            return gnutls.handshake(self)
 
665
 
        def send(self, data):
 
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
675
 
    # Error handling functions
 
676
 
    def _error_code(result):
 
677
 
        """A function to raise exceptions on errors, suitable
 
678
 
        for the "restype" attribute on ctypes functions"""
 
679
 
        if result >= gnutls.E_SUCCESS:
 
681
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
682
 
            raise gnutls.CertificateSecurityError(code=result)
 
683
 
        raise gnutls.Error(code=result)
 
685
 
    def _retry_on_error(result, func, arguments,
 
686
 
                        _error_code=_error_code):
 
687
 
        """A function to retry on some errors, suitable
 
688
 
        for the "errcheck" attribute on ctypes functions"""
 
689
 
        while result < gnutls.E_SUCCESS:
 
690
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
691
 
                return _error_code(result)
 
692
 
            result = func(*arguments)
 
695
 
    # Unless otherwise indicated, the function declarations below are
 
696
 
    # all from the gnutls/gnutls.h C header file.
 
699
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
701
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
702
 
    priority_set_direct.restype = _error_code
 
704
 
    init = _library.gnutls_init
 
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
706
 
    init.restype = _error_code
 
708
 
    set_default_priority = _library.gnutls_set_default_priority
 
709
 
    set_default_priority.argtypes = [ClientSession]
 
710
 
    set_default_priority.restype = _error_code
 
712
 
    record_send = _library.gnutls_record_send
 
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
715
 
    record_send.restype = ctypes.c_ssize_t
 
716
 
    record_send.errcheck = _retry_on_error
 
718
 
    certificate_allocate_credentials = (
 
719
 
        _library.gnutls_certificate_allocate_credentials)
 
720
 
    certificate_allocate_credentials.argtypes = [
 
721
 
        PointerTo(Credentials)]
 
722
 
    certificate_allocate_credentials.restype = _error_code
 
724
 
    certificate_free_credentials = (
 
725
 
        _library.gnutls_certificate_free_credentials)
 
726
 
    certificate_free_credentials.argtypes = [Credentials]
 
727
 
    certificate_free_credentials.restype = None
 
729
 
    handshake_set_private_extensions = (
 
730
 
        _library.gnutls_handshake_set_private_extensions)
 
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
733
 
    handshake_set_private_extensions.restype = None
 
735
 
    credentials_set = _library.gnutls_credentials_set
 
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
737
 
                                CastToVoidPointer(Credentials)]
 
738
 
    credentials_set.restype = _error_code
 
740
 
    strerror = _library.gnutls_strerror
 
741
 
    strerror.argtypes = [ctypes.c_int]
 
742
 
    strerror.restype = ctypes.c_char_p
 
744
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
745
 
    certificate_type_get.argtypes = [ClientSession]
 
746
 
    certificate_type_get.restype = _error_code
 
748
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
749
 
    certificate_get_peers.argtypes = [ClientSession,
 
750
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
751
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
753
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
754
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
755
 
    global_set_log_level.restype = None
 
757
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
758
 
    global_set_log_function.argtypes = [log_func]
 
759
 
    global_set_log_function.restype = None
 
761
 
    deinit = _library.gnutls_deinit
 
762
 
    deinit.argtypes = [ClientSession]
 
763
 
    deinit.restype = None
 
765
 
    handshake = _library.gnutls_handshake
 
766
 
    handshake.argtypes = [ClientSession]
 
767
 
    handshake.restype = ctypes.c_int
 
768
 
    handshake.errcheck = _retry_on_error
 
770
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
772
 
    transport_set_ptr.restype = None
 
774
 
    bye = _library.gnutls_bye
 
775
 
    bye.argtypes = [ClientSession, close_request_t]
 
776
 
    bye.restype = ctypes.c_int
 
777
 
    bye.errcheck = _retry_on_error
 
779
 
    check_version = _library.gnutls_check_version
 
780
 
    check_version.argtypes = [ctypes.c_char_p]
 
781
 
    check_version.restype = ctypes.c_char_p
 
783
 
    _need_version = b"3.3.0"
 
784
 
    if check_version(_need_version) is None:
 
785
 
        raise self.Error("Needs GnuTLS {} or later"
 
786
 
                         .format(_need_version))
 
788
 
    _tls_rawpk_version = b"3.6.6"
 
789
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
793
 
        class pubkey_st(ctypes.Structure):
 
795
 
        pubkey_t = ctypes.POINTER(pubkey_st)
 
797
 
        x509_crt_fmt_t = ctypes.c_int
 
799
 
        # All the function declarations below are from
 
801
 
        pubkey_init = _library.gnutls_pubkey_init
 
802
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
803
 
        pubkey_init.restype = _error_code
 
805
 
        pubkey_import = _library.gnutls_pubkey_import
 
806
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
808
 
        pubkey_import.restype = _error_code
 
810
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
811
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
812
 
                                      ctypes.POINTER(ctypes.c_ubyte),
 
813
 
                                      ctypes.POINTER(ctypes.c_size_t)]
 
814
 
        pubkey_get_key_id.restype = _error_code
 
816
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
817
 
        pubkey_deinit.argtypes = [pubkey_t]
 
818
 
        pubkey_deinit.restype = None
 
820
 
        # All the function declarations below are from
 
823
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
824
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
825
 
        openpgp_crt_init.restype = _error_code
 
827
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
828
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
829
 
                                       ctypes.POINTER(datum_t),
 
831
 
        openpgp_crt_import.restype = _error_code
 
833
 
        openpgp_crt_verify_self = \
 
834
 
            _library.gnutls_openpgp_crt_verify_self
 
835
 
        openpgp_crt_verify_self.argtypes = [
 
838
 
            ctypes.POINTER(ctypes.c_uint),
 
840
 
        openpgp_crt_verify_self.restype = _error_code
 
842
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
843
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
844
 
        openpgp_crt_deinit.restype = None
 
846
 
        openpgp_crt_get_fingerprint = (
 
847
 
            _library.gnutls_openpgp_crt_get_fingerprint)
 
848
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
852
 
        openpgp_crt_get_fingerprint.restype = _error_code
 
854
 
    if check_version(b"3.6.4"):
 
855
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
857
 
        certificate_type_get2.restype = _error_code
 
859
 
    # Remove non-public functions
 
860
 
    del _error_code, _retry_on_error
 
863
 
def call_pipe(connection,       # : multiprocessing.Connection
 
864
 
              func, *args, **kwargs):
 
865
 
    """This function is meant to be called by multiprocessing.Process
 
867
 
    This function runs func(*args, **kwargs), and writes the resulting
 
868
 
    return value on the provided multiprocessing.Connection.
 
870
 
    connection.send(func(*args, **kwargs))
 
 
410
class Client(object):
 
875
411
    """A representation of a client host served by this server.
 
878
 
    approved:   bool(); None if not yet approved/disapproved
 
 
414
    approved:   bool(); 'None' if not yet approved/disapproved
 
879
415
    approval_delay: datetime.timedelta(); Time to wait for approval
 
880
416
    approval_duration: datetime.timedelta(); Duration of one approval
 
881
 
    checker: multiprocessing.Process(); a running checker process used
 
882
 
             to see if the client lives. None if no process is
 
884
 
    checker_callback_tag: a GLib event source tag, or None
 
 
417
    checker:    subprocess.Popen(); a running checker process used
 
 
418
                                    to see if the client lives.
 
 
419
                                    'None' if no process is running.
 
 
420
    checker_callback_tag: a gobject event source tag, or None
 
885
421
    checker_command: string; External command which is run to check
 
886
422
                     if client lives.  %() expansions are done at
 
887
423
                     runtime with vars(self) as dict, so that for
 
888
424
                     instance %(name)s can be used in the command.
 
889
 
    checker_initiator_tag: a GLib event source tag, or None
 
 
425
    checker_initiator_tag: a gobject event source tag, or None
 
890
426
    created:    datetime.datetime(); (UTC) object creation
 
891
427
    client_structure: Object describing what attributes a client has
 
892
428
                      and is used for storing the client at exit
 
893
429
    current_checker_command: string; current running checker_command
 
894
 
    disable_initiator_tag: a GLib event source tag, or None
 
 
430
    disable_initiator_tag: a gobject event source tag, or None
 
896
432
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
897
 
                 uniquely identify an OpenPGP client
 
898
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
899
 
            a client using raw public keys
 
 
433
                 uniquely identify the client
 
900
434
    host:       string; available for use by the checker command
 
901
435
    interval:   datetime.timedelta(); How often to start a new checker
 
902
436
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
1050
579
        self.last_enabled = datetime.datetime.utcnow()
 
1051
580
        self.init_checker()
 
1052
581
        self.send_changedstate()
 
1054
583
    def disable(self, quiet=True):
 
1055
584
        """Disable this client."""
 
1056
585
        if not getattr(self, "enabled", False):
 
1059
 
            log.info("Disabling client %s", self.name)
 
 
588
            logger.info("Disabling client %s", self.name)
 
1060
589
        if getattr(self, "disable_initiator_tag", None) is not None:
 
1061
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
590
            gobject.source_remove(self.disable_initiator_tag)
 
1062
591
            self.disable_initiator_tag = None
 
1063
592
        self.expires = None
 
1064
593
        if getattr(self, "checker_initiator_tag", None) is not None:
 
1065
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
594
            gobject.source_remove(self.checker_initiator_tag)
 
1066
595
            self.checker_initiator_tag = None
 
1067
596
        self.stop_checker()
 
1068
597
        self.enabled = False
 
1070
599
            self.send_changedstate()
 
1071
 
        # Do not run this again if called by a GLib.timeout_add
 
 
600
        # Do not run this again if called by a gobject.timeout_add
 
1074
603
    def __del__(self):
 
1077
606
    def init_checker(self):
 
1078
607
        # Schedule a new checker to be started an 'interval' from now,
 
1079
608
        # and every interval from then on.
 
1080
609
        if self.checker_initiator_tag is not None:
 
1081
 
            GLib.source_remove(self.checker_initiator_tag)
 
1082
 
        self.checker_initiator_tag = GLib.timeout_add(
 
1083
 
            random.randrange(int(self.interval.total_seconds() * 1000
 
 
610
            gobject.source_remove(self.checker_initiator_tag)
 
 
611
        self.checker_initiator_tag = (gobject.timeout_add
 
 
613
                                           .total_seconds() * 1000),
 
1086
615
        # Schedule a disable() when 'timeout' has passed
 
1087
616
        if self.disable_initiator_tag is not None:
 
1088
 
            GLib.source_remove(self.disable_initiator_tag)
 
1089
 
        self.disable_initiator_tag = GLib.timeout_add(
 
1090
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
 
617
            gobject.source_remove(self.disable_initiator_tag)
 
 
618
        self.disable_initiator_tag = (gobject.timeout_add
 
 
620
                                           .total_seconds() * 1000),
 
1091
622
        # Also start a new checker *right now*.
 
1092
623
        self.start_checker()
 
1094
 
    def checker_callback(self, source, condition, connection,
 
 
625
    def checker_callback(self, pid, condition, command):
 
1096
626
        """The checker has completed, so take appropriate actions."""
 
1097
 
        # Read return code from connection (see call_pipe)
 
1098
 
        returncode = connection.recv()
 
1100
 
        if self.checker is not None:
 
1102
627
        self.checker_callback_tag = None
 
1103
628
        self.checker = None
 
1106
 
            self.last_checker_status = returncode
 
1107
 
            self.last_checker_signal = None
 
 
629
        if os.WIFEXITED(condition):
 
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
 
1108
631
            if self.last_checker_status == 0:
 
1109
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
 
632
                logger.info("Checker for %(name)s succeeded",
 
1110
634
                self.checked_ok()
 
1112
 
                log.info("Checker for %(name)s failed", vars(self))
 
 
636
                logger.info("Checker for %(name)s failed",
 
1114
639
            self.last_checker_status = -1
 
1115
 
            self.last_checker_signal = -returncode
 
1116
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
 
640
            logger.warning("Checker for %(name)s crashed?",
 
1119
643
    def checked_ok(self):
 
1120
644
        """Assert that the client has been seen, alive and well."""
 
1121
645
        self.last_checked_ok = datetime.datetime.utcnow()
 
1122
646
        self.last_checker_status = 0
 
1123
 
        self.last_checker_signal = None
 
1124
647
        self.bump_timeout()
 
1126
649
    def bump_timeout(self, timeout=None):
 
1127
650
        """Bump up the timeout for this client."""
 
1128
651
        if timeout is None:
 
1129
652
            timeout = self.timeout
 
1130
653
        if self.disable_initiator_tag is not None:
 
1131
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
654
            gobject.source_remove(self.disable_initiator_tag)
 
1132
655
            self.disable_initiator_tag = None
 
1133
656
        if getattr(self, "enabled", False):
 
1134
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1135
 
                int(timeout.total_seconds() * 1000), self.disable)
 
 
657
            self.disable_initiator_tag = (gobject.timeout_add
 
 
658
                                          (int(timeout.total_seconds()
 
 
659
                                               * 1000), self.disable))
 
1136
660
            self.expires = datetime.datetime.utcnow() + timeout
 
1138
662
    def need_approval(self):
 
1139
663
        self.last_approval_request = datetime.datetime.utcnow()
 
1141
665
    def start_checker(self):
 
1142
666
        """Start a new checker subprocess if one is not running.
 
1144
668
        If a checker already exists, leave it running and do
 
1146
670
        # The reason for not killing a running checker is that if we
 
 
1151
675
        # checkers alone, the checker would have to take more time
 
1152
676
        # than 'timeout' for the client to be disabled, which is as it
 
1155
 
        if self.checker is not None and not self.checker.is_alive():
 
1156
 
            log.warning("Checker was not alive; joining")
 
 
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:
 
 
684
        except OSError as error:
 
 
685
            if error.errno != errno.ECHILD:
 
 
689
                logger.warning("Checker was a zombie")
 
 
690
                gobject.source_remove(self.checker_callback_tag)
 
 
691
                self.checker_callback(pid, status,
 
 
692
                                      self.current_checker_command)
 
1159
693
        # Start a new checker if needed
 
1160
694
        if self.checker is None:
 
1161
695
            # Escape attributes for the shell
 
1163
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1164
 
                for attr in self.runtime_expansions}
 
 
696
            escaped_attrs = { attr:
 
 
697
                                  re.escape(str(getattr(self, attr)))
 
 
698
                              for attr in self.runtime_expansions }
 
1166
700
                command = self.checker_command % escaped_attrs
 
1167
701
            except TypeError as error:
 
1168
 
                log.error('Could not format string "%s"',
 
1169
 
                          self.checker_command, exc_info=error)
 
1170
 
                return True     # Try again later
 
 
702
                logger.error('Could not format string "%s"',
 
 
703
                             self.checker_command, exc_info=error)
 
 
704
                return True # Try again later
 
1171
705
            self.current_checker_command = command
 
1172
 
            log.info("Starting checker %r for %s", command, self.name)
 
1173
 
            # We don't need to redirect stdout and stderr, since
 
1174
 
            # in normal mode, that is already done by daemon(),
 
1175
 
            # and in debug mode we don't want to.  (Stdin is
 
1176
 
            # always replaced by /dev/null.)
 
1177
 
            # The exception is when not debugging but nevertheless
 
1178
 
            # running in the foreground; use the previously
 
1180
 
            popen_args = {"close_fds": True,
 
1183
 
            if (not self.server_settings["debug"]
 
1184
 
                and self.server_settings["foreground"]):
 
1185
 
                popen_args.update({"stdout": wnull,
 
1187
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1188
 
            self.checker = multiprocessing.Process(
 
1190
 
                args=(pipe[1], subprocess.call, command),
 
1192
 
            self.checker.start()
 
1193
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1194
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1195
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1196
 
                self.checker_callback, pipe[0], command)
 
1197
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
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
                # The exception is when not debugging but nevertheless
 
 
714
                # running in the foreground; use the previously
 
 
717
                if (not self.server_settings["debug"]
 
 
718
                    and self.server_settings["foreground"]):
 
 
719
                    popen_args.update({"stdout": wnull,
 
 
721
                self.checker = subprocess.Popen(command,
 
 
725
            except OSError as error:
 
 
726
                logger.error("Failed to start subprocess",
 
 
729
            self.checker_callback_tag = (gobject.child_watch_add
 
 
731
                                          self.checker_callback,
 
 
733
            # The checker may have completed before the gobject
 
 
734
            # watch was added.  Check for this.
 
 
736
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
737
            except OSError as error:
 
 
738
                if error.errno == errno.ECHILD:
 
 
739
                    # This should never happen
 
 
740
                    logger.error("Child process vanished",
 
 
745
                gobject.source_remove(self.checker_callback_tag)
 
 
746
                self.checker_callback(pid, status, command)
 
 
747
        # Re-run this periodically if run by gobject.timeout_add
 
1200
750
    def stop_checker(self):
 
1201
751
        """Force the checker process, if any, to stop."""
 
1202
752
        if self.checker_callback_tag:
 
1203
 
            GLib.source_remove(self.checker_callback_tag)
 
 
753
            gobject.source_remove(self.checker_callback_tag)
 
1204
754
            self.checker_callback_tag = None
 
1205
755
        if getattr(self, "checker", None) is None:
 
1207
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1208
 
        self.checker.terminate()
 
 
757
        logger.debug("Stopping checker for %(name)s", vars(self))
 
 
759
            self.checker.terminate()
 
 
761
            #if self.checker.poll() is None:
 
 
762
            #    self.checker.kill()
 
 
763
        except OSError as error:
 
 
764
            if error.errno != errno.ESRCH: # No such process
 
1209
766
        self.checker = None
 
1212
 
def dbus_service_property(dbus_interface,
 
 
769
def dbus_service_property(dbus_interface, signature="v",
 
 
770
                          access="readwrite", byte_arrays=False):
 
1216
771
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1217
772
    become properties on the D-Bus.
 
1219
774
    The decorated method will be called with no arguments by "Get"
 
1220
775
    and with one argument by "Set".
 
1222
777
    The parameters, where they are supported, are the same as
 
1223
778
    dbus.service.method, except there is only "signature", since the
 
1224
779
    type from Get() and the type sent to Set() is the same.
 
 
1307
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1308
 
    """A D-Bus object with annotations.
 
1310
 
    Classes inheriting from this can use the dbus_annotations
 
1311
 
    decorator to add annotations to methods or signals.
 
 
853
class DBusObjectWithProperties(dbus.service.Object):
 
 
854
    """A D-Bus object with properties.
 
 
856
    Classes inheriting from this can use the dbus_service_property
 
 
857
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
858
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1315
862
    def _is_dbus_thing(thing):
 
1316
863
        """Returns a function testing if an attribute is a D-Bus thing
 
1318
865
        If called like _is_dbus_thing("method") it returns a function
 
1319
866
        suitable for use as predicate to inspect.getmembers().
 
1321
868
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1324
871
    def _get_all_dbus_things(self, thing):
 
1325
872
        """Returns a generator of (name, attribute) pairs
 
1327
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
874
        return ((getattr(athing.__get__(self), "_dbus_name",
 
1328
876
                 athing.__get__(self))
 
1329
877
                for cls in self.__class__.__mro__
 
1330
878
                for name, athing in
 
1331
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1333
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1335
 
                         path_keyword="object_path",
 
1336
 
                         connection_keyword="connection")
 
1337
 
    def Introspect(self, object_path, connection):
 
1338
 
        """Overloading of standard D-Bus method.
 
1340
 
        Inserts annotation tags on methods and signals.
 
1342
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1345
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1347
 
            for if_tag in document.getElementsByTagName("interface"):
 
1348
 
                # Add annotation tags
 
1349
 
                for typ in ("method", "signal"):
 
1350
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1352
 
                        for name, prop in (self.
 
1353
 
                                           _get_all_dbus_things(typ)):
 
1354
 
                            if (name == tag.getAttribute("name")
 
1355
 
                                and prop._dbus_interface
 
1356
 
                                == if_tag.getAttribute("name")):
 
1357
 
                                annots.update(getattr(
 
1358
 
                                    prop, "_dbus_annotations", {}))
 
1359
 
                        for name, value in annots.items():
 
1360
 
                            ann_tag = document.createElement(
 
1362
 
                            ann_tag.setAttribute("name", name)
 
1363
 
                            ann_tag.setAttribute("value", value)
 
1364
 
                            tag.appendChild(ann_tag)
 
1365
 
                # Add interface annotation tags
 
1366
 
                for annotation, value in dict(
 
1367
 
                    itertools.chain.from_iterable(
 
1368
 
                        annotations().items()
 
1369
 
                        for name, annotations
 
1370
 
                        in self._get_all_dbus_things("interface")
 
1371
 
                        if name == if_tag.getAttribute("name")
 
1373
 
                    ann_tag = document.createElement("annotation")
 
1374
 
                    ann_tag.setAttribute("name", annotation)
 
1375
 
                    ann_tag.setAttribute("value", value)
 
1376
 
                    if_tag.appendChild(ann_tag)
 
1377
 
                # Fix argument name for the Introspect method itself
 
1378
 
                if (if_tag.getAttribute("name")
 
1379
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1380
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1381
 
                        if cn.getAttribute("name") == "Introspect":
 
1382
 
                            for arg in cn.getElementsByTagName("arg"):
 
1383
 
                                if (arg.getAttribute("direction")
 
1385
 
                                    arg.setAttribute("name",
 
1387
 
            xmlstring = document.toxml("utf-8")
 
1389
 
        except (AttributeError, xml.dom.DOMException,
 
1390
 
                xml.parsers.expat.ExpatError) as error:
 
1391
 
            log.error("Failed to override Introspection method",
 
1396
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1397
 
    """A D-Bus object with properties.
 
1399
 
    Classes inheriting from this can use the dbus_service_property
 
1400
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
1401
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
879
                inspect.getmembers(cls,
 
 
880
                                   self._is_dbus_thing(thing)))
 
1404
882
    def _get_dbus_property(self, interface_name, property_name):
 
1405
883
        """Returns a bound method if one exists which is a D-Bus
 
1406
884
        property with the specified name and interface.
 
1408
 
        for cls in self.__class__.__mro__:
 
1409
 
            for name, value in inspect.getmembers(
 
1410
 
                    cls, self._is_dbus_thing("property")):
 
 
886
        for cls in  self.__class__.__mro__:
 
 
887
            for name, value in (inspect.getmembers
 
 
889
                                 self._is_dbus_thing("property"))):
 
1411
890
                if (value._dbus_name == property_name
 
1412
891
                    and value._dbus_interface == interface_name):
 
1413
892
                    return value.__get__(self)
 
1415
894
        # No such property
 
1416
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1417
 
            self.dbus_object_path, interface_name, property_name))
 
1420
 
    def _get_all_interface_names(cls):
 
1421
 
        """Get a sequence of all interfaces supported by an object"""
 
1422
 
        return (name for name in set(getattr(getattr(x, attr),
 
1423
 
                                             "_dbus_interface", None)
 
1424
 
                                     for x in (inspect.getmro(cls))
 
1426
 
                if name is not None)
 
1428
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
 
895
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
896
                                   + interface_name + "."
 
 
899
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
1430
900
                         out_signature="v")
 
1431
901
    def Get(self, interface_name, property_name):
 
1432
902
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1555
1037
            document.unlink()
 
1556
1038
        except (AttributeError, xml.dom.DOMException,
 
1557
1039
                xml.parsers.expat.ExpatError) as error:
 
1558
 
            log.error("Failed to override Introspection method",
 
1564
 
    dbus.OBJECT_MANAGER_IFACE
 
1565
 
except AttributeError:
 
1566
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1569
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1570
 
    """A D-Bus object with an ObjectManager.
 
1572
 
    Classes inheriting from this exposes the standard
 
1573
 
    GetManagedObjects call and the InterfacesAdded and
 
1574
 
    InterfacesRemoved signals on the standard
 
1575
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1577
 
    Note: No signals are sent automatically; they must be sent
 
1580
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1581
 
                         out_signature="a{oa{sa{sv}}}")
 
1582
 
    def GetManagedObjects(self):
 
1583
 
        """This function must be overridden"""
 
1584
 
        raise NotImplementedError()
 
1586
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1587
 
                         signature="oa{sa{sv}}")
 
1588
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1591
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1592
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1595
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1597
 
                         path_keyword="object_path",
 
1598
 
                         connection_keyword="connection")
 
1599
 
    def Introspect(self, object_path, connection):
 
1600
 
        """Overloading of standard D-Bus method.
 
1602
 
        Override return argument name of GetManagedObjects to be
 
1603
 
        "objpath_interfaces_and_properties"
 
1605
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1609
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1611
 
            for if_tag in document.getElementsByTagName("interface"):
 
1612
 
                # Fix argument name for the GetManagedObjects method
 
1613
 
                if (if_tag.getAttribute("name")
 
1614
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1615
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1616
 
                        if (cn.getAttribute("name")
 
1617
 
                            == "GetManagedObjects"):
 
1618
 
                            for arg in cn.getElementsByTagName("arg"):
 
1619
 
                                if (arg.getAttribute("direction")
 
1623
 
                                        "objpath_interfaces"
 
1625
 
            xmlstring = document.toxml("utf-8")
 
1627
 
        except (AttributeError, xml.dom.DOMException,
 
1628
 
                xml.parsers.expat.ExpatError) as error:
 
1629
 
            log.error("Failed to override Introspection method",
 
 
1040
            logger.error("Failed to override Introspection method",
 
1631
1042
        return xmlstring
 
1634
1045
def datetime_to_dbus(dt, variant_level=0):
 
1635
1046
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1637
 
        return dbus.String("", variant_level=variant_level)
 
1638
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1048
        return dbus.String("", variant_level = variant_level)
 
 
1049
    return dbus.String(dt.isoformat(),
 
 
1050
                       variant_level=variant_level)
 
1641
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
2002
1413
        server to mandos-client
 
2006
1417
    # Rejected - signal
 
2007
1418
    @dbus.service.signal(_interface, signature="s")
 
2008
1419
    def Rejected(self, reason):
 
2012
1423
    # NeedApproval - signal
 
2013
1424
    @dbus.service.signal(_interface, signature="tb")
 
2014
1425
    def NeedApproval(self, timeout, default):
 
2016
1427
        return self.need_approval()
 
2020
1431
    # Approve - method
 
2021
1432
    @dbus.service.method(_interface, in_signature="b")
 
2022
1433
    def Approve(self, value):
 
2023
1434
        self.approve(value)
 
2025
1436
    # CheckedOK - method
 
2026
1437
    @dbus.service.method(_interface)
 
2027
1438
    def CheckedOK(self):
 
2028
1439
        self.checked_ok()
 
2030
1441
    # Enable - method
 
2031
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2032
1442
    @dbus.service.method(_interface)
 
2033
1443
    def Enable(self):
 
2037
1447
    # StartChecker - method
 
2038
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2039
1448
    @dbus.service.method(_interface)
 
2040
1449
    def StartChecker(self):
 
2042
1451
        self.start_checker()
 
2044
1453
    # Disable - method
 
2045
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2046
1454
    @dbus.service.method(_interface)
 
2047
1455
    def Disable(self):
 
2051
1459
    # StopChecker - method
 
2052
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2053
1460
    @dbus.service.method(_interface)
 
2054
1461
    def StopChecker(self):
 
2055
1462
        self.stop_checker()
 
2059
1466
    # ApprovalPending - property
 
2060
1467
    @dbus_service_property(_interface, signature="b", access="read")
 
2061
1468
    def ApprovalPending_dbus_property(self):
 
2062
1469
        return dbus.Boolean(bool(self.approvals_pending))
 
2064
1471
    # ApprovedByDefault - property
 
2065
 
    @dbus_service_property(_interface,
 
 
1472
    @dbus_service_property(_interface, signature="b",
 
2067
1473
                           access="readwrite")
 
2068
1474
    def ApprovedByDefault_dbus_property(self, value=None):
 
2069
1475
        if value is None:       # get
 
2070
1476
            return dbus.Boolean(self.approved_by_default)
 
2071
1477
        self.approved_by_default = bool(value)
 
2073
1479
    # ApprovalDelay - property
 
2074
 
    @dbus_service_property(_interface,
 
 
1480
    @dbus_service_property(_interface, signature="t",
 
2076
1481
                           access="readwrite")
 
2077
1482
    def ApprovalDelay_dbus_property(self, value=None):
 
2078
1483
        if value is None:       # get
 
2079
1484
            return dbus.UInt64(self.approval_delay.total_seconds()
 
2081
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
2083
1488
    # ApprovalDuration - property
 
2084
 
    @dbus_service_property(_interface,
 
 
1489
    @dbus_service_property(_interface, signature="t",
 
2086
1490
                           access="readwrite")
 
2087
1491
    def ApprovalDuration_dbus_property(self, value=None):
 
2088
1492
        if value is None:       # get
 
2089
1493
            return dbus.UInt64(self.approval_duration.total_seconds()
 
2091
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
2093
1497
    # Name - property
 
2095
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2096
1498
    @dbus_service_property(_interface, signature="s", access="read")
 
2097
1499
    def Name_dbus_property(self):
 
2098
1500
        return dbus.String(self.name)
 
2102
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2103
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2104
 
    def KeyID_dbus_property(self):
 
2105
 
        return dbus.String(self.key_id)
 
2107
1502
    # Fingerprint - property
 
2109
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2110
1503
    @dbus_service_property(_interface, signature="s", access="read")
 
2111
1504
    def Fingerprint_dbus_property(self):
 
2112
1505
        return dbus.String(self.fingerprint)
 
2114
1507
    # Host - property
 
2115
 
    @dbus_service_property(_interface,
 
 
1508
    @dbus_service_property(_interface, signature="s",
 
2117
1509
                           access="readwrite")
 
2118
1510
    def Host_dbus_property(self, value=None):
 
2119
1511
        if value is None:       # get
 
2120
1512
            return dbus.String(self.host)
 
2121
1513
        self.host = str(value)
 
2123
1515
    # Created - property
 
2125
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2126
1516
    @dbus_service_property(_interface, signature="s", access="read")
 
2127
1517
    def Created_dbus_property(self):
 
2128
1518
        return datetime_to_dbus(self.created)
 
2130
1520
    # LastEnabled - property
 
2131
1521
    @dbus_service_property(_interface, signature="s", access="read")
 
2132
1522
    def LastEnabled_dbus_property(self):
 
2133
1523
        return datetime_to_dbus(self.last_enabled)
 
2135
1525
    # Enabled - property
 
2136
 
    @dbus_service_property(_interface,
 
 
1526
    @dbus_service_property(_interface, signature="b",
 
2138
1527
                           access="readwrite")
 
2139
1528
    def Enabled_dbus_property(self, value=None):
 
2140
1529
        if value is None:       # get
 
 
2241
1626
            self.start_checker()
 
2243
1628
            self.stop_checker()
 
2245
1630
    # ObjectPath - property
 
2247
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2248
 
         "org.freedesktop.DBus.Deprecated": "true"})
 
2249
1631
    @dbus_service_property(_interface, signature="o", access="read")
 
2250
1632
    def ObjectPath_dbus_property(self):
 
2251
 
        return self.dbus_object_path  # is already a dbus.ObjectPath
 
 
1633
        return self.dbus_object_path # is already a dbus.ObjectPath
 
2253
1635
    # Secret = property
 
2255
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2257
 
    @dbus_service_property(_interface,
 
 
1636
    @dbus_service_property(_interface, signature="ay",
 
 
1637
                           access="write", byte_arrays=True)
 
2261
1638
    def Secret_dbus_property(self, value):
 
2262
1639
        self.secret = bytes(value)
 
2268
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
 
1644
class ProxyClient(object):
 
 
1645
    def __init__(self, child_pipe, fpr, address):
 
2269
1646
        self._pipe = child_pipe
 
2270
 
        self._pipe.send(("init", key_id, fpr, address))
 
 
1647
        self._pipe.send(('init', fpr, address))
 
2271
1648
        if not self._pipe.recv():
 
2272
 
            raise KeyError(key_id or fpr)
 
2274
1651
    def __getattribute__(self, name):
 
2276
1653
            return super(ProxyClient, self).__getattribute__(name)
 
2277
 
        self._pipe.send(("getattr", name))
 
 
1654
        self._pipe.send(('getattr', name))
 
2278
1655
        data = self._pipe.recv()
 
2279
 
        if data[0] == "data":
 
 
1656
        if data[0] == 'data':
 
2281
 
        if data[0] == "function":
 
 
1658
        if data[0] == 'function':
 
2283
1659
            def func(*args, **kwargs):
 
2284
 
                self._pipe.send(("funcall", name, args, kwargs))
 
 
1660
                self._pipe.send(('funcall', name, args, kwargs))
 
2285
1661
                return self._pipe.recv()[1]
 
2289
1664
    def __setattr__(self, name, value):
 
2291
1666
            return super(ProxyClient, self).__setattr__(name, value)
 
2292
 
        self._pipe.send(("setattr", name, value))
 
 
1667
        self._pipe.send(('setattr', name, value))
 
2295
1670
class ClientHandler(socketserver.BaseRequestHandler, object):
 
2296
1671
    """A class to handle client connections.
 
2298
1673
    Instantiated once for each connection to handle it.
 
2299
1674
    Note: This will run in its own forked process."""
 
2301
1676
    def handle(self):
 
2302
1677
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
2303
 
            log.info("TCP connection from: %s",
 
2304
 
                     str(self.client_address))
 
2305
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
 
2307
 
            session = gnutls.ClientSession(self.request)
 
2309
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2310
 
            #                       "+AES-256-CBC", "+SHA1",
 
2311
 
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
1678
            logger.info("TCP connection from: %s",
 
 
1679
                        str(self.client_address))
 
 
1680
            logger.debug("Pipe FD: %d",
 
 
1681
                         self.server.child_pipe.fileno())
 
 
1683
            session = (gnutls.connection
 
 
1684
                       .ClientSession(self.request,
 
 
1686
                                      .X509Credentials()))
 
 
1688
            # Note: gnutls.connection.X509Credentials is really a
 
 
1689
            # generic GnuTLS certificate credentials object so long as
 
 
1690
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1691
            # here despite using OpenPGP certificates.
 
 
1693
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
1694
            #                      "+AES-256-CBC", "+SHA1",
 
 
1695
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
2313
1697
            # Use a fallback default, since this MUST be set.
 
2314
1698
            priority = self.server.gnutls_priority
 
2315
1699
            if priority is None:
 
2316
1700
                priority = "NORMAL"
 
2317
 
            gnutls.priority_set_direct(session,
 
2318
 
                                       priority.encode("utf-8"), None)
 
 
1701
            (gnutls.library.functions
 
 
1702
             .gnutls_priority_set_direct(session._c_object,
 
2320
1705
            # Start communication using the Mandos protocol
 
2321
1706
            # Get protocol number
 
2322
1707
            line = self.request.makefile().readline()
 
2323
 
            log.debug("Protocol version: %r", line)
 
 
1708
            logger.debug("Protocol version: %r", line)
 
2325
1710
                if int(line.strip().split()[0]) > 1:
 
2326
1711
                    raise RuntimeError(line)
 
2327
1712
            except (ValueError, IndexError, RuntimeError) as error:
 
2328
 
                log.error("Unknown protocol version: %s", error)
 
 
1713
                logger.error("Unknown protocol version: %s", error)
 
2331
1716
            # Start GnuTLS connection
 
2333
1718
                session.handshake()
 
2334
 
            except gnutls.Error as error:
 
2335
 
                log.warning("Handshake failed: %s", error)
 
 
1719
            except gnutls.errors.GNUTLSError as error:
 
 
1720
                logger.warning("Handshake failed: %s", error)
 
2336
1721
                # Do not run session.bye() here: the session is not
 
2337
1722
                # established.  Just abandon the request.
 
2339
 
            log.debug("Handshake succeeded")
 
 
1724
            logger.debug("Handshake succeeded")
 
2341
1726
            approval_required = False
 
2343
 
                if gnutls.has_rawpk:
 
2346
 
                        key_id = self.key_id(
 
2347
 
                            self.peer_certificate(session))
 
2348
 
                    except (TypeError, gnutls.Error) as error:
 
2349
 
                        log.warning("Bad certificate: %s", error)
 
2351
 
                    log.debug("Key ID: %s",
 
2352
 
                              key_id.decode("utf-8",
 
2358
 
                        fpr = self.fingerprint(
 
2359
 
                            self.peer_certificate(session))
 
2360
 
                    except (TypeError, gnutls.Error) as error:
 
2361
 
                        log.warning("Bad certificate: %s", error)
 
2363
 
                    log.debug("Fingerprint: %s", fpr)
 
2366
 
                    client = ProxyClient(child_pipe, key_id, fpr,
 
 
1729
                    fpr = self.fingerprint(self.peer_certificate
 
 
1732
                        gnutls.errors.GNUTLSError) as error:
 
 
1733
                    logger.warning("Bad certificate: %s", error)
 
 
1735
                logger.debug("Fingerprint: %s", fpr)
 
 
1738
                    client = ProxyClient(child_pipe, fpr,
 
2367
1739
                                         self.client_address)
 
2368
1740
                except KeyError:
 
2371
1743
                if client.approval_delay:
 
2372
1744
                    delay = client.approval_delay
 
2373
1745
                    client.approvals_pending += 1
 
2374
1746
                    approval_required = True
 
2377
1749
                    if not client.enabled:
 
2378
 
                        log.info("Client %s is disabled", client.name)
 
 
1750
                        logger.info("Client %s is disabled",
 
2379
1752
                        if self.server.use_dbus:
 
2380
1753
                            # Emit D-Bus signal
 
2381
1754
                            client.Rejected("Disabled")
 
2384
1757
                    if client.approved or not client.approval_delay:
 
2385
 
                        # We are approved or approval is disabled
 
 
1758
                        #We are approved or approval is disabled
 
2387
1760
                    elif client.approved is None:
 
2388
 
                        log.info("Client %s needs approval",
 
 
1761
                        logger.info("Client %s needs approval",
 
2390
1763
                        if self.server.use_dbus:
 
2391
1764
                            # Emit D-Bus signal
 
2392
1765
                            client.NeedApproval(
 
2393
1766
                                client.approval_delay.total_seconds()
 
2394
1767
                                * 1000, client.approved_by_default)
 
2396
 
                        log.warning("Client %s was not approved",
 
 
1769
                        logger.warning("Client %s was not approved",
 
2398
1771
                        if self.server.use_dbus:
 
2399
1772
                            # Emit D-Bus signal
 
2400
1773
                            client.Rejected("Denied")
 
2403
 
                    # wait until timeout or approved
 
 
1776
                    #wait until timeout or approved
 
2404
1777
                    time = datetime.datetime.now()
 
2405
1778
                    client.changedstate.acquire()
 
2406
1779
                    client.changedstate.wait(delay.total_seconds())
 
 
2421
1794
                        delay -= time2 - time
 
2424
 
                    session.send(client.secret)
 
2425
 
                except gnutls.Error as error:
 
2426
 
                    log.warning("gnutls send failed", exc_info=error)
 
2429
 
                log.info("Sending secret to %s", client.name)
 
 
1797
                while sent_size < len(client.secret):
 
 
1799
                        sent = session.send(client.secret[sent_size:])
 
 
1800
                    except gnutls.errors.GNUTLSError as error:
 
 
1801
                        logger.warning("gnutls send failed",
 
 
1804
                    logger.debug("Sent: %d, remaining: %d",
 
 
1805
                                 sent, len(client.secret)
 
 
1806
                                 - (sent_size + sent))
 
 
1809
                logger.info("Sending secret to %s", client.name)
 
2430
1810
                # bump the timeout using extended_timeout
 
2431
1811
                client.bump_timeout(client.extended_timeout)
 
2432
1812
                if self.server.use_dbus:
 
2433
1813
                    # Emit D-Bus signal
 
2434
1814
                    client.GotSecret()
 
2437
1817
                if approval_required:
 
2438
1818
                    client.approvals_pending -= 1
 
2441
 
                except gnutls.Error as error:
 
2442
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
 
1821
                except gnutls.errors.GNUTLSError as error:
 
 
1822
                    logger.warning("GnuTLS bye failed",
 
2445
1826
    def peer_certificate(session):
 
2446
 
        "Return the peer's certificate as a bytestring"
 
2448
 
            cert_type = gnutls.certificate_type_get2(
 
2449
 
                session, gnutls.CTYPE_PEERS)
 
2450
 
        except AttributeError:
 
2451
 
            cert_type = gnutls.certificate_type_get(session)
 
2452
 
        if gnutls.has_rawpk:
 
2453
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2455
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2456
 
        # If not a valid certificate type...
 
2457
 
        if cert_type not in valid_cert_types:
 
2458
 
            log.info("Cert type %r not in %r", cert_type,
 
2460
 
            # ...return invalid data
 
 
1827
        "Return the peer's OpenPGP certificate as a bytestring"
 
 
1828
        # If not an OpenPGP certificate...
 
 
1829
        if (gnutls.library.functions
 
 
1830
            .gnutls_certificate_type_get(session._c_object)
 
 
1831
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1832
            # ...do the normal thing
 
 
1833
            return session.peer_certificate
 
2462
1834
        list_size = ctypes.c_uint(1)
 
2463
 
        cert_list = (gnutls.certificate_get_peers
 
2464
 
                     (session, ctypes.byref(list_size)))
 
 
1835
        cert_list = (gnutls.library.functions
 
 
1836
                     .gnutls_certificate_get_peers
 
 
1837
                     (session._c_object, ctypes.byref(list_size)))
 
2465
1838
        if not bool(cert_list) and list_size.value != 0:
 
2466
 
            raise gnutls.Error("error getting peer certificate")
 
 
1839
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2467
1841
        if list_size.value == 0:
 
2469
1843
        cert = cert_list[0]
 
2470
1844
        return ctypes.string_at(cert.data, cert.size)
 
2473
 
    def key_id(certificate):
 
2474
 
        "Convert a certificate bytestring to a hexdigit key ID"
 
2475
 
        # New GnuTLS "datum" with the public key
 
2476
 
        datum = gnutls.datum_t(
 
2477
 
            ctypes.cast(ctypes.c_char_p(certificate),
 
2478
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2479
 
            ctypes.c_uint(len(certificate)))
 
2480
 
        # XXX all these need to be created in the gnutls "module"
 
2481
 
        # New empty GnuTLS certificate
 
2482
 
        pubkey = gnutls.pubkey_t()
 
2483
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2484
 
        # Import the raw public key into the certificate
 
2485
 
        gnutls.pubkey_import(pubkey,
 
2486
 
                             ctypes.byref(datum),
 
2487
 
                             gnutls.X509_FMT_DER)
 
2488
 
        # New buffer for the key ID
 
2489
 
        buf = ctypes.create_string_buffer(32)
 
2490
 
        buf_len = ctypes.c_size_t(len(buf))
 
2491
 
        # Get the key ID from the raw public key into the buffer
 
2492
 
        gnutls.pubkey_get_key_id(
 
2494
 
            gnutls.KEYID_USE_SHA256,
 
2495
 
            ctypes.cast(ctypes.byref(buf),
 
2496
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2497
 
            ctypes.byref(buf_len))
 
2498
 
        # Deinit the certificate
 
2499
 
        gnutls.pubkey_deinit(pubkey)
 
2501
 
        # Convert the buffer to a Python bytestring
 
2502
 
        key_id = ctypes.string_at(buf, buf_len.value)
 
2503
 
        # Convert the bytestring to hexadecimal notation
 
2504
 
        hex_key_id = binascii.hexlify(key_id).upper()
 
2508
1847
    def fingerprint(openpgp):
 
2509
1848
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2510
1849
        # New GnuTLS "datum" with the OpenPGP public key
 
2511
 
        datum = gnutls.datum_t(
 
2512
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2513
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2514
 
            ctypes.c_uint(len(openpgp)))
 
 
1850
        datum = (gnutls.library.types
 
 
1851
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1854
                                 ctypes.c_uint(len(openpgp))))
 
2515
1855
        # New empty GnuTLS certificate
 
2516
 
        crt = gnutls.openpgp_crt_t()
 
2517
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
 
1856
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1857
        (gnutls.library.functions
 
 
1858
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2518
1859
        # Import the OpenPGP public key into the certificate
 
2519
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2520
 
                                  gnutls.OPENPGP_FMT_RAW)
 
 
1860
        (gnutls.library.functions
 
 
1861
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1862
                                    gnutls.library.constants
 
 
1863
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2521
1864
        # Verify the self signature in the key
 
2522
1865
        crtverify = ctypes.c_uint()
 
2523
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2524
 
                                       ctypes.byref(crtverify))
 
 
1866
        (gnutls.library.functions
 
 
1867
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1868
                                         ctypes.byref(crtverify)))
 
2525
1869
        if crtverify.value != 0:
 
2526
 
            gnutls.openpgp_crt_deinit(crt)
 
2527
 
            raise gnutls.CertificateSecurityError(code
 
 
1870
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1871
            raise (gnutls.errors.CertificateSecurityError
 
2529
1873
        # New buffer for the fingerprint
 
2530
1874
        buf = ctypes.create_string_buffer(20)
 
2531
1875
        buf_len = ctypes.c_size_t()
 
2532
1876
        # Get the fingerprint from the certificate into the buffer
 
2533
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2534
 
                                           ctypes.byref(buf_len))
 
 
1877
        (gnutls.library.functions
 
 
1878
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1879
                                             ctypes.byref(buf_len)))
 
2535
1880
        # Deinit the certificate
 
2536
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2537
1882
        # Convert the buffer to a Python bytestring
 
2538
1883
        fpr = ctypes.string_at(buf, buf_len.value)
 
2539
1884
        # Convert the bytestring to hexadecimal notation
 
 
2628
1967
        # socket_wrapper(), if socketfd was set.
 
2629
1968
        socketserver.TCPServer.__init__(self, server_address,
 
2630
1969
                                        RequestHandlerClass)
 
2632
1971
    def server_bind(self):
 
2633
1972
        """This overrides the normal server_bind() function
 
2634
1973
        to bind to an interface if one was specified, and also NOT to
 
2635
1974
        bind to an address or port if they were not specified."""
 
2636
 
        global SO_BINDTODEVICE
 
2637
1975
        if self.interface is not None:
 
2638
1976
            if SO_BINDTODEVICE is None:
 
2639
 
                # Fall back to a hard-coded value which seems to be
 
2641
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2642
 
                SO_BINDTODEVICE = 25
 
2644
 
                self.socket.setsockopt(
 
2645
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2646
 
                    (self.interface + "\0").encode("utf-8"))
 
2647
 
            except socket.error as error:
 
2648
 
                if error.errno == errno.EPERM:
 
2649
 
                    log.error("No permission to bind to interface %s",
 
2651
 
                elif error.errno == errno.ENOPROTOOPT:
 
2652
 
                    log.error("SO_BINDTODEVICE not available; cannot"
 
2653
 
                              " bind to interface %s", self.interface)
 
2654
 
                elif error.errno == errno.ENODEV:
 
2655
 
                    log.error("Interface %s does not exist, cannot"
 
2656
 
                              " bind", self.interface)
 
 
1977
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1978
                             " cannot bind to interface %s",
 
 
1982
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1984
                                           (self.interface + "\0")
 
 
1986
                except socket.error as error:
 
 
1987
                    if error.errno == errno.EPERM:
 
 
1988
                        logger.error("No permission to bind to"
 
 
1989
                                     " interface %s", self.interface)
 
 
1990
                    elif error.errno == errno.ENOPROTOOPT:
 
 
1991
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1992
                                     " cannot bind to interface %s",
 
 
1994
                    elif error.errno == errno.ENODEV:
 
 
1995
                        logger.error("Interface %s does not exist,"
 
 
1996
                                     " cannot bind", self.interface)
 
2659
1999
        # Only bind(2) the socket if we really need to.
 
2660
2000
        if self.server_address[0] or self.server_address[1]:
 
2661
 
            if self.server_address[1]:
 
2662
 
                self.allow_reuse_address = True
 
2663
2001
            if not self.server_address[0]:
 
2664
2002
                if self.address_family == socket.AF_INET6:
 
2665
 
                    any_address = "::"  # in6addr_any
 
 
2003
                    any_address = "::" # in6addr_any
 
2667
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
2005
                    any_address = "0.0.0.0" # INADDR_ANY
 
2668
2006
                self.server_address = (any_address,
 
2669
2007
                                       self.server_address[1])
 
2670
2008
            elif not self.server_address[1]:
 
2671
 
                self.server_address = (self.server_address[0], 0)
 
 
2009
                self.server_address = (self.server_address[0],
 
2672
2011
#                 if self.interface:
 
2673
2012
#                     self.server_address = (self.server_address[0],
 
 
2704
2038
        self.gnutls_priority = gnutls_priority
 
2705
2039
        IPv6_TCPServer.__init__(self, server_address,
 
2706
2040
                                RequestHandlerClass,
 
2707
 
                                interface=interface,
 
 
2041
                                interface = interface,
 
 
2042
                                use_ipv6 = use_ipv6,
 
 
2043
                                socketfd = socketfd)
 
2711
2044
    def server_activate(self):
 
2712
2045
        if self.enabled:
 
2713
2046
            return socketserver.TCPServer.server_activate(self)
 
2715
2048
    def enable(self):
 
2716
2049
        self.enabled = True
 
2718
2051
    def add_pipe(self, parent_pipe, proc):
 
2719
2052
        # Call "handle_ipc" for both data and EOF events
 
2721
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2722
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2723
 
            functools.partial(self.handle_ipc,
 
2724
 
                              parent_pipe=parent_pipe,
 
2727
 
    def handle_ipc(self, source, condition,
 
2730
 
                   client_object=None):
 
 
2053
        gobject.io_add_watch(parent_pipe.fileno(),
 
 
2054
                             gobject.IO_IN | gobject.IO_HUP,
 
 
2055
                             functools.partial(self.handle_ipc,
 
 
2060
    def handle_ipc(self, source, condition, parent_pipe=None,
 
 
2061
                   proc = None, client_object=None):
 
2731
2062
        # error, or the other end of multiprocessing.Pipe has closed
 
2732
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
 
2063
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2733
2064
            # Wait for other process to exit
 
2737
2068
        # Read a request from the child
 
2738
2069
        request = parent_pipe.recv()
 
2739
2070
        command = request[0]
 
2741
 
        if command == "init":
 
2742
 
            key_id = request[1].decode("ascii")
 
2743
 
            fpr = request[2].decode("ascii")
 
2744
 
            address = request[3]
 
2746
 
            for c in self.clients.values():
 
2747
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2748
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2750
 
                if key_id and c.key_id == key_id:
 
2753
 
                if fpr and c.fingerprint == fpr:
 
 
2072
        if command == 'init':
 
 
2074
            address = request[2]
 
 
2076
            for c in self.clients.itervalues():
 
 
2077
                if c.fingerprint == fpr:
 
2757
 
                log.info("Client not found for key ID: %s, address:"
 
2758
 
                         " %s", key_id or fpr, address)
 
 
2081
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2082
                            "dress: %s", fpr, address)
 
2759
2083
                if self.use_dbus:
 
2760
2084
                    # Emit D-Bus signal
 
2761
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
 
2085
                    mandos_dbus_service.ClientNotFound(fpr,
 
2763
2087
                parent_pipe.send(False)
 
2767
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2768
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2769
 
                functools.partial(self.handle_ipc,
 
2770
 
                                  parent_pipe=parent_pipe,
 
2772
 
                                  client_object=client))
 
 
2090
            gobject.io_add_watch(parent_pipe.fileno(),
 
 
2091
                                 gobject.IO_IN | gobject.IO_HUP,
 
 
2092
                                 functools.partial(self.handle_ipc,
 
2773
2098
            parent_pipe.send(True)
 
2774
2099
            # remove the old hook in favor of the new above hook on
 
2777
 
        if command == "funcall":
 
 
2102
        if command == 'funcall':
 
2778
2103
            funcname = request[1]
 
2779
2104
            args = request[2]
 
2780
2105
            kwargs = request[3]
 
2782
 
            parent_pipe.send(("data", getattr(client_object,
 
 
2107
            parent_pipe.send(('data', getattr(client_object,
 
2783
2108
                                              funcname)(*args,
 
2786
 
        if command == "getattr":
 
 
2111
        if command == 'getattr':
 
2787
2112
            attrname = request[1]
 
2788
 
            if isinstance(client_object.__getattribute__(attrname),
 
2789
 
                          collections.abc.Callable):
 
2790
 
                parent_pipe.send(("function", ))
 
 
2113
            if callable(client_object.__getattribute__(attrname)):
 
 
2114
                parent_pipe.send(('function',))
 
2793
 
                    "data", client_object.__getattribute__(attrname)))
 
2795
 
        if command == "setattr":
 
 
2116
                parent_pipe.send(('data', client_object
 
 
2117
                                  .__getattribute__(attrname)))
 
 
2119
        if command == 'setattr':
 
2796
2120
            attrname = request[1]
 
2797
2121
            value = request[2]
 
2798
2122
            setattr(client_object, attrname, value)
 
2803
2127
def rfc3339_duration_to_delta(duration):
 
2804
2128
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2806
 
    >>> timedelta = datetime.timedelta
 
2807
 
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2809
 
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2811
 
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2813
 
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2815
 
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2817
 
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2819
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
 
2130
    >>> rfc3339_duration_to_delta("P7D")
 
 
2131
    datetime.timedelta(7)
 
 
2132
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2133
    datetime.timedelta(0, 60)
 
 
2134
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2135
    datetime.timedelta(0, 3600)
 
 
2136
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2137
    datetime.timedelta(1)
 
 
2138
    >>> rfc3339_duration_to_delta("P1W")
 
 
2139
    datetime.timedelta(7)
 
 
2140
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2141
    datetime.timedelta(0, 330)
 
 
2142
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2143
    datetime.timedelta(1, 200)
 
2824
2146
    # Parsing an RFC 3339 duration with regular expressions is not
 
2825
2147
    # possible - there would have to be multiple places for the same
 
2826
2148
    # values, like seconds.  The current code, while more esoteric, is
 
2827
2149
    # cleaner without depending on a parsing library.  If Python had a
 
2828
2150
    # built-in library for parsing we would use it, but we'd like to
 
2829
2151
    # avoid excessive use of external libraries.
 
2831
2153
    # New type for defining tokens, syntax, and semantics all-in-one
 
2832
 
    Token = collections.namedtuple("Token", (
 
2833
 
        "regexp",  # To match token; if "value" is not None, must have
 
2834
 
                   # a "group" containing digits
 
2835
 
        "value",   # datetime.timedelta or None
 
2836
 
        "followers"))           # Tokens valid after this token
 
 
2154
    Token = collections.namedtuple("Token",
 
 
2155
                                   ("regexp", # To match token; if
 
 
2156
                                              # "value" is not None,
 
 
2157
                                              # must have a "group"
 
 
2159
                                    "value",  # datetime.timedelta or
 
 
2161
                                    "followers")) # Tokens valid after
 
2837
2163
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2838
2164
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2839
2165
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2840
2166
    token_second = Token(re.compile(r"(\d+)S"),
 
2841
2167
                         datetime.timedelta(seconds=1),
 
2842
 
                         frozenset((token_end, )))
 
 
2168
                         frozenset((token_end,)))
 
2843
2169
    token_minute = Token(re.compile(r"(\d+)M"),
 
2844
2170
                         datetime.timedelta(minutes=1),
 
2845
2171
                         frozenset((token_second, token_end)))
 
 
3176
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3177
2500
    except OSError as error:
 
3178
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
 
3179
 
                    os.strerror(error.errno))
 
3180
2501
        if error.errno != errno.EPERM:
 
3184
2505
        # Enable all possible GnuTLS debugging
 
3186
2507
        # "Use a log level over 10 to enable all debugging options."
 
3187
2508
        # - GnuTLS manual
 
3188
 
        gnutls.global_set_log_level(11)
 
 
2509
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2511
        @gnutls.library.types.gnutls_log_func
 
3191
2512
        def debug_gnutls(level, string):
 
3192
 
            log.debug("GnuTLS: %s",
 
3193
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3195
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
2513
            logger.debug("GnuTLS: %s", string[:-1])
 
 
2515
        (gnutls.library.functions
 
 
2516
         .gnutls_global_set_log_function(debug_gnutls))
 
3197
2518
        # Redirect stdin so all checkers get /dev/null
 
3198
2519
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
3199
2520
        os.dup2(null, sys.stdin.fileno())
 
3203
2524
    # Need to fork before connecting to D-Bus
 
3204
2525
    if not foreground:
 
3205
2526
        # Close all input and output, do double fork, etc.
 
3208
 
    if gi.version_info < (3, 10, 2):
 
3209
 
        # multiprocessing will use threads, so before we use GLib we
 
3210
 
        # need to inform GLib that threads will be used.
 
 
2529
    # multiprocessing will use threads, so before we use gobject we
 
 
2530
    # need to inform gobject that threads will be used.
 
 
2531
    gobject.threads_init()
 
3213
2533
    global main_loop
 
3214
2534
    # From the Avahi example code
 
3215
2535
    DBusGMainLoop(set_as_default=True)
 
3216
 
    main_loop = GLib.MainLoop()
 
 
2536
    main_loop = gobject.MainLoop()
 
3217
2537
    bus = dbus.SystemBus()
 
3218
2538
    # End of Avahi example code
 
3221
2541
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3224
 
            old_bus_name = dbus.service.BusName(
 
3225
 
                "se.bsnet.fukt.Mandos", bus,
 
3227
 
        except dbus.exceptions.DBusException as e:
 
3228
 
            log.error("Disabling D-Bus:", exc_info=e)
 
 
2542
                                            bus, do_not_queue=True)
 
 
2543
            old_bus_name = (dbus.service.BusName
 
 
2544
                            ("se.bsnet.fukt.Mandos", bus,
 
 
2546
        except dbus.exceptions.NameExistsException as e:
 
 
2547
            logger.error("Disabling D-Bus:", exc_info=e)
 
3229
2548
            use_dbus = False
 
3230
2549
            server_settings["use_dbus"] = False
 
3231
2550
            tcp_server.use_dbus = False
 
3233
2552
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3234
 
        service = AvahiServiceToSyslog(
 
3235
 
            name=server_settings["servicename"],
 
3236
 
            servicetype="_mandos._tcp",
 
 
2553
        service = AvahiServiceToSyslog(name =
 
 
2554
                                       server_settings["servicename"],
 
 
2555
                                       servicetype = "_mandos._tcp",
 
 
2556
                                       protocol = protocol, bus = bus)
 
3239
2557
        if server_settings["interface"]:
 
3240
 
            service.interface = if_nametoindex(
 
3241
 
                server_settings["interface"].encode("utf-8"))
 
 
2558
            service.interface = (if_nametoindex
 
 
2559
                                 (server_settings["interface"]
 
3243
2562
    global multiprocessing_manager
 
3244
2563
    multiprocessing_manager = multiprocessing.Manager()
 
3246
2565
    client_class = Client
 
3248
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
2567
        client_class = functools.partial(ClientDBus, bus = bus)
 
3250
2569
    client_settings = Client.config_parser(client_config)
 
3251
2570
    old_client_settings = {}
 
3252
2571
    clients_data = {}
 
3254
2573
    # This is used to redirect stdout and stderr for checker processes
 
3256
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
2575
    wnull = open(os.devnull, "w") # A writable /dev/null
 
3257
2576
    # Only used if server is running in foreground but not in debug
 
3259
2578
    if debug or not foreground:
 
3262
2581
    # Get client data and settings from last running state.
 
3263
2582
    if server_settings["restore"]:
 
3265
2584
            with open(stored_state_path, "rb") as stored_state:
 
3266
 
                if sys.version_info.major == 2:
 
3267
 
                    clients_data, old_client_settings = pickle.load(
 
3270
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3271
 
                        pickle.load(stored_state, encoding="bytes"))
 
3272
 
                    #   Fix bytes to strings
 
3275
 
                    clients_data = {(key.decode("utf-8")
 
3276
 
                                     if isinstance(key, bytes)
 
3279
 
                                    bytes_clients_data.items()}
 
3280
 
                    del bytes_clients_data
 
3281
 
                    for key in clients_data:
 
3282
 
                        value = {(k.decode("utf-8")
 
3283
 
                                  if isinstance(k, bytes) else k): v
 
3285
 
                                 clients_data[key].items()}
 
3286
 
                        clients_data[key] = value
 
3288
 
                        value["client_structure"] = [
 
3290
 
                             if isinstance(s, bytes)
 
3292
 
                            value["client_structure"]]
 
3293
 
                        # .name, .host, and .checker_command
 
3294
 
                        for k in ("name", "host", "checker_command"):
 
3295
 
                            if isinstance(value[k], bytes):
 
3296
 
                                value[k] = value[k].decode("utf-8")
 
3297
 
                        if "key_id" not in value:
 
3298
 
                            value["key_id"] = ""
 
3299
 
                        elif "fingerprint" not in value:
 
3300
 
                            value["fingerprint"] = ""
 
3301
 
                    #  old_client_settings
 
3303
 
                    old_client_settings = {
 
3304
 
                        (key.decode("utf-8")
 
3305
 
                         if isinstance(key, bytes)
 
3308
 
                        bytes_old_client_settings.items()}
 
3309
 
                    del bytes_old_client_settings
 
3310
 
                    # .host and .checker_command
 
3311
 
                    for value in old_client_settings.values():
 
3312
 
                        for attribute in ("host", "checker_command"):
 
3313
 
                            if isinstance(value[attribute], bytes):
 
3314
 
                                value[attribute] = (value[attribute]
 
 
2585
                clients_data, old_client_settings = (pickle.load
 
3316
2587
            os.remove(stored_state_path)
 
3317
2588
        except IOError as e:
 
3318
2589
            if e.errno == errno.ENOENT:
 
3319
 
                log.warning("Could not load persistent state:"
 
3320
 
                            " %s", os.strerror(e.errno))
 
 
2590
                logger.warning("Could not load persistent state: {}"
 
 
2591
                                .format(os.strerror(e.errno)))
 
3322
 
                log.critical("Could not load persistent state:",
 
 
2593
                logger.critical("Could not load persistent state:",
 
3325
2596
        except EOFError as e:
 
3326
 
            log.warning("Could not load persistent state: EOFError:",
 
 
2597
            logger.warning("Could not load persistent state: "
 
 
2598
                           "EOFError:", exc_info=e)
 
3329
2600
    with PGPEngine() as pgp:
 
3330
2601
        for client_name, client in clients_data.items():
 
3331
2602
            # Skip removed clients
 
3332
2603
            if client_name not in client_settings:
 
3335
2606
            # Decide which value to use after restoring saved state.
 
3336
2607
            # We have three different values: Old config file,
 
3337
2608
            # new config file, and saved state.
 
 
3391
2666
    for client_name in (set(client_settings)
 
3392
2667
                        - set(old_client_settings)):
 
3393
2668
        clients_data[client_name] = client_settings[client_name]
 
3395
2670
    # Create all client objects
 
3396
2671
    for client_name, client in clients_data.items():
 
3397
2672
        tcp_server.clients[client_name] = client_class(
 
3400
 
            server_settings=server_settings)
 
 
2673
            name = client_name, settings = client,
 
 
2674
            server_settings = server_settings)
 
3402
2676
    if not tcp_server.clients:
 
3403
 
        log.warning("No clients defined")
 
 
2677
        logger.warning("No clients defined")
 
3405
2679
    if not foreground:
 
3406
2680
        if pidfile is not None:
 
3410
 
                    print(pid, file=pidfile)
 
 
2684
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
3411
2685
            except IOError:
 
3412
 
                log.error("Could not write to file %r with PID %d",
 
 
2686
                logger.error("Could not write to file %r with PID %d",
 
3415
2689
        del pidfilename
 
3417
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3418
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3419
 
                             lambda: main_loop.quit() and False)
 
 
2691
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
 
2692
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3423
 
        @alternate_dbus_interfaces(
 
3424
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3425
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
2695
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
2696
                                        "se.bsnet.fukt.Mandos"})
 
 
2697
        class MandosDBusService(DBusObjectWithProperties):
 
3426
2698
            """A D-Bus proxy object"""
 
3428
2699
            def __init__(self):
 
3429
2700
                dbus.service.Object.__init__(self, bus, "/")
 
3431
2701
            _interface = "se.recompile.Mandos"
 
 
2703
            @dbus_interface_annotations(_interface)
 
 
2705
                return { "org.freedesktop.DBus.Property"
 
 
2706
                         ".EmitsChangedSignal":
 
3433
2709
            @dbus.service.signal(_interface, signature="o")
 
3434
2710
            def ClientAdded(self, objpath):
 
3438
2714
            @dbus.service.signal(_interface, signature="ss")
 
3439
 
            def ClientNotFound(self, key_id, address):
 
 
2715
            def ClientNotFound(self, fingerprint, address):
 
3443
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3445
2719
            @dbus.service.signal(_interface, signature="os")
 
3446
2720
            def ClientRemoved(self, objpath, name):
 
3450
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3452
2724
            @dbus.service.method(_interface, out_signature="ao")
 
3453
2725
            def GetAllClients(self):
 
3455
 
                return dbus.Array(c.dbus_object_path for c in
 
3456
 
                                  tcp_server.clients.values())
 
3458
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
2727
                return dbus.Array(c.dbus_object_path
 
 
2729
                                  tcp_server.clients.itervalues())
 
3460
2731
            @dbus.service.method(_interface,
 
3461
2732
                                 out_signature="a{oa{sv}}")
 
3462
2733
            def GetAllClientsWithProperties(self):
 
3464
2735
                return dbus.Dictionary(
 
3465
 
                    {c.dbus_object_path: c.GetAll(
 
3466
 
                        "se.recompile.Mandos.Client")
 
3467
 
                     for c in tcp_server.clients.values()},
 
 
2736
                    { c.dbus_object_path: c.GetAll("")
 
 
2737
                      for c in tcp_server.clients.itervalues() },
 
3468
2738
                    signature="oa{sv}")
 
3470
2740
            @dbus.service.method(_interface, in_signature="o")
 
3471
2741
            def RemoveClient(self, object_path):
 
3473
 
                for c in tcp_server.clients.values():
 
 
2743
                for c in tcp_server.clients.itervalues():
 
3474
2744
                    if c.dbus_object_path == object_path:
 
3475
2745
                        del tcp_server.clients[c.name]
 
3476
2746
                        c.remove_from_connection()
 
3477
 
                        # Don't signal the disabling
 
 
2747
                        # Don't signal anything except ClientRemoved
 
3478
2748
                        c.disable(quiet=True)
 
3479
 
                        # Emit D-Bus signal for removal
 
3480
 
                        self.client_removed_signal(c)
 
 
2750
                        self.ClientRemoved(object_path, c.name)
 
3482
2752
                raise KeyError(object_path)
 
3486
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3487
 
                                 out_signature="a{oa{sa{sv}}}")
 
3488
 
            def GetManagedObjects(self):
 
3490
 
                return dbus.Dictionary(
 
3491
 
                    {client.dbus_object_path:
 
3493
 
                         {interface: client.GetAll(interface)
 
3495
 
                          client._get_all_interface_names()})
 
3496
 
                     for client in tcp_server.clients.values()})
 
3498
 
            def client_added_signal(self, client):
 
3499
 
                """Send the new standard signal and the old signal"""
 
3501
 
                    # New standard signal
 
3502
 
                    self.InterfacesAdded(
 
3503
 
                        client.dbus_object_path,
 
3505
 
                            {interface: client.GetAll(interface)
 
3507
 
                             client._get_all_interface_names()}))
 
3509
 
                    self.ClientAdded(client.dbus_object_path)
 
3511
 
            def client_removed_signal(self, client):
 
3512
 
                """Send the new standard signal and the old signal"""
 
3514
 
                    # New standard signal
 
3515
 
                    self.InterfacesRemoved(
 
3516
 
                        client.dbus_object_path,
 
3517
 
                        client._get_all_interface_names())
 
3519
 
                    self.ClientRemoved(client.dbus_object_path,
 
3522
2756
        mandos_dbus_service = MandosDBusService()
 
3524
 
    # Save modules to variables to exempt the modules from being
 
3525
 
    # unloaded before the function registered with atexit() is run.
 
3526
 
    mp = multiprocessing
 
3530
2759
        "Cleanup function; run on exit"
 
3532
2761
            service.cleanup()
 
3534
 
        mp.active_children()
 
 
2763
        multiprocessing.active_children()
 
3536
2765
        if not (tcp_server.clients or client_settings):
 
3539
2768
        # Store client before exiting. Secrets are encrypted with key
 
3540
2769
        # based on what config file has. If config file is
 
3541
2770
        # removed/edited, old secret will thus be unrecovable.
 
3543
2772
        with PGPEngine() as pgp:
 
3544
 
            for client in tcp_server.clients.values():
 
 
2773
            for client in tcp_server.clients.itervalues():
 
3545
2774
                key = client_settings[client.name]["secret"]
 
3546
2775
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3548
2777
                client_dict = {}
 
3550
2779
                # A list of attributes that can not be pickled
 
3552
 
                exclude = {"bus", "changedstate", "secret",
 
3553
 
                           "checker", "server_settings"}
 
3554
 
                for name, typ in inspect.getmembers(dbus.service
 
 
2781
                exclude = { "bus", "changedstate", "secret",
 
 
2782
                            "checker", "server_settings" }
 
 
2783
                for name, typ in (inspect.getmembers
 
 
2784
                                  (dbus.service.Object)):
 
3556
2785
                    exclude.add(name)
 
3558
2787
                client_dict["encrypted_secret"] = (client
 
3559
2788
                                                   .encrypted_secret)
 
3560
2789
                for attr in client.client_structure:
 
3561
2790
                    if attr not in exclude:
 
3562
2791
                        client_dict[attr] = getattr(client, attr)
 
3564
2793
                clients[client.name] = client_dict
 
3565
2794
                del client_settings[client.name]["secret"]
 
3568
 
            with tempfile.NamedTemporaryFile(
 
3572
 
                    dir=os.path.dirname(stored_state_path),
 
3573
 
                    delete=False) as stored_state:
 
3574
 
                pickle.dump((clients, client_settings), stored_state,
 
3576
 
                tempname = stored_state.name
 
 
2797
            with (tempfile.NamedTemporaryFile
 
 
2798
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
 
2799
                   dir=os.path.dirname(stored_state_path),
 
 
2800
                   delete=False)) as stored_state:
 
 
2801
                pickle.dump((clients, client_settings), stored_state)
 
 
2802
                tempname=stored_state.name
 
3577
2803
            os.rename(tempname, stored_state_path)
 
3578
2804
        except (IOError, OSError) as e:
 
 
3582
2808
                except NameError:
 
3584
2810
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3585
 
                log.warning("Could not save persistent state: %s",
 
3586
 
                            os.strerror(e.errno))
 
 
2811
                logger.warning("Could not save persistent state: {}"
 
 
2812
                               .format(os.strerror(e.errno)))
 
3588
 
                log.warning("Could not save persistent state:",
 
 
2814
                logger.warning("Could not save persistent state:",
 
3592
2818
        # Delete all clients, and settings from config
 
3593
2819
        while tcp_server.clients:
 
3594
2820
            name, client = tcp_server.clients.popitem()
 
3596
2822
                client.remove_from_connection()
 
3597
 
            # Don't signal the disabling
 
 
2823
            # Don't signal anything except ClientRemoved
 
3598
2824
            client.disable(quiet=True)
 
3599
 
            # Emit D-Bus signal for removal
 
3601
 
                mandos_dbus_service.client_removed_signal(client)
 
 
2827
                mandos_dbus_service.ClientRemoved(client
 
3602
2830
        client_settings.clear()
 
3604
2832
    atexit.register(cleanup)
 
3606
 
    for client in tcp_server.clients.values():
 
 
2834
    for client in tcp_server.clients.itervalues():
 
3608
 
            # Emit D-Bus signal for adding
 
3609
 
            mandos_dbus_service.client_added_signal(client)
 
 
2837
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3610
2838
        # Need to initiate checking of clients
 
3611
2839
        if client.enabled:
 
3612
2840
            client.init_checker()
 
3614
2842
    tcp_server.enable()
 
3615
2843
    tcp_server.server_activate()
 
3617
2845
    # Find out what port we got
 
3619
2847
        service.port = tcp_server.socket.getsockname()[1]
 
3621
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
3622
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
 
2849
        logger.info("Now listening on address %r, port %d,"
 
 
2850
                    " flowinfo %d, scope_id %d",
 
 
2851
                    *tcp_server.socket.getsockname())
 
3624
 
        log.info("Now listening on address %r, port %d",
 
3625
 
                 *tcp_server.socket.getsockname())
 
3627
 
    # service.interface = tcp_server.socket.getsockname()[3]
 
 
2853
        logger.info("Now listening on address %r, port %d",
 
 
2854
                    *tcp_server.socket.getsockname())
 
 
2856
    #service.interface = tcp_server.socket.getsockname()[3]
 
3631
2860
            # From the Avahi example code
 
3633
2862
                service.activate()
 
3634
2863
            except dbus.exceptions.DBusException as error:
 
3635
 
                log.critical("D-Bus Exception", exc_info=error)
 
 
2864
                logger.critical("D-Bus Exception", exc_info=error)
 
3638
2867
            # End of Avahi example code
 
3641
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3642
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3643
 
            lambda *args, **kwargs: (tcp_server.handle_request
 
3644
 
                                     (*args[2:], **kwargs) or True))
 
3646
 
        log.debug("Starting main loop")
 
 
2869
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
 
2870
                             lambda *args, **kwargs:
 
 
2871
                             (tcp_server.handle_request
 
 
2872
                              (*args[2:], **kwargs) or True))
 
 
2874
        logger.debug("Starting main loop")
 
3647
2875
        main_loop.run()
 
3648
2876
    except AvahiError as error:
 
3649
 
        log.critical("Avahi Error", exc_info=error)
 
 
2877
        logger.critical("Avahi Error", exc_info=error)
 
3652
2880
    except KeyboardInterrupt:
 
3654
2882
            print("", file=sys.stderr)
 
3655
 
        log.debug("Server received KeyboardInterrupt")
 
3656
 
    log.debug("Server exiting")
 
 
2883
        logger.debug("Server received KeyboardInterrupt")
 
 
2884
    logger.debug("Server exiting")
 
3657
2885
    # Must run before the D-Bus bus name gets deregistered
 
3661
 
def parse_test_args():
 
3662
 
    # type: () -> argparse.Namespace
 
3663
 
    parser = argparse.ArgumentParser(add_help=False)
 
3664
 
    parser.add_argument("--check", action="store_true")
 
3665
 
    parser.add_argument("--prefix", )
 
3666
 
    args, unknown_args = parser.parse_known_args()
 
3668
 
        # Remove test options from sys.argv
 
3669
 
        sys.argv[1:] = unknown_args
 
3672
 
# Add all tests from doctest strings
 
3673
 
def load_tests(loader, tests, none):
 
3675
 
    tests.addTests(doctest.DocTestSuite())
 
3678
 
if __name__ == "__main__":
 
3679
 
    options = parse_test_args()
 
3682
 
            extra_test_prefix = options.prefix
 
3683
 
            if extra_test_prefix is not None:
 
3684
 
                if not (unittest.main(argv=[""], exit=False)
 
3685
 
                        .result.wasSuccessful()):
 
3687
 
                class ExtraTestLoader(unittest.TestLoader):
 
3688
 
                    testMethodPrefix = extra_test_prefix
 
3689
 
                # Call using ./scriptname --test [--verbose]
 
3690
 
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
 
3692
 
                unittest.main(argv=[""])
 
3700
 
# (lambda (&optional extra)
 
3701
 
#   (if (not (funcall run-tests-in-test-buffer default-directory
 
3703
 
#       (funcall show-test-buffer-in-test-window)
 
3704
 
#     (funcall remove-test-window)
 
3705
 
#     (if extra (message "Extra tests run successfully!"))))
 
3706
 
# run-tests-in-test-buffer:
 
3707
 
# (lambda (dir &optional extra)
 
3708
 
#   (with-current-buffer (get-buffer-create "*Test*")
 
3709
 
#     (setq buffer-read-only nil
 
3710
 
#           default-directory dir)
 
3712
 
#     (compilation-mode))
 
3713
 
#   (let ((process-result
 
3714
 
#          (let ((inhibit-read-only t))
 
3715
 
#            (process-file-shell-command
 
3716
 
#             (funcall get-command-line extra) nil "*Test*"))))
 
3717
 
#     (and (numberp process-result)
 
3718
 
#          (= process-result 0))))
 
3720
 
# (lambda (&optional extra)
 
3721
 
#   (let ((quoted-script
 
3722
 
#          (shell-quote-argument (funcall get-script-name))))
 
3724
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
 
3728
 
#   (if (fboundp 'file-local-name)
 
3729
 
#       (file-local-name (buffer-file-name))
 
3730
 
#     (or (file-remote-p (buffer-file-name) 'localname)
 
3731
 
#         (buffer-file-name))))
 
3732
 
# remove-test-window:
 
3734
 
#   (let ((test-window (get-buffer-window "*Test*")))
 
3735
 
#     (if test-window (delete-window test-window))))
 
3736
 
# show-test-buffer-in-test-window:
 
3738
 
#   (when (not (get-buffer-window-list "*Test*"))
 
3739
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
 
3740
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
 
3741
 
#            (display-buffer-overriding-action
 
3742
 
#             `((display-buffer-in-side-window) (side . ,side)
 
3743
 
#               (window-height . fit-window-to-buffer)
 
3744
 
#               (window-width . fit-window-to-buffer))))
 
3745
 
#       (display-buffer "*Test*"))))
 
3748
 
#   (let* ((run-extra-tests (lambda () (interactive)
 
3749
 
#                             (funcall run-tests t)))
 
3750
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
 
3751
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
 
3752
 
#     (setq minor-mode-overriding-map-alist
 
3753
 
#           (cons `(run-tests . ,outer-keymap)
 
3754
 
#                 minor-mode-overriding-map-alist)))
 
3755
 
#   (add-hook 'after-save-hook run-tests 90 t))
 
 
2888
if __name__ == '__main__':