2
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-2019 Teddy Hogeborn
 
15
 
# Copyright © 2008-2019 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>.
 
35
34
from __future__ import (division, absolute_import, print_function,
 
39
 
    from future_builtins import *
 
 
37
from future_builtins import *
 
44
 
    import SocketServer as socketserver
 
 
39
import SocketServer as socketserver
 
52
 
    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
 
 
236
183
                       .replace(b"\n", b"\\n")
 
237
184
                       .replace(b"\0", b"\\x00"))
 
240
187
    def encrypt(self, data, password):
 
241
188
        passphrase = self.password_encode(password)
 
242
 
        with tempfile.NamedTemporaryFile(
 
243
 
                dir=self.tempdir) as passfile:
 
 
189
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
244
191
            passfile.write(passphrase)
 
246
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
 
247
194
                                     '--passphrase-file',
 
249
196
                                    + self.gnupgargs,
 
250
 
                                    stdin=subprocess.PIPE,
 
251
 
                                    stdout=subprocess.PIPE,
 
252
 
                                    stderr=subprocess.PIPE)
 
253
 
            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)
 
254
201
        if proc.returncode != 0:
 
255
202
            raise PGPError(err)
 
256
203
        return ciphertext
 
258
205
    def decrypt(self, data, password):
 
259
206
        passphrase = self.password_encode(password)
 
260
 
        with tempfile.NamedTemporaryFile(
 
261
 
                dir=self.tempdir) as passfile:
 
 
207
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
262
209
            passfile.write(passphrase)
 
264
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
 
265
212
                                     '--passphrase-file',
 
267
214
                                    + self.gnupgargs,
 
268
 
                                    stdin=subprocess.PIPE,
 
269
 
                                    stdout=subprocess.PIPE,
 
270
 
                                    stderr=subprocess.PIPE)
 
271
 
            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
 
272
220
        if proc.returncode != 0:
 
273
221
            raise PGPError(err)
 
274
222
        return decrypted_plaintext
 
277
 
# Pretend that we have an Avahi module
 
279
 
    """This isn't so much a class as it is a module-like namespace.
 
280
 
    It is instantiated once, and simulates having an Avahi module."""
 
281
 
    IF_UNSPEC = -1               # avahi-common/address.h
 
282
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
283
 
    PROTO_INET = 0               # avahi-common/address.h
 
284
 
    PROTO_INET6 = 1              # avahi-common/address.h
 
285
 
    DBUS_NAME = "org.freedesktop.Avahi"
 
286
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
287
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
288
 
    DBUS_PATH_SERVER = "/"
 
290
 
    def string_array_to_txt_array(self, t):
 
291
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
292
 
                           for s in t), signature="ay")
 
293
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
294
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
295
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
296
 
    SERVER_INVALID = 0           # avahi-common/defs.h
 
297
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
298
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
299
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
300
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
304
225
class AvahiError(Exception):
 
305
226
    def __init__(self, value, *args, **kwargs):
 
306
227
        self.value = value
 
307
228
        return super(AvahiError, self).__init__(value, *args,
 
311
231
class AvahiServiceError(AvahiError):
 
315
234
class AvahiGroupError(AvahiError):
 
319
238
class AvahiService(object):
 
320
239
    """An Avahi (Zeroconf) service.
 
323
242
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
324
243
               Used to optionally bind to the specified interface.
 
 
489
392
                                    follow_name_owner_changes=True),
 
490
393
                avahi.DBUS_INTERFACE_SERVER)
 
491
394
        self.server.connect_to_signal("StateChanged",
 
492
 
                                      self.server_state_changed)
 
 
395
                                 self.server_state_changed)
 
493
396
        self.server_state_changed(self.server.GetState())
 
496
399
class AvahiServiceToSyslog(AvahiService):
 
497
400
    def rename(self, *args, **kwargs):
 
498
401
        """Add the new name to the syslog messages"""
 
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
500
 
        syslogger.setFormatter(logging.Formatter(
 
501
 
            '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'
 
506
 
# Pretend that we have a GnuTLS module
 
507
 
class GnuTLS(object):
 
508
 
    """This isn't so much a class as it is a module-like namespace.
 
509
 
    It is instantiated once, and simulates having a GnuTLS module."""
 
511
 
    library = ctypes.util.find_library("gnutls")
 
513
 
        library = ctypes.util.find_library("gnutls-deb0")
 
514
 
    _library = ctypes.cdll.LoadLibrary(library)
 
516
 
    _need_version = b"3.3.0"
 
517
 
    _tls_rawpk_version = b"3.6.6"
 
520
 
        # Need to use "self" here, since this method is called before
 
521
 
        # the assignment to the "gnutls" global variable happens.
 
522
 
        if self.check_version(self._need_version) is None:
 
523
 
            raise self.Error("Needs GnuTLS {} or later"
 
524
 
                             .format(self._need_version))
 
526
 
    # Unless otherwise indicated, the constants and types below are
 
527
 
    # all from the gnutls/gnutls.h C header file.
 
538
 
    E_NO_CERTIFICATE_FOUND = -49
 
543
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
544
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
547
 
    class session_int(ctypes.Structure):
 
549
 
    session_t = ctypes.POINTER(session_int)
 
551
 
    class certificate_credentials_st(ctypes.Structure):
 
553
 
    certificate_credentials_t = ctypes.POINTER(
 
554
 
        certificate_credentials_st)
 
555
 
    certificate_type_t = ctypes.c_int
 
557
 
    class datum_t(ctypes.Structure):
 
558
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
559
 
                    ('size', ctypes.c_uint)]
 
561
 
    class openpgp_crt_int(ctypes.Structure):
 
563
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
564
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
565
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
566
 
    credentials_type_t = ctypes.c_int
 
567
 
    transport_ptr_t = ctypes.c_void_p
 
568
 
    close_request_t = ctypes.c_int
 
571
 
    class Error(Exception):
 
572
 
        # We need to use the class name "GnuTLS" here, since this
 
573
 
        # exception might be raised from within GnuTLS.__init__,
 
574
 
        # which is called before the assignment to the "gnutls"
 
575
 
        # global variable has happened.
 
576
 
        def __init__(self, message=None, code=None, args=()):
 
577
 
            # Default usage is by a message string, but if a return
 
578
 
            # code is passed, convert it to a string with
 
581
 
            if message is None and code is not None:
 
582
 
                message = GnuTLS.strerror(code)
 
583
 
            return super(GnuTLS.Error, self).__init__(
 
586
 
    class CertificateSecurityError(Error):
 
590
 
    class Credentials(object):
 
592
 
            self._c_object = gnutls.certificate_credentials_t()
 
593
 
            gnutls.certificate_allocate_credentials(
 
594
 
                ctypes.byref(self._c_object))
 
595
 
            self.type = gnutls.CRD_CERTIFICATE
 
598
 
            gnutls.certificate_free_credentials(self._c_object)
 
600
 
    class ClientSession(object):
 
601
 
        def __init__(self, socket, credentials=None):
 
602
 
            self._c_object = gnutls.session_t()
 
603
 
            gnutls_flags = gnutls.CLIENT
 
604
 
            if gnutls.check_version("3.5.6"):
 
605
 
                gnutls_flags |= gnutls.NO_TICKETS
 
607
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
608
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
610
 
            gnutls.set_default_priority(self._c_object)
 
611
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
612
 
            gnutls.handshake_set_private_extensions(self._c_object,
 
615
 
            if credentials is None:
 
616
 
                credentials = gnutls.Credentials()
 
617
 
            gnutls.credentials_set(self._c_object, credentials.type,
 
618
 
                                   ctypes.cast(credentials._c_object,
 
620
 
            self.credentials = credentials
 
623
 
            gnutls.deinit(self._c_object)
 
626
 
            return gnutls.handshake(self._c_object)
 
628
 
        def send(self, data):
 
632
 
                data_len -= gnutls.record_send(self._c_object,
 
637
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
639
 
    # Error handling functions
 
640
 
    def _error_code(result):
 
641
 
        """A function to raise exceptions on errors, suitable
 
642
 
        for the 'restype' attribute on ctypes functions"""
 
645
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
646
 
            raise gnutls.CertificateSecurityError(code=result)
 
647
 
        raise gnutls.Error(code=result)
 
649
 
    def _retry_on_error(result, func, arguments):
 
650
 
        """A function to retry on some errors, suitable
 
651
 
        for the 'errcheck' attribute on ctypes functions"""
 
653
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
654
 
                return _error_code(result)
 
655
 
            result = func(*arguments)
 
658
 
    # Unless otherwise indicated, the function declarations below are
 
659
 
    # all from the gnutls/gnutls.h C header file.
 
662
 
    priority_set_direct = _library.gnutls_priority_set_direct
 
663
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
664
 
                                    ctypes.POINTER(ctypes.c_char_p)]
 
665
 
    priority_set_direct.restype = _error_code
 
667
 
    init = _library.gnutls_init
 
668
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
669
 
    init.restype = _error_code
 
671
 
    set_default_priority = _library.gnutls_set_default_priority
 
672
 
    set_default_priority.argtypes = [session_t]
 
673
 
    set_default_priority.restype = _error_code
 
675
 
    record_send = _library.gnutls_record_send
 
676
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
678
 
    record_send.restype = ctypes.c_ssize_t
 
679
 
    record_send.errcheck = _retry_on_error
 
681
 
    certificate_allocate_credentials = (
 
682
 
        _library.gnutls_certificate_allocate_credentials)
 
683
 
    certificate_allocate_credentials.argtypes = [
 
684
 
        ctypes.POINTER(certificate_credentials_t)]
 
685
 
    certificate_allocate_credentials.restype = _error_code
 
687
 
    certificate_free_credentials = (
 
688
 
        _library.gnutls_certificate_free_credentials)
 
689
 
    certificate_free_credentials.argtypes = [
 
690
 
        certificate_credentials_t]
 
691
 
    certificate_free_credentials.restype = None
 
693
 
    handshake_set_private_extensions = (
 
694
 
        _library.gnutls_handshake_set_private_extensions)
 
695
 
    handshake_set_private_extensions.argtypes = [session_t,
 
697
 
    handshake_set_private_extensions.restype = None
 
699
 
    credentials_set = _library.gnutls_credentials_set
 
700
 
    credentials_set.argtypes = [session_t, credentials_type_t,
 
702
 
    credentials_set.restype = _error_code
 
704
 
    strerror = _library.gnutls_strerror
 
705
 
    strerror.argtypes = [ctypes.c_int]
 
706
 
    strerror.restype = ctypes.c_char_p
 
708
 
    certificate_type_get = _library.gnutls_certificate_type_get
 
709
 
    certificate_type_get.argtypes = [session_t]
 
710
 
    certificate_type_get.restype = _error_code
 
712
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
713
 
    certificate_get_peers.argtypes = [session_t,
 
714
 
                                      ctypes.POINTER(ctypes.c_uint)]
 
715
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
717
 
    global_set_log_level = _library.gnutls_global_set_log_level
 
718
 
    global_set_log_level.argtypes = [ctypes.c_int]
 
719
 
    global_set_log_level.restype = None
 
721
 
    global_set_log_function = _library.gnutls_global_set_log_function
 
722
 
    global_set_log_function.argtypes = [log_func]
 
723
 
    global_set_log_function.restype = None
 
725
 
    deinit = _library.gnutls_deinit
 
726
 
    deinit.argtypes = [session_t]
 
727
 
    deinit.restype = None
 
729
 
    handshake = _library.gnutls_handshake
 
730
 
    handshake.argtypes = [session_t]
 
731
 
    handshake.restype = _error_code
 
732
 
    handshake.errcheck = _retry_on_error
 
734
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
735
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
736
 
    transport_set_ptr.restype = None
 
738
 
    bye = _library.gnutls_bye
 
739
 
    bye.argtypes = [session_t, close_request_t]
 
740
 
    bye.restype = _error_code
 
741
 
    bye.errcheck = _retry_on_error
 
743
 
    check_version = _library.gnutls_check_version
 
744
 
    check_version.argtypes = [ctypes.c_char_p]
 
745
 
    check_version.restype = ctypes.c_char_p
 
747
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
751
 
        class pubkey_st(ctypes.Structure):
 
753
 
        pubkey_t = ctypes.POINTER(pubkey_st)
 
755
 
        x509_crt_fmt_t = ctypes.c_int
 
757
 
        # All the function declarations below are from gnutls/abstract.h
 
758
 
        pubkey_init = _library.gnutls_pubkey_init
 
759
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
760
 
        pubkey_init.restype = _error_code
 
762
 
        pubkey_import = _library.gnutls_pubkey_import
 
763
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
765
 
        pubkey_import.restype = _error_code
 
767
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
768
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
769
 
                                      ctypes.POINTER(ctypes.c_ubyte),
 
770
 
                                      ctypes.POINTER(ctypes.c_size_t)]
 
771
 
        pubkey_get_key_id.restype = _error_code
 
773
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
774
 
        pubkey_deinit.argtypes = [pubkey_t]
 
775
 
        pubkey_deinit.restype = None
 
777
 
        # All the function declarations below are from gnutls/openpgp.h
 
779
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
780
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
781
 
        openpgp_crt_init.restype = _error_code
 
783
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
784
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
785
 
                                       ctypes.POINTER(datum_t),
 
787
 
        openpgp_crt_import.restype = _error_code
 
789
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
790
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
791
 
                                            ctypes.POINTER(ctypes.c_uint)]
 
792
 
        openpgp_crt_verify_self.restype = _error_code
 
794
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
795
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
796
 
        openpgp_crt_deinit.restype = None
 
798
 
        openpgp_crt_get_fingerprint = (
 
799
 
            _library.gnutls_openpgp_crt_get_fingerprint)
 
800
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
804
 
        openpgp_crt_get_fingerprint.restype = _error_code
 
806
 
    if check_version("3.6.4"):
 
807
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
808
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
809
 
        certificate_type_get2.restype = _error_code
 
811
 
    # Remove non-public functions
 
812
 
    del _error_code, _retry_on_error
 
813
 
# Create the global "gnutls" object, simulating a module
 
817
 
def call_pipe(connection,       # : multiprocessing.Connection
 
818
 
              func, *args, **kwargs):
 
819
 
    """This function is meant to be called by multiprocessing.Process
 
821
 
    This function runs func(*args, **kwargs), and writes the resulting
 
822
 
    return value on the provided multiprocessing.Connection.
 
824
 
    connection.send(func(*args, **kwargs))
 
828
410
class Client(object):
 
829
411
    """A representation of a client host served by this server.
 
832
414
    approved:   bool(); 'None' if not yet approved/disapproved
 
833
415
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
1013
588
            logger.info("Disabling client %s", self.name)
 
1014
589
        if getattr(self, "disable_initiator_tag", None) is not None:
 
1015
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
590
            gobject.source_remove(self.disable_initiator_tag)
 
1016
591
            self.disable_initiator_tag = None
 
1017
592
        self.expires = None
 
1018
593
        if getattr(self, "checker_initiator_tag", None) is not None:
 
1019
 
            GLib.source_remove(self.checker_initiator_tag)
 
 
594
            gobject.source_remove(self.checker_initiator_tag)
 
1020
595
            self.checker_initiator_tag = None
 
1021
596
        self.stop_checker()
 
1022
597
        self.enabled = False
 
1024
599
            self.send_changedstate()
 
1025
 
        # 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
 
1028
603
    def __del__(self):
 
1031
606
    def init_checker(self):
 
1032
607
        # Schedule a new checker to be started an 'interval' from now,
 
1033
608
        # and every interval from then on.
 
1034
609
        if self.checker_initiator_tag is not None:
 
1035
 
            GLib.source_remove(self.checker_initiator_tag)
 
1036
 
        self.checker_initiator_tag = GLib.timeout_add(
 
1037
 
            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),
 
1039
615
        # Schedule a disable() when 'timeout' has passed
 
1040
616
        if self.disable_initiator_tag is not None:
 
1041
 
            GLib.source_remove(self.disable_initiator_tag)
 
1042
 
        self.disable_initiator_tag = GLib.timeout_add(
 
1043
 
            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),
 
1044
622
        # Also start a new checker *right now*.
 
1045
623
        self.start_checker()
 
1047
 
    def checker_callback(self, source, condition, connection,
 
 
625
    def checker_callback(self, pid, condition, command):
 
1049
626
        """The checker has completed, so take appropriate actions."""
 
1050
627
        self.checker_callback_tag = None
 
1051
628
        self.checker = None
 
1052
 
        # Read return code from connection (see call_pipe)
 
1053
 
        returncode = connection.recv()
 
1057
 
            self.last_checker_status = returncode
 
1058
 
            self.last_checker_signal = None
 
 
629
        if os.WIFEXITED(condition):
 
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
 
1059
631
            if self.last_checker_status == 0:
 
1060
632
                logger.info("Checker for %(name)s succeeded",
 
1062
634
                self.checked_ok()
 
1064
 
                logger.info("Checker for %(name)s failed", vars(self))
 
 
636
                logger.info("Checker for %(name)s failed",
 
1066
639
            self.last_checker_status = -1
 
1067
 
            self.last_checker_signal = -returncode
 
1068
640
            logger.warning("Checker for %(name)s crashed?",
 
1072
643
    def checked_ok(self):
 
1073
644
        """Assert that the client has been seen, alive and well."""
 
1074
645
        self.last_checked_ok = datetime.datetime.utcnow()
 
1075
646
        self.last_checker_status = 0
 
1076
 
        self.last_checker_signal = None
 
1077
647
        self.bump_timeout()
 
1079
649
    def bump_timeout(self, timeout=None):
 
1080
650
        """Bump up the timeout for this client."""
 
1081
651
        if timeout is None:
 
1082
652
            timeout = self.timeout
 
1083
653
        if self.disable_initiator_tag is not None:
 
1084
 
            GLib.source_remove(self.disable_initiator_tag)
 
 
654
            gobject.source_remove(self.disable_initiator_tag)
 
1085
655
            self.disable_initiator_tag = None
 
1086
656
        if getattr(self, "enabled", False):
 
1087
 
            self.disable_initiator_tag = GLib.timeout_add(
 
1088
 
                int(timeout.total_seconds() * 1000), self.disable)
 
 
657
            self.disable_initiator_tag = (gobject.timeout_add
 
 
658
                                          (int(timeout.total_seconds()
 
 
659
                                               * 1000), self.disable))
 
1089
660
            self.expires = datetime.datetime.utcnow() + timeout
 
1091
662
    def need_approval(self):
 
1092
663
        self.last_approval_request = datetime.datetime.utcnow()
 
1094
665
    def start_checker(self):
 
1095
666
        """Start a new checker subprocess if one is not running.
 
1097
668
        If a checker already exists, leave it running and do
 
1099
670
        # The reason for not killing a running checker is that if we
 
 
1104
675
        # checkers alone, the checker would have to take more time
 
1105
676
        # than 'timeout' for the client to be disabled, which is as it
 
1108
 
        if self.checker is not None and not self.checker.is_alive():
 
1109
 
            logger.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)
 
1112
693
        # Start a new checker if needed
 
1113
694
        if self.checker is None:
 
1114
695
            # Escape attributes for the shell
 
1116
 
                attr: re.escape(str(getattr(self, attr)))
 
1117
 
                for attr in self.runtime_expansions}
 
 
696
            escaped_attrs = { attr:
 
 
697
                                  re.escape(str(getattr(self, attr)))
 
 
698
                              for attr in self.runtime_expansions }
 
1119
700
                command = self.checker_command % escaped_attrs
 
1120
701
            except TypeError as error:
 
1121
702
                logger.error('Could not format string "%s"',
 
1122
 
                             self.checker_command,
 
 
703
                             self.checker_command, exc_info=error)
 
 
704
                return True # Try again later
 
 
705
            self.current_checker_command = command
 
 
707
                logger.info("Starting checker %r for %s",
 
 
709
                # We don't need to redirect stdout and stderr, since
 
 
710
                # in normal mode, that is already done by daemon(),
 
 
711
                # and in debug mode we don't want to.  (Stdin is
 
 
712
                # always replaced by /dev/null.)
 
 
713
                # 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",
 
1124
 
                return True     # Try again later
 
1125
 
            self.current_checker_command = command
 
1126
 
            logger.info("Starting checker %r for %s", command,
 
1128
 
            # We don't need to redirect stdout and stderr, since
 
1129
 
            # in normal mode, that is already done by daemon(),
 
1130
 
            # and in debug mode we don't want to.  (Stdin is
 
1131
 
            # always replaced by /dev/null.)
 
1132
 
            # The exception is when not debugging but nevertheless
 
1133
 
            # running in the foreground; use the previously
 
1135
 
            popen_args = {"close_fds": True,
 
1138
 
            if (not self.server_settings["debug"]
 
1139
 
                and self.server_settings["foreground"]):
 
1140
 
                popen_args.update({"stdout": wnull,
 
1142
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1143
 
            self.checker = multiprocessing.Process(
 
1145
 
                args=(pipe[1], subprocess.call, command),
 
1147
 
            self.checker.start()
 
1148
 
            self.checker_callback_tag = GLib.io_add_watch(
 
1149
 
                pipe[0].fileno(), GLib.IO_IN,
 
1150
 
                self.checker_callback, pipe[0], command)
 
1151
 
        # Re-run this periodically if run by GLib.timeout_add
 
 
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
 
1154
750
    def stop_checker(self):
 
1155
751
        """Force the checker process, if any, to stop."""
 
1156
752
        if self.checker_callback_tag:
 
1157
 
            GLib.source_remove(self.checker_callback_tag)
 
 
753
            gobject.source_remove(self.checker_callback_tag)
 
1158
754
            self.checker_callback_tag = None
 
1159
755
        if getattr(self, "checker", None) is None:
 
1161
757
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1162
 
        self.checker.terminate()
 
 
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
 
1163
766
        self.checker = None
 
1166
 
def dbus_service_property(dbus_interface,
 
 
769
def dbus_service_property(dbus_interface, signature="v",
 
 
770
                          access="readwrite", byte_arrays=False):
 
1170
771
    """Decorators for marking methods of a DBusObjectWithProperties to
 
1171
772
    become properties on the D-Bus.
 
1173
774
    The decorated method will be called with no arguments by "Get"
 
1174
775
    and with one argument by "Set".
 
1176
777
    The parameters, where they are supported, are the same as
 
1177
778
    dbus.service.method, except there is only "signature", since the
 
1178
779
    type from Get() and the type sent to Set() is the same.
 
 
1261
 
class DBusObjectWithAnnotations(dbus.service.Object):
 
1262
 
    """A D-Bus object with annotations.
 
1264
 
    Classes inheriting from this can use the dbus_annotations
 
1265
 
    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.
 
1269
862
    def _is_dbus_thing(thing):
 
1270
863
        """Returns a function testing if an attribute is a D-Bus thing
 
1272
865
        If called like _is_dbus_thing("method") it returns a function
 
1273
866
        suitable for use as predicate to inspect.getmembers().
 
1275
868
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1278
871
    def _get_all_dbus_things(self, thing):
 
1279
872
        """Returns a generator of (name, attribute) pairs
 
1281
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
874
        return ((getattr(athing.__get__(self), "_dbus_name",
 
1282
876
                 athing.__get__(self))
 
1283
877
                for cls in self.__class__.__mro__
 
1284
878
                for name, athing in
 
1285
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
1287
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1289
 
                         path_keyword='object_path',
 
1290
 
                         connection_keyword='connection')
 
1291
 
    def Introspect(self, object_path, connection):
 
1292
 
        """Overloading of standard D-Bus method.
 
1294
 
        Inserts annotation tags on methods and signals.
 
1296
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1299
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1301
 
            for if_tag in document.getElementsByTagName("interface"):
 
1302
 
                # Add annotation tags
 
1303
 
                for typ in ("method", "signal"):
 
1304
 
                    for tag in if_tag.getElementsByTagName(typ):
 
1306
 
                        for name, prop in (self.
 
1307
 
                                           _get_all_dbus_things(typ)):
 
1308
 
                            if (name == tag.getAttribute("name")
 
1309
 
                                and prop._dbus_interface
 
1310
 
                                == if_tag.getAttribute("name")):
 
1311
 
                                annots.update(getattr(
 
1312
 
                                    prop, "_dbus_annotations", {}))
 
1313
 
                        for name, value in annots.items():
 
1314
 
                            ann_tag = document.createElement(
 
1316
 
                            ann_tag.setAttribute("name", name)
 
1317
 
                            ann_tag.setAttribute("value", value)
 
1318
 
                            tag.appendChild(ann_tag)
 
1319
 
                # Add interface annotation tags
 
1320
 
                for annotation, value in dict(
 
1321
 
                    itertools.chain.from_iterable(
 
1322
 
                        annotations().items()
 
1323
 
                        for name, annotations
 
1324
 
                        in self._get_all_dbus_things("interface")
 
1325
 
                        if name == if_tag.getAttribute("name")
 
1327
 
                    ann_tag = document.createElement("annotation")
 
1328
 
                    ann_tag.setAttribute("name", annotation)
 
1329
 
                    ann_tag.setAttribute("value", value)
 
1330
 
                    if_tag.appendChild(ann_tag)
 
1331
 
                # Fix argument name for the Introspect method itself
 
1332
 
                if (if_tag.getAttribute("name")
 
1333
 
                    == dbus.INTROSPECTABLE_IFACE):
 
1334
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1335
 
                        if cn.getAttribute("name") == "Introspect":
 
1336
 
                            for arg in cn.getElementsByTagName("arg"):
 
1337
 
                                if (arg.getAttribute("direction")
 
1339
 
                                    arg.setAttribute("name",
 
1341
 
            xmlstring = document.toxml("utf-8")
 
1343
 
        except (AttributeError, xml.dom.DOMException,
 
1344
 
                xml.parsers.expat.ExpatError) as error:
 
1345
 
            logger.error("Failed to override Introspection method",
 
1350
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1351
 
    """A D-Bus object with properties.
 
1353
 
    Classes inheriting from this can use the dbus_service_property
 
1354
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
1355
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
879
                inspect.getmembers(cls,
 
 
880
                                   self._is_dbus_thing(thing)))
 
1358
882
    def _get_dbus_property(self, interface_name, property_name):
 
1359
883
        """Returns a bound method if one exists which is a D-Bus
 
1360
884
        property with the specified name and interface.
 
1362
 
        for cls in self.__class__.__mro__:
 
1363
 
            for name, value in inspect.getmembers(
 
1364
 
                    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"))):
 
1365
890
                if (value._dbus_name == property_name
 
1366
891
                    and value._dbus_interface == interface_name):
 
1367
892
                    return value.__get__(self)
 
1369
894
        # No such property
 
1370
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
1371
 
            self.dbus_object_path, interface_name, property_name))
 
1374
 
    def _get_all_interface_names(cls):
 
1375
 
        """Get a sequence of all interfaces supported by an object"""
 
1376
 
        return (name for name in set(getattr(getattr(x, attr),
 
1377
 
                                             "_dbus_interface", None)
 
1378
 
                                     for x in (inspect.getmro(cls))
 
1380
 
                if name is not None)
 
1382
 
    @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",
 
1384
900
                         out_signature="v")
 
1385
901
    def Get(self, interface_name, property_name):
 
1386
902
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1515
1042
        return xmlstring
 
1519
 
    dbus.OBJECT_MANAGER_IFACE
 
1520
 
except AttributeError:
 
1521
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1524
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1525
 
    """A D-Bus object with an ObjectManager.
 
1527
 
    Classes inheriting from this exposes the standard
 
1528
 
    GetManagedObjects call and the InterfacesAdded and
 
1529
 
    InterfacesRemoved signals on the standard
 
1530
 
    "org.freedesktop.DBus.ObjectManager" interface.
 
1532
 
    Note: No signals are sent automatically; they must be sent
 
1535
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1536
 
                         out_signature="a{oa{sa{sv}}}")
 
1537
 
    def GetManagedObjects(self):
 
1538
 
        """This function must be overridden"""
 
1539
 
        raise NotImplementedError()
 
1541
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1542
 
                         signature="oa{sa{sv}}")
 
1543
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1546
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
1547
 
    def InterfacesRemoved(self, object_path, interfaces):
 
1550
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1552
 
                         path_keyword='object_path',
 
1553
 
                         connection_keyword='connection')
 
1554
 
    def Introspect(self, object_path, connection):
 
1555
 
        """Overloading of standard D-Bus method.
 
1557
 
        Override return argument name of GetManagedObjects to be
 
1558
 
        "objpath_interfaces_and_properties"
 
1560
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1564
 
            document = xml.dom.minidom.parseString(xmlstring)
 
1566
 
            for if_tag in document.getElementsByTagName("interface"):
 
1567
 
                # Fix argument name for the GetManagedObjects method
 
1568
 
                if (if_tag.getAttribute("name")
 
1569
 
                    == dbus.OBJECT_MANAGER_IFACE):
 
1570
 
                    for cn in if_tag.getElementsByTagName("method"):
 
1571
 
                        if (cn.getAttribute("name")
 
1572
 
                            == "GetManagedObjects"):
 
1573
 
                            for arg in cn.getElementsByTagName("arg"):
 
1574
 
                                if (arg.getAttribute("direction")
 
1578
 
                                        "objpath_interfaces"
 
1580
 
            xmlstring = document.toxml("utf-8")
 
1582
 
        except (AttributeError, xml.dom.DOMException,
 
1583
 
                xml.parsers.expat.ExpatError) as error:
 
1584
 
            logger.error("Failed to override Introspection method",
 
1589
1045
def datetime_to_dbus(dt, variant_level=0):
 
1590
1046
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1592
 
        return dbus.String("", variant_level=variant_level)
 
1593
 
    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)
 
1596
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1627
1083
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1628
1084
                # with the wrong interface name
 
1629
1085
                if (not hasattr(attribute, "_dbus_interface")
 
1630
 
                    or not attribute._dbus_interface.startswith(
 
1631
 
                        orig_interface_name)):
 
 
1086
                    or not attribute._dbus_interface
 
 
1087
                    .startswith(orig_interface_name)):
 
1633
1089
                # Create an alternate D-Bus interface name based on
 
1634
1090
                # the current name
 
1635
 
                alt_interface = attribute._dbus_interface.replace(
 
1636
 
                    orig_interface_name, alt_interface_name)
 
 
1091
                alt_interface = (attribute._dbus_interface
 
 
1092
                                 .replace(orig_interface_name,
 
 
1093
                                          alt_interface_name))
 
1637
1094
                interface_names.add(alt_interface)
 
1638
1095
                # Is this a D-Bus signal?
 
1639
1096
                if getattr(attribute, "_dbus_is_signal", False):
 
1640
1097
                    # Extract the original non-method undecorated
 
1641
1098
                    # function by black magic
 
1642
 
                    if sys.version_info.major == 2:
 
1643
 
                        nonmethod_func = (dict(
 
 
1099
                    nonmethod_func = (dict(
 
1644
1100
                            zip(attribute.func_code.co_freevars,
 
1645
 
                                attribute.__closure__))
 
1646
 
                                          ["func"].cell_contents)
 
1648
 
                        nonmethod_func = (dict(
 
1649
 
                            zip(attribute.__code__.co_freevars,
 
1650
 
                                attribute.__closure__))
 
1651
 
                                          ["func"].cell_contents)
 
 
1101
                                attribute.__closure__))["func"]
 
1652
1103
                    # Create a new, but exactly alike, function
 
1653
1104
                    # object, and decorate it to be a new D-Bus signal
 
1654
1105
                    # with the alternate D-Bus interface name
 
1655
 
                    new_function = copy_function(nonmethod_func)
 
1656
 
                    new_function = (dbus.service.signal(
 
1658
 
                        attribute._dbus_signature)(new_function))
 
 
1106
                    new_function = (dbus.service.signal
 
 
1108
                                     attribute._dbus_signature)
 
 
1109
                                    (types.FunctionType(
 
 
1110
                                nonmethod_func.func_code,
 
 
1111
                                nonmethod_func.func_globals,
 
 
1112
                                nonmethod_func.func_name,
 
 
1113
                                nonmethod_func.func_defaults,
 
 
1114
                                nonmethod_func.func_closure)))
 
1659
1115
                    # Copy annotations, if any
 
1661
 
                        new_function._dbus_annotations = dict(
 
1662
 
                            attribute._dbus_annotations)
 
 
1117
                        new_function._dbus_annotations = (
 
 
1118
                            dict(attribute._dbus_annotations))
 
1663
1119
                    except AttributeError:
 
1666
1121
                    # Define a creator of a function to call both the
 
1667
1122
                    # original and alternate functions, so both the
 
1668
1123
                    # original and alternate signals gets sent when
 
 
1957
1413
        server to mandos-client
 
1961
1417
    # Rejected - signal
 
1962
1418
    @dbus.service.signal(_interface, signature="s")
 
1963
1419
    def Rejected(self, reason):
 
1967
1423
    # NeedApproval - signal
 
1968
1424
    @dbus.service.signal(_interface, signature="tb")
 
1969
1425
    def NeedApproval(self, timeout, default):
 
1971
1427
        return self.need_approval()
 
1975
1431
    # Approve - method
 
1976
1432
    @dbus.service.method(_interface, in_signature="b")
 
1977
1433
    def Approve(self, value):
 
1978
1434
        self.approve(value)
 
1980
1436
    # CheckedOK - method
 
1981
1437
    @dbus.service.method(_interface)
 
1982
1438
    def CheckedOK(self):
 
1983
1439
        self.checked_ok()
 
1985
1441
    # Enable - method
 
1986
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1987
1442
    @dbus.service.method(_interface)
 
1988
1443
    def Enable(self):
 
1992
1447
    # StartChecker - method
 
1993
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1994
1448
    @dbus.service.method(_interface)
 
1995
1449
    def StartChecker(self):
 
1997
1451
        self.start_checker()
 
1999
1453
    # Disable - method
 
2000
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2001
1454
    @dbus.service.method(_interface)
 
2002
1455
    def Disable(self):
 
2006
1459
    # StopChecker - method
 
2007
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
2008
1460
    @dbus.service.method(_interface)
 
2009
1461
    def StopChecker(self):
 
2010
1462
        self.stop_checker()
 
2014
1466
    # ApprovalPending - property
 
2015
1467
    @dbus_service_property(_interface, signature="b", access="read")
 
2016
1468
    def ApprovalPending_dbus_property(self):
 
2017
1469
        return dbus.Boolean(bool(self.approvals_pending))
 
2019
1471
    # ApprovedByDefault - property
 
2020
 
    @dbus_service_property(_interface,
 
 
1472
    @dbus_service_property(_interface, signature="b",
 
2022
1473
                           access="readwrite")
 
2023
1474
    def ApprovedByDefault_dbus_property(self, value=None):
 
2024
1475
        if value is None:       # get
 
2025
1476
            return dbus.Boolean(self.approved_by_default)
 
2026
1477
        self.approved_by_default = bool(value)
 
2028
1479
    # ApprovalDelay - property
 
2029
 
    @dbus_service_property(_interface,
 
 
1480
    @dbus_service_property(_interface, signature="t",
 
2031
1481
                           access="readwrite")
 
2032
1482
    def ApprovalDelay_dbus_property(self, value=None):
 
2033
1483
        if value is None:       # get
 
2034
1484
            return dbus.UInt64(self.approval_delay.total_seconds()
 
2036
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
2038
1488
    # ApprovalDuration - property
 
2039
 
    @dbus_service_property(_interface,
 
 
1489
    @dbus_service_property(_interface, signature="t",
 
2041
1490
                           access="readwrite")
 
2042
1491
    def ApprovalDuration_dbus_property(self, value=None):
 
2043
1492
        if value is None:       # get
 
2044
1493
            return dbus.UInt64(self.approval_duration.total_seconds()
 
2046
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
2048
1497
    # Name - property
 
2050
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2051
1498
    @dbus_service_property(_interface, signature="s", access="read")
 
2052
1499
    def Name_dbus_property(self):
 
2053
1500
        return dbus.String(self.name)
 
2057
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2058
 
    @dbus_service_property(_interface, signature="s", access="read")
 
2059
 
    def KeyID_dbus_property(self):
 
2060
 
        return dbus.String(self.key_id)
 
2062
1502
    # Fingerprint - property
 
2064
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2065
1503
    @dbus_service_property(_interface, signature="s", access="read")
 
2066
1504
    def Fingerprint_dbus_property(self):
 
2067
1505
        return dbus.String(self.fingerprint)
 
2069
1507
    # Host - property
 
2070
 
    @dbus_service_property(_interface,
 
 
1508
    @dbus_service_property(_interface, signature="s",
 
2072
1509
                           access="readwrite")
 
2073
1510
    def Host_dbus_property(self, value=None):
 
2074
1511
        if value is None:       # get
 
2075
1512
            return dbus.String(self.host)
 
2076
1513
        self.host = str(value)
 
2078
1515
    # Created - property
 
2080
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
2081
1516
    @dbus_service_property(_interface, signature="s", access="read")
 
2082
1517
    def Created_dbus_property(self):
 
2083
1518
        return datetime_to_dbus(self.created)
 
2085
1520
    # LastEnabled - property
 
2086
1521
    @dbus_service_property(_interface, signature="s", access="read")
 
2087
1522
    def LastEnabled_dbus_property(self):
 
2088
1523
        return datetime_to_dbus(self.last_enabled)
 
2090
1525
    # Enabled - property
 
2091
 
    @dbus_service_property(_interface,
 
 
1526
    @dbus_service_property(_interface, signature="b",
 
2093
1527
                           access="readwrite")
 
2094
1528
    def Enabled_dbus_property(self, value=None):
 
2095
1529
        if value is None:       # get
 
 
2377
1794
                        delay -= time2 - time
 
2380
 
                    session.send(client.secret)
 
2381
 
                except gnutls.Error as error:
 
2382
 
                    logger.warning("gnutls send failed",
 
 
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))
 
2386
1809
                logger.info("Sending secret to %s", client.name)
 
2387
1810
                # bump the timeout using extended_timeout
 
2388
1811
                client.bump_timeout(client.extended_timeout)
 
2389
1812
                if self.server.use_dbus:
 
2390
1813
                    # Emit D-Bus signal
 
2391
1814
                    client.GotSecret()
 
2394
1817
                if approval_required:
 
2395
1818
                    client.approvals_pending -= 1
 
2398
 
                except gnutls.Error as error:
 
 
1821
                except gnutls.errors.GNUTLSError as error:
 
2399
1822
                    logger.warning("GnuTLS bye failed",
 
2400
1823
                                   exc_info=error)
 
2403
1826
    def peer_certificate(session):
 
2404
 
        "Return the peer's certificate as a bytestring"
 
2406
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2408
 
        except AttributeError:
 
2409
 
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2410
 
        if gnutls.has_rawpk:
 
2411
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
2413
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
2414
 
        # If not a valid certificate type...
 
2415
 
        if cert_type not in valid_cert_types:
 
2416
 
            logger.info("Cert type %r not in %r", cert_type,
 
2418
 
            # ...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
 
2420
1834
        list_size = ctypes.c_uint(1)
 
2421
 
        cert_list = (gnutls.certificate_get_peers
 
 
1835
        cert_list = (gnutls.library.functions
 
 
1836
                     .gnutls_certificate_get_peers
 
2422
1837
                     (session._c_object, ctypes.byref(list_size)))
 
2423
1838
        if not bool(cert_list) and list_size.value != 0:
 
2424
 
            raise gnutls.Error("error getting peer certificate")
 
 
1839
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2425
1841
        if list_size.value == 0:
 
2427
1843
        cert = cert_list[0]
 
2428
1844
        return ctypes.string_at(cert.data, cert.size)
 
2431
 
    def key_id(certificate):
 
2432
 
        "Convert a certificate bytestring to a hexdigit key ID"
 
2433
 
        # New GnuTLS "datum" with the public key
 
2434
 
        datum = gnutls.datum_t(
 
2435
 
            ctypes.cast(ctypes.c_char_p(certificate),
 
2436
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2437
 
            ctypes.c_uint(len(certificate)))
 
2438
 
        # XXX all these need to be created in the gnutls "module"
 
2439
 
        # New empty GnuTLS certificate
 
2440
 
        pubkey = gnutls.pubkey_t()
 
2441
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
2442
 
        # Import the raw public key into the certificate
 
2443
 
        gnutls.pubkey_import(pubkey,
 
2444
 
                             ctypes.byref(datum),
 
2445
 
                             gnutls.X509_FMT_DER)
 
2446
 
        # New buffer for the key ID
 
2447
 
        buf = ctypes.create_string_buffer(32)
 
2448
 
        buf_len = ctypes.c_size_t(len(buf))
 
2449
 
        # Get the key ID from the raw public key into the buffer
 
2450
 
        gnutls.pubkey_get_key_id(pubkey,
 
2451
 
                                 gnutls.KEYID_USE_SHA256,
 
2452
 
                                 ctypes.cast(ctypes.byref(buf),
 
2453
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2454
 
                                 ctypes.byref(buf_len))
 
2455
 
        # Deinit the certificate
 
2456
 
        gnutls.pubkey_deinit(pubkey)
 
2458
 
        # Convert the buffer to a Python bytestring
 
2459
 
        key_id = ctypes.string_at(buf, buf_len.value)
 
2460
 
        # Convert the bytestring to hexadecimal notation
 
2461
 
        hex_key_id = binascii.hexlify(key_id).upper()
 
2465
1847
    def fingerprint(openpgp):
 
2466
1848
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
2467
1849
        # New GnuTLS "datum" with the OpenPGP public key
 
2468
 
        datum = gnutls.datum_t(
 
2469
 
            ctypes.cast(ctypes.c_char_p(openpgp),
 
2470
 
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2471
 
            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))))
 
2472
1855
        # New empty GnuTLS certificate
 
2473
 
        crt = gnutls.openpgp_crt_t()
 
2474
 
        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)))
 
2475
1859
        # Import the OpenPGP public key into the certificate
 
2476
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2477
 
                                  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))
 
2478
1864
        # Verify the self signature in the key
 
2479
1865
        crtverify = ctypes.c_uint()
 
2480
 
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2481
 
                                       ctypes.byref(crtverify))
 
 
1866
        (gnutls.library.functions
 
 
1867
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1868
                                         ctypes.byref(crtverify)))
 
2482
1869
        if crtverify.value != 0:
 
2483
 
            gnutls.openpgp_crt_deinit(crt)
 
2484
 
            raise gnutls.CertificateSecurityError(code
 
 
1870
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1871
            raise (gnutls.errors.CertificateSecurityError
 
2486
1873
        # New buffer for the fingerprint
 
2487
1874
        buf = ctypes.create_string_buffer(20)
 
2488
1875
        buf_len = ctypes.c_size_t()
 
2489
1876
        # Get the fingerprint from the certificate into the buffer
 
2490
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2491
 
                                           ctypes.byref(buf_len))
 
 
1877
        (gnutls.library.functions
 
 
1878
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1879
                                             ctypes.byref(buf_len)))
 
2492
1880
        # Deinit the certificate
 
2493
 
        gnutls.openpgp_crt_deinit(crt)
 
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2494
1882
        # Convert the buffer to a Python bytestring
 
2495
1883
        fpr = ctypes.string_at(buf, buf_len.value)
 
2496
1884
        # Convert the bytestring to hexadecimal notation
 
 
2585
1967
        # socket_wrapper(), if socketfd was set.
 
2586
1968
        socketserver.TCPServer.__init__(self, server_address,
 
2587
1969
                                        RequestHandlerClass)
 
2589
1971
    def server_bind(self):
 
2590
1972
        """This overrides the normal server_bind() function
 
2591
1973
        to bind to an interface if one was specified, and also NOT to
 
2592
1974
        bind to an address or port if they were not specified."""
 
2593
 
        global SO_BINDTODEVICE
 
2594
1975
        if self.interface is not None:
 
2595
1976
            if SO_BINDTODEVICE is None:
 
2596
 
                # Fall back to a hard-coded value which seems to be
 
2598
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2599
 
                SO_BINDTODEVICE = 25
 
2601
 
                self.socket.setsockopt(
 
2602
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2603
 
                    (self.interface + "\0").encode("utf-8"))
 
2604
 
            except socket.error as error:
 
2605
 
                if error.errno == errno.EPERM:
 
2606
 
                    logger.error("No permission to bind to"
 
2607
 
                                 " interface %s", self.interface)
 
2608
 
                elif error.errno == errno.ENOPROTOOPT:
 
2609
 
                    logger.error("SO_BINDTODEVICE not available;"
 
2610
 
                                 " cannot bind to interface %s",
 
2612
 
                elif error.errno == errno.ENODEV:
 
2613
 
                    logger.error("Interface %s does not exist,"
 
2614
 
                                 " cannot 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)
 
2617
1999
        # Only bind(2) the socket if we really need to.
 
2618
2000
        if self.server_address[0] or self.server_address[1]:
 
2619
2001
            if not self.server_address[0]:
 
2620
2002
                if self.address_family == socket.AF_INET6:
 
2621
 
                    any_address = "::"  # in6addr_any
 
 
2003
                    any_address = "::" # in6addr_any
 
2623
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
 
2005
                    any_address = "0.0.0.0" # INADDR_ANY
 
2624
2006
                self.server_address = (any_address,
 
2625
2007
                                       self.server_address[1])
 
2626
2008
            elif not self.server_address[1]:
 
2627
 
                self.server_address = (self.server_address[0], 0)
 
 
2009
                self.server_address = (self.server_address[0],
 
2628
2011
#                 if self.interface:
 
2629
2012
#                     self.server_address = (self.server_address[0],
 
 
2660
2038
        self.gnutls_priority = gnutls_priority
 
2661
2039
        IPv6_TCPServer.__init__(self, server_address,
 
2662
2040
                                RequestHandlerClass,
 
2663
 
                                interface=interface,
 
 
2041
                                interface = interface,
 
 
2042
                                use_ipv6 = use_ipv6,
 
 
2043
                                socketfd = socketfd)
 
2667
2044
    def server_activate(self):
 
2668
2045
        if self.enabled:
 
2669
2046
            return socketserver.TCPServer.server_activate(self)
 
2671
2048
    def enable(self):
 
2672
2049
        self.enabled = True
 
2674
2051
    def add_pipe(self, parent_pipe, proc):
 
2675
2052
        # Call "handle_ipc" for both data and EOF events
 
2677
 
            parent_pipe.fileno(),
 
2678
 
            GLib.IO_IN | GLib.IO_HUP,
 
2679
 
            functools.partial(self.handle_ipc,
 
2680
 
                              parent_pipe=parent_pipe,
 
2683
 
    def handle_ipc(self, source, condition,
 
2686
 
                   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):
 
2687
2062
        # error, or the other end of multiprocessing.Pipe has closed
 
2688
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
 
2063
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2689
2064
            # Wait for other process to exit
 
2693
2068
        # Read a request from the child
 
2694
2069
        request = parent_pipe.recv()
 
2695
2070
        command = request[0]
 
2697
2072
        if command == 'init':
 
2698
 
            key_id = request[1].decode("ascii")
 
2699
 
            fpr = request[2].decode("ascii")
 
2700
 
            address = request[3]
 
2702
 
            for c in self.clients.values():
 
2703
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2705
 
                if key_id and c.key_id == key_id:
 
2708
 
                if fpr and c.fingerprint == fpr:
 
 
2074
            address = request[2]
 
 
2076
            for c in self.clients.itervalues():
 
 
2077
                if c.fingerprint == fpr:
 
2712
 
                logger.info("Client not found for key ID: %s, address"
 
2713
 
                            ": %s", key_id or fpr, address)
 
 
2081
                logger.info("Client not found for fingerprint: %s, ad"
 
 
2082
                            "dress: %s", fpr, address)
 
2714
2083
                if self.use_dbus:
 
2715
2084
                    # Emit D-Bus signal
 
2716
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
 
2085
                    mandos_dbus_service.ClientNotFound(fpr,
 
2718
2087
                parent_pipe.send(False)
 
2722
 
                parent_pipe.fileno(),
 
2723
 
                GLib.IO_IN | GLib.IO_HUP,
 
2724
 
                functools.partial(self.handle_ipc,
 
2725
 
                                  parent_pipe=parent_pipe,
 
2727
 
                                  client_object=client))
 
 
2090
            gobject.io_add_watch(parent_pipe.fileno(),
 
 
2091
                                 gobject.IO_IN | gobject.IO_HUP,
 
 
2092
                                 functools.partial(self.handle_ipc,
 
2728
2098
            parent_pipe.send(True)
 
2729
2099
            # remove the old hook in favor of the new above hook on
 
 
3136
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3138
2500
    except OSError as error:
 
3139
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3140
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3141
2501
        if error.errno != errno.EPERM:
 
3145
2505
        # Enable all possible GnuTLS debugging
 
3147
2507
        # "Use a log level over 10 to enable all debugging options."
 
3148
2508
        # - GnuTLS manual
 
3149
 
        gnutls.global_set_log_level(11)
 
 
2509
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
 
2511
        @gnutls.library.types.gnutls_log_func
 
3152
2512
        def debug_gnutls(level, string):
 
3153
2513
            logger.debug("GnuTLS: %s", string[:-1])
 
3155
 
        gnutls.global_set_log_function(debug_gnutls)
 
 
2515
        (gnutls.library.functions
 
 
2516
         .gnutls_global_set_log_function(debug_gnutls))
 
3157
2518
        # Redirect stdin so all checkers get /dev/null
 
3158
2519
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
3159
2520
        os.dup2(null, sys.stdin.fileno())
 
3163
2524
    # Need to fork before connecting to D-Bus
 
3164
2525
    if not foreground:
 
3165
2526
        # Close all input and output, do double fork, etc.
 
3168
 
    # multiprocessing will use threads, so before we use GLib we need
 
3169
 
    # 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()
 
3172
2533
    global main_loop
 
3173
2534
    # From the Avahi example code
 
3174
2535
    DBusGMainLoop(set_as_default=True)
 
3175
 
    main_loop = GLib.MainLoop()
 
 
2536
    main_loop = gobject.MainLoop()
 
3176
2537
    bus = dbus.SystemBus()
 
3177
2538
    # End of Avahi example code
 
3180
2541
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
3183
 
            old_bus_name = dbus.service.BusName(
 
3184
 
                "se.bsnet.fukt.Mandos", bus,
 
3186
 
        except dbus.exceptions.DBusException as 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:
 
3187
2547
            logger.error("Disabling D-Bus:", exc_info=e)
 
3188
2548
            use_dbus = False
 
3189
2549
            server_settings["use_dbus"] = False
 
3190
2550
            tcp_server.use_dbus = False
 
3192
2552
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
3193
 
        service = AvahiServiceToSyslog(
 
3194
 
            name=server_settings["servicename"],
 
3195
 
            servicetype="_mandos._tcp",
 
 
2553
        service = AvahiServiceToSyslog(name =
 
 
2554
                                       server_settings["servicename"],
 
 
2555
                                       servicetype = "_mandos._tcp",
 
 
2556
                                       protocol = protocol, bus = bus)
 
3198
2557
        if server_settings["interface"]:
 
3199
 
            service.interface = if_nametoindex(
 
3200
 
                server_settings["interface"].encode("utf-8"))
 
 
2558
            service.interface = (if_nametoindex
 
 
2559
                                 (server_settings["interface"]
 
3202
2562
    global multiprocessing_manager
 
3203
2563
    multiprocessing_manager = multiprocessing.Manager()
 
3205
2565
    client_class = Client
 
3207
 
        client_class = functools.partial(ClientDBus, bus=bus)
 
 
2567
        client_class = functools.partial(ClientDBus, bus = bus)
 
3209
2569
    client_settings = Client.config_parser(client_config)
 
3210
2570
    old_client_settings = {}
 
3211
2571
    clients_data = {}
 
3213
2573
    # This is used to redirect stdout and stderr for checker processes
 
3215
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
2575
    wnull = open(os.devnull, "w") # A writable /dev/null
 
3216
2576
    # Only used if server is running in foreground but not in debug
 
3218
2578
    if debug or not foreground:
 
3221
2581
    # Get client data and settings from last running state.
 
3222
2582
    if server_settings["restore"]:
 
3224
2584
            with open(stored_state_path, "rb") as stored_state:
 
3225
 
                if sys.version_info.major == 2:
 
3226
 
                    clients_data, old_client_settings = pickle.load(
 
3229
 
                    bytes_clients_data, bytes_old_client_settings = (
 
3230
 
                        pickle.load(stored_state, encoding="bytes"))
 
3231
 
                    #   Fix bytes to strings
 
3234
 
                    clients_data = {(key.decode("utf-8")
 
3235
 
                                     if isinstance(key, bytes)
 
3238
 
                                    bytes_clients_data.items()}
 
3239
 
                    del bytes_clients_data
 
3240
 
                    for key in clients_data:
 
3241
 
                        value = {(k.decode("utf-8")
 
3242
 
                                  if isinstance(k, bytes) else k): v
 
3244
 
                                 clients_data[key].items()}
 
3245
 
                        clients_data[key] = value
 
3247
 
                        value["client_structure"] = [
 
3249
 
                             if isinstance(s, bytes)
 
3251
 
                            value["client_structure"]]
 
3253
 
                        for k in ("name", "host"):
 
3254
 
                            if isinstance(value[k], bytes):
 
3255
 
                                value[k] = value[k].decode("utf-8")
 
3256
 
                        if not value.has_key("key_id"):
 
3257
 
                            value["key_id"] = ""
 
3258
 
                        elif not value.has_key("fingerprint"):
 
3259
 
                            value["fingerprint"] = ""
 
3260
 
                    #  old_client_settings
 
3262
 
                    old_client_settings = {
 
3263
 
                        (key.decode("utf-8")
 
3264
 
                         if isinstance(key, bytes)
 
3267
 
                        bytes_old_client_settings.items()}
 
3268
 
                    del bytes_old_client_settings
 
3270
 
                    for value in old_client_settings.values():
 
3271
 
                        if isinstance(value["host"], bytes):
 
3272
 
                            value["host"] = (value["host"]
 
 
2585
                clients_data, old_client_settings = (pickle.load
 
3274
2587
            os.remove(stored_state_path)
 
3275
2588
        except IOError as e:
 
3276
2589
            if e.errno == errno.ENOENT:
 
3277
 
                logger.warning("Could not load persistent state:"
 
3278
 
                               " {}".format(os.strerror(e.errno)))
 
 
2590
                logger.warning("Could not load persistent state: {}"
 
 
2591
                                .format(os.strerror(e.errno)))
 
3280
2593
                logger.critical("Could not load persistent state:",
 
3283
2596
        except EOFError as e:
 
3284
2597
            logger.warning("Could not load persistent state: "
 
 
2598
                           "EOFError:", exc_info=e)
 
3288
2600
    with PGPEngine() as pgp:
 
3289
2601
        for client_name, client in clients_data.items():
 
3290
2602
            # Skip removed clients
 
3291
2603
            if client_name not in client_settings:
 
3294
2606
            # Decide which value to use after restoring saved state.
 
3295
2607
            # We have three different values: Old config file,
 
3296
2608
            # new config file, and saved state.
 
 
3354
2666
    for client_name in (set(client_settings)
 
3355
2667
                        - set(old_client_settings)):
 
3356
2668
        clients_data[client_name] = client_settings[client_name]
 
3358
2670
    # Create all client objects
 
3359
2671
    for client_name, client in clients_data.items():
 
3360
2672
        tcp_server.clients[client_name] = client_class(
 
3363
 
            server_settings=server_settings)
 
 
2673
            name = client_name, settings = client,
 
 
2674
            server_settings = server_settings)
 
3365
2676
    if not tcp_server.clients:
 
3366
2677
        logger.warning("No clients defined")
 
3368
2679
    if not foreground:
 
3369
2680
        if pidfile is not None:
 
3373
 
                    print(pid, file=pidfile)
 
 
2684
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
3374
2685
            except IOError:
 
3375
2686
                logger.error("Could not write to file %r with PID %d",
 
3376
2687
                             pidfilename, pid)
 
3378
2689
        del pidfilename
 
3380
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3381
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3382
 
                             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())
 
3386
 
        @alternate_dbus_interfaces(
 
3387
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
3388
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
 
2695
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
2696
                                        "se.bsnet.fukt.Mandos"})
 
 
2697
        class MandosDBusService(DBusObjectWithProperties):
 
3389
2698
            """A D-Bus proxy object"""
 
3391
2699
            def __init__(self):
 
3392
2700
                dbus.service.Object.__init__(self, bus, "/")
 
3394
2701
            _interface = "se.recompile.Mandos"
 
 
2703
            @dbus_interface_annotations(_interface)
 
 
2705
                return { "org.freedesktop.DBus.Property"
 
 
2706
                         ".EmitsChangedSignal":
 
3396
2709
            @dbus.service.signal(_interface, signature="o")
 
3397
2710
            def ClientAdded(self, objpath):
 
3401
2714
            @dbus.service.signal(_interface, signature="ss")
 
3402
 
            def ClientNotFound(self, key_id, address):
 
 
2715
            def ClientNotFound(self, fingerprint, address):
 
3406
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3408
2719
            @dbus.service.signal(_interface, signature="os")
 
3409
2720
            def ClientRemoved(self, objpath, name):
 
3413
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3415
2724
            @dbus.service.method(_interface, out_signature="ao")
 
3416
2725
            def GetAllClients(self):
 
3418
 
                return dbus.Array(c.dbus_object_path for c in
 
3419
 
                                  tcp_server.clients.values())
 
3421
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
 
2727
                return dbus.Array(c.dbus_object_path
 
 
2729
                                  tcp_server.clients.itervalues())
 
3423
2731
            @dbus.service.method(_interface,
 
3424
2732
                                 out_signature="a{oa{sv}}")
 
3425
2733
            def GetAllClientsWithProperties(self):
 
3427
2735
                return dbus.Dictionary(
 
3428
 
                    {c.dbus_object_path: c.GetAll(
 
3429
 
                        "se.recompile.Mandos.Client")
 
3430
 
                     for c in tcp_server.clients.values()},
 
 
2736
                    { c.dbus_object_path: c.GetAll("")
 
 
2737
                      for c in tcp_server.clients.itervalues() },
 
3431
2738
                    signature="oa{sv}")
 
3433
2740
            @dbus.service.method(_interface, in_signature="o")
 
3434
2741
            def RemoveClient(self, object_path):
 
3436
 
                for c in tcp_server.clients.values():
 
 
2743
                for c in tcp_server.clients.itervalues():
 
3437
2744
                    if c.dbus_object_path == object_path:
 
3438
2745
                        del tcp_server.clients[c.name]
 
3439
2746
                        c.remove_from_connection()
 
3440
 
                        # Don't signal the disabling
 
 
2747
                        # Don't signal anything except ClientRemoved
 
3441
2748
                        c.disable(quiet=True)
 
3442
 
                        # Emit D-Bus signal for removal
 
3443
 
                        self.client_removed_signal(c)
 
 
2750
                        self.ClientRemoved(object_path, c.name)
 
3445
2752
                raise KeyError(object_path)
 
3449
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3450
 
                                 out_signature="a{oa{sa{sv}}}")
 
3451
 
            def GetManagedObjects(self):
 
3453
 
                return dbus.Dictionary(
 
3454
 
                    {client.dbus_object_path:
 
3456
 
                         {interface: client.GetAll(interface)
 
3458
 
                          client._get_all_interface_names()})
 
3459
 
                     for client in tcp_server.clients.values()})
 
3461
 
            def client_added_signal(self, client):
 
3462
 
                """Send the new standard signal and the old signal"""
 
3464
 
                    # New standard signal
 
3465
 
                    self.InterfacesAdded(
 
3466
 
                        client.dbus_object_path,
 
3468
 
                            {interface: client.GetAll(interface)
 
3470
 
                             client._get_all_interface_names()}))
 
3472
 
                    self.ClientAdded(client.dbus_object_path)
 
3474
 
            def client_removed_signal(self, client):
 
3475
 
                """Send the new standard signal and the old signal"""
 
3477
 
                    # New standard signal
 
3478
 
                    self.InterfacesRemoved(
 
3479
 
                        client.dbus_object_path,
 
3480
 
                        client._get_all_interface_names())
 
3482
 
                    self.ClientRemoved(client.dbus_object_path,
 
3485
2756
        mandos_dbus_service = MandosDBusService()
 
3487
 
    # Save modules to variables to exempt the modules from being
 
3488
 
    # unloaded before the function registered with atexit() is run.
 
3489
 
    mp = multiprocessing
 
3493
2759
        "Cleanup function; run on exit"
 
3495
2761
            service.cleanup()
 
3497
 
        mp.active_children()
 
 
2763
        multiprocessing.active_children()
 
3499
2765
        if not (tcp_server.clients or client_settings):
 
3502
2768
        # Store client before exiting. Secrets are encrypted with key
 
3503
2769
        # based on what config file has. If config file is
 
3504
2770
        # removed/edited, old secret will thus be unrecovable.
 
3506
2772
        with PGPEngine() as pgp:
 
3507
 
            for client in tcp_server.clients.values():
 
 
2773
            for client in tcp_server.clients.itervalues():
 
3508
2774
                key = client_settings[client.name]["secret"]
 
3509
2775
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3511
2777
                client_dict = {}
 
3513
2779
                # A list of attributes that can not be pickled
 
3515
 
                exclude = {"bus", "changedstate", "secret",
 
3516
 
                           "checker", "server_settings"}
 
3517
 
                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)):
 
3519
2785
                    exclude.add(name)
 
3521
2787
                client_dict["encrypted_secret"] = (client
 
3522
2788
                                                   .encrypted_secret)
 
3523
2789
                for attr in client.client_structure:
 
3524
2790
                    if attr not in exclude:
 
3525
2791
                        client_dict[attr] = getattr(client, attr)
 
3527
2793
                clients[client.name] = client_dict
 
3528
2794
                del client_settings[client.name]["secret"]
 
3531
 
            with tempfile.NamedTemporaryFile(
 
3535
 
                    dir=os.path.dirname(stored_state_path),
 
3536
 
                    delete=False) as stored_state:
 
3537
 
                pickle.dump((clients, client_settings), stored_state,
 
3539
 
                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
 
3540
2803
            os.rename(tempname, stored_state_path)
 
3541
2804
        except (IOError, OSError) as e: