65
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
66
73
import multiprocessing
 
74
82
import dbus.service
 
 
84
from gi.repository import GLib
 
77
85
from dbus.mainloop.glib import DBusGMainLoop
 
80
88
import xml.dom.minidom
 
 
91
# Try to find the value of SO_BINDTODEVICE:
 
 
93
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
94
    # newer, and it is also the most natural place for it:
 
84
95
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
85
96
except AttributeError:
 
 
98
        # This is where SO_BINDTODEVICE was up to and including Python
 
87
100
        from IN import SO_BINDTODEVICE
 
88
101
    except ImportError:
 
89
 
        SO_BINDTODEVICE = None
 
 
102
        # In Python 2.7 it seems to have been removed entirely.
 
 
103
        # Try running the C preprocessor:
 
 
105
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
107
                                  stdin=subprocess.PIPE,
 
 
108
                                  stdout=subprocess.PIPE)
 
 
109
            stdout = cc.communicate(
 
 
110
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
111
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
112
        except (OSError, ValueError, IndexError):
 
 
114
            SO_BINDTODEVICE = None
 
 
116
if sys.version_info.major == 2:
 
 
119
if sys.version_info < (3, 2):
 
 
120
    configparser.Configparser = configparser.SafeConfigParser
 
92
123
stored_state_file = "clients.pickle"
 
94
125
logger = logging.getLogger()
 
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
 
                      (ctypes.util.find_library("c"))
 
 
129
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
130
        ctypes.util.find_library("c")).if_nametoindex
 
101
131
except (OSError, AttributeError):
 
102
133
    def if_nametoindex(interface):
 
103
134
        "Get an interface index the hard way, i.e. using fcntl()"
 
104
135
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
136
        with contextlib.closing(socket.socket()) as s:
 
106
137
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
 
                                struct.pack(str("16s16x"),
 
109
 
        interface_index = struct.unpack(str("I"),
 
 
138
                                struct.pack(b"16s16x", interface))
 
 
139
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
111
140
        return interface_index
 
 
143
def copy_function(func):
 
 
144
    """Make a copy of a function"""
 
 
145
    if sys.version_info.major == 2:
 
 
146
        return types.FunctionType(func.func_code,
 
 
152
        return types.FunctionType(func.__code__,
 
114
159
def initlogger(debug, level=logging.WARNING):
 
115
160
    """init logger and add loglevel"""
 
118
 
    syslogger = (logging.handlers.SysLogHandler
 
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
121
 
                  address = str("/dev/log")))
 
 
163
    syslogger = (logging.handlers.SysLogHandler(
 
 
164
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
122
166
    syslogger.setFormatter(logging.Formatter
 
123
167
                           ('Mandos [%(process)d]: %(levelname)s:'
 
125
169
    logger.addHandler(syslogger)
 
128
172
        console = logging.StreamHandler()
 
129
173
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
182
240
                       .replace(b"\n", b"\\n")
 
183
241
                       .replace(b"\0", b"\\x00"))
 
186
244
    def encrypt(self, data, password):
 
187
245
        passphrase = self.password_encode(password)
 
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
 
246
        with tempfile.NamedTemporaryFile(
 
 
247
                dir=self.tempdir) as passfile:
 
190
248
            passfile.write(passphrase)
 
192
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
 
250
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
193
251
                                     '--passphrase-file',
 
195
253
                                    + self.gnupgargs,
 
196
 
                                    stdin = subprocess.PIPE,
 
197
 
                                    stdout = subprocess.PIPE,
 
198
 
                                    stderr = subprocess.PIPE)
 
199
 
            ciphertext, err = proc.communicate(input = data)
 
 
254
                                    stdin=subprocess.PIPE,
 
 
255
                                    stdout=subprocess.PIPE,
 
 
256
                                    stderr=subprocess.PIPE)
 
 
257
            ciphertext, err = proc.communicate(input=data)
 
200
258
        if proc.returncode != 0:
 
201
259
            raise PGPError(err)
 
202
260
        return ciphertext
 
204
262
    def decrypt(self, data, password):
 
205
263
        passphrase = self.password_encode(password)
 
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
 
264
        with tempfile.NamedTemporaryFile(
 
 
265
                dir=self.tempdir) as passfile:
 
208
266
            passfile.write(passphrase)
 
210
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
 
268
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
211
269
                                     '--passphrase-file',
 
213
271
                                    + self.gnupgargs,
 
214
 
                                    stdin = subprocess.PIPE,
 
215
 
                                    stdout = subprocess.PIPE,
 
216
 
                                    stderr = subprocess.PIPE)
 
217
 
            decrypted_plaintext, err = proc.communicate(input
 
 
272
                                    stdin=subprocess.PIPE,
 
 
273
                                    stdout=subprocess.PIPE,
 
 
274
                                    stderr=subprocess.PIPE)
 
 
275
            decrypted_plaintext, err = proc.communicate(input=data)
 
219
276
        if proc.returncode != 0:
 
220
277
            raise PGPError(err)
 
221
278
        return decrypted_plaintext
 
 
281
# Pretend that we have an Avahi module
 
 
283
    """This isn't so much a class as it is a module-like namespace."""
 
 
284
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
285
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
286
    PROTO_INET = 0               # avahi-common/address.h
 
 
287
    PROTO_INET6 = 1              # avahi-common/address.h
 
 
288
    DBUS_NAME = "org.freedesktop.Avahi"
 
 
289
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
 
290
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
 
291
    DBUS_PATH_SERVER = "/"
 
 
294
    def string_array_to_txt_array(t):
 
 
295
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
 
296
                           for s in t), signature="ay")
 
 
297
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
298
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
299
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
300
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
301
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
302
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
303
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
304
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
224
307
class AvahiError(Exception):
 
225
308
    def __init__(self, value, *args, **kwargs):
 
226
309
        self.value = value
 
227
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
228
 
    def __unicode__(self):
 
229
 
        return unicode(repr(self.value))
 
 
310
        return super(AvahiError, self).__init__(value, *args,
 
231
314
class AvahiServiceError(AvahiError):
 
234
318
class AvahiGroupError(AvahiError):
 
238
322
class AvahiService(object):
 
239
323
    """An Avahi (Zeroconf) service.
 
242
326
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
243
327
               Used to optionally bind to the specified interface.
 
 
386
492
                                    follow_name_owner_changes=True),
 
387
493
                avahi.DBUS_INTERFACE_SERVER)
 
388
494
        self.server.connect_to_signal("StateChanged",
 
389
 
                                 self.server_state_changed)
 
 
495
                                      self.server_state_changed)
 
390
496
        self.server_state_changed(self.server.GetState())
 
393
499
class AvahiServiceToSyslog(AvahiService):
 
 
500
    def rename(self, *args, **kwargs):
 
395
501
        """Add the new name to the syslog messages"""
 
396
 
        ret = AvahiService.rename(self)
 
397
 
        syslogger.setFormatter(logging.Formatter
 
398
 
                               ('Mandos ({0}) [%(process)d]:'
 
399
 
                                ' %(levelname)s: %(message)s'
 
 
502
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
503
        syslogger.setFormatter(logging.Formatter(
 
 
504
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
404
 
def timedelta_to_milliseconds(td):
 
405
 
    "Convert a datetime.timedelta() to milliseconds"
 
406
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
407
 
            + (td.seconds * 1000)
 
408
 
            + (td.microseconds // 1000))
 
 
509
# Pretend that we have a GnuTLS module
 
 
510
class gnutls(object):
 
 
511
    """This isn't so much a class as it is a module-like namespace."""
 
 
513
    library = ctypes.util.find_library("gnutls")
 
 
515
        library = ctypes.util.find_library("gnutls-deb0")
 
 
516
    _library = ctypes.cdll.LoadLibrary(library)
 
 
519
    # Unless otherwise indicated, the constants and types below are
 
 
520
    # all from the gnutls/gnutls.h C header file.
 
 
531
    E_NO_CERTIFICATE_FOUND = -49
 
 
536
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
 
537
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
540
    class session_int(ctypes.Structure):
 
 
542
    session_t = ctypes.POINTER(session_int)
 
 
544
    class certificate_credentials_st(ctypes.Structure):
 
 
546
    certificate_credentials_t = ctypes.POINTER(
 
 
547
        certificate_credentials_st)
 
 
548
    certificate_type_t = ctypes.c_int
 
 
550
    class datum_t(ctypes.Structure):
 
 
551
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
552
                    ('size', ctypes.c_uint)]
 
 
554
    class openpgp_crt_int(ctypes.Structure):
 
 
556
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
557
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
 
558
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
559
    credentials_type_t = ctypes.c_int
 
 
560
    transport_ptr_t = ctypes.c_void_p
 
 
561
    close_request_t = ctypes.c_int
 
 
564
    class Error(Exception):
 
 
565
        def __init__(self, message=None, code=None, args=()):
 
 
566
            # Default usage is by a message string, but if a return
 
 
567
            # code is passed, convert it to a string with
 
 
570
            if message is None and code is not None:
 
 
571
                message = gnutls.strerror(code)
 
 
572
            return super(gnutls.Error, self).__init__(
 
 
575
    class CertificateSecurityError(Error):
 
 
579
    class Credentials(object):
 
 
581
            self._c_object = gnutls.certificate_credentials_t()
 
 
582
            gnutls.certificate_allocate_credentials(
 
 
583
                ctypes.byref(self._c_object))
 
 
584
            self.type = gnutls.CRD_CERTIFICATE
 
 
587
            gnutls.certificate_free_credentials(self._c_object)
 
 
589
    class ClientSession(object):
 
 
590
        def __init__(self, socket, credentials=None):
 
 
591
            self._c_object = gnutls.session_t()
 
 
592
            gnutls_flags = gnutls.CLIENT
 
 
593
            if gnutls.check_version(b"3.5.6"):
 
 
594
                gnutls_flags |= gnutls.NO_TICKETS
 
 
596
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
597
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
599
            gnutls.set_default_priority(self._c_object)
 
 
600
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
601
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
604
            if credentials is None:
 
 
605
                credentials = gnutls.Credentials()
 
 
606
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
607
                                   ctypes.cast(credentials._c_object,
 
 
609
            self.credentials = credentials
 
 
612
            gnutls.deinit(self._c_object)
 
 
615
            return gnutls.handshake(self._c_object)
 
 
617
        def send(self, data):
 
 
621
                data_len -= gnutls.record_send(self._c_object,
 
 
626
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
628
    # Error handling functions
 
 
629
    def _error_code(result):
 
 
630
        """A function to raise exceptions on errors, suitable
 
 
631
        for the 'restype' attribute on ctypes functions"""
 
 
634
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
635
            raise gnutls.CertificateSecurityError(code=result)
 
 
636
        raise gnutls.Error(code=result)
 
 
638
    def _retry_on_error(result, func, arguments):
 
 
639
        """A function to retry on some errors, suitable
 
 
640
        for the 'errcheck' attribute on ctypes functions"""
 
 
642
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
643
                return _error_code(result)
 
 
644
            result = func(*arguments)
 
 
647
    # Unless otherwise indicated, the function declarations below are
 
 
648
    # all from the gnutls/gnutls.h C header file.
 
 
651
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
652
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
653
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
654
    priority_set_direct.restype = _error_code
 
 
656
    init = _library.gnutls_init
 
 
657
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
658
    init.restype = _error_code
 
 
660
    set_default_priority = _library.gnutls_set_default_priority
 
 
661
    set_default_priority.argtypes = [session_t]
 
 
662
    set_default_priority.restype = _error_code
 
 
664
    record_send = _library.gnutls_record_send
 
 
665
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
667
    record_send.restype = ctypes.c_ssize_t
 
 
668
    record_send.errcheck = _retry_on_error
 
 
670
    certificate_allocate_credentials = (
 
 
671
        _library.gnutls_certificate_allocate_credentials)
 
 
672
    certificate_allocate_credentials.argtypes = [
 
 
673
        ctypes.POINTER(certificate_credentials_t)]
 
 
674
    certificate_allocate_credentials.restype = _error_code
 
 
676
    certificate_free_credentials = (
 
 
677
        _library.gnutls_certificate_free_credentials)
 
 
678
    certificate_free_credentials.argtypes = [
 
 
679
        certificate_credentials_t]
 
 
680
    certificate_free_credentials.restype = None
 
 
682
    handshake_set_private_extensions = (
 
 
683
        _library.gnutls_handshake_set_private_extensions)
 
 
684
    handshake_set_private_extensions.argtypes = [session_t,
 
 
686
    handshake_set_private_extensions.restype = None
 
 
688
    credentials_set = _library.gnutls_credentials_set
 
 
689
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
691
    credentials_set.restype = _error_code
 
 
693
    strerror = _library.gnutls_strerror
 
 
694
    strerror.argtypes = [ctypes.c_int]
 
 
695
    strerror.restype = ctypes.c_char_p
 
 
697
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
698
    certificate_type_get.argtypes = [session_t]
 
 
699
    certificate_type_get.restype = _error_code
 
 
701
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
702
    certificate_get_peers.argtypes = [session_t,
 
 
703
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
704
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
706
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
707
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
708
    global_set_log_level.restype = None
 
 
710
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
711
    global_set_log_function.argtypes = [log_func]
 
 
712
    global_set_log_function.restype = None
 
 
714
    deinit = _library.gnutls_deinit
 
 
715
    deinit.argtypes = [session_t]
 
 
716
    deinit.restype = None
 
 
718
    handshake = _library.gnutls_handshake
 
 
719
    handshake.argtypes = [session_t]
 
 
720
    handshake.restype = _error_code
 
 
721
    handshake.errcheck = _retry_on_error
 
 
723
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
724
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
725
    transport_set_ptr.restype = None
 
 
727
    bye = _library.gnutls_bye
 
 
728
    bye.argtypes = [session_t, close_request_t]
 
 
729
    bye.restype = _error_code
 
 
730
    bye.errcheck = _retry_on_error
 
 
732
    check_version = _library.gnutls_check_version
 
 
733
    check_version.argtypes = [ctypes.c_char_p]
 
 
734
    check_version.restype = ctypes.c_char_p
 
 
736
    _need_version = b"3.3.0"
 
 
737
    if check_version(_need_version) is None:
 
 
738
        raise self.Error("Needs GnuTLS {} or later"
 
 
739
                         .format(_need_version))
 
 
741
    _tls_rawpk_version = b"3.6.6"
 
 
742
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
746
        class pubkey_st(ctypes.Structure):
 
 
748
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
750
        x509_crt_fmt_t = ctypes.c_int
 
 
752
        # All the function declarations below are from gnutls/abstract.h
 
 
753
        pubkey_init = _library.gnutls_pubkey_init
 
 
754
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
755
        pubkey_init.restype = _error_code
 
 
757
        pubkey_import = _library.gnutls_pubkey_import
 
 
758
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
760
        pubkey_import.restype = _error_code
 
 
762
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
763
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
764
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
765
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
766
        pubkey_get_key_id.restype = _error_code
 
 
768
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
769
        pubkey_deinit.argtypes = [pubkey_t]
 
 
770
        pubkey_deinit.restype = None
 
 
772
        # All the function declarations below are from gnutls/openpgp.h
 
 
774
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
775
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
776
        openpgp_crt_init.restype = _error_code
 
 
778
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
779
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
780
                                       ctypes.POINTER(datum_t),
 
 
782
        openpgp_crt_import.restype = _error_code
 
 
784
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
785
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
786
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
787
        openpgp_crt_verify_self.restype = _error_code
 
 
789
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
790
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
791
        openpgp_crt_deinit.restype = None
 
 
793
        openpgp_crt_get_fingerprint = (
 
 
794
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
795
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
799
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
801
    if check_version(b"3.6.4"):
 
 
802
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
803
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
804
        certificate_type_get2.restype = _error_code
 
 
806
    # Remove non-public functions
 
 
807
    del _error_code, _retry_on_error
 
 
810
def call_pipe(connection,       # : multiprocessing.Connection
 
 
811
              func, *args, **kwargs):
 
 
812
    """This function is meant to be called by multiprocessing.Process
 
 
814
    This function runs func(*args, **kwargs), and writes the resulting
 
 
815
    return value on the provided multiprocessing.Connection.
 
 
817
    connection.send(func(*args, **kwargs))
 
411
821
class Client(object):
 
412
822
    """A representation of a client host served by this server.
 
415
825
    approved:   bool(); 'None' if not yet approved/disapproved
 
416
826
    approval_delay: datetime.timedelta(); Time to wait for approval
 
417
827
    approval_duration: datetime.timedelta(); Duration of one approval
 
418
 
    checker:    subprocess.Popen(); a running checker process used
 
419
 
                                    to see if the client lives.
 
420
 
                                    'None' if no process is running.
 
421
 
    checker_callback_tag: a gobject event source tag, or None
 
 
828
    checker: multiprocessing.Process(); a running checker process used
 
 
829
             to see if the client lives. 'None' if no process is
 
 
831
    checker_callback_tag: a GLib event source tag, or None
 
422
832
    checker_command: string; External command which is run to check
 
423
833
                     if client lives.  %() expansions are done at
 
424
834
                     runtime with vars(self) as dict, so that for
 
425
835
                     instance %(name)s can be used in the command.
 
426
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
836
    checker_initiator_tag: a GLib event source tag, or None
 
427
837
    created:    datetime.datetime(); (UTC) object creation
 
428
838
    client_structure: Object describing what attributes a client has
 
429
839
                      and is used for storing the client at exit
 
430
840
    current_checker_command: string; current running checker_command
 
431
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
841
    disable_initiator_tag: a GLib event source tag, or None
 
433
843
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
434
 
                 uniquely identify the client
 
 
844
                 uniquely identify an OpenPGP client
 
 
845
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
846
            a client using raw public keys
 
435
847
    host:       string; available for use by the checker command
 
436
848
    interval:   datetime.timedelta(); How often to start a new checker
 
437
849
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
604
1006
            logger.info("Disabling client %s", self.name)
 
605
1007
        if getattr(self, "disable_initiator_tag", None) is not None:
 
606
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1008
            GLib.source_remove(self.disable_initiator_tag)
 
607
1009
            self.disable_initiator_tag = None
 
608
1010
        self.expires = None
 
609
1011
        if getattr(self, "checker_initiator_tag", None) is not None:
 
610
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1012
            GLib.source_remove(self.checker_initiator_tag)
 
611
1013
            self.checker_initiator_tag = None
 
612
1014
        self.stop_checker()
 
613
1015
        self.enabled = False
 
615
1017
            self.send_changedstate()
 
616
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1018
        # Do not run this again if called by a GLib.timeout_add
 
619
1021
    def __del__(self):
 
622
1024
    def init_checker(self):
 
623
1025
        # Schedule a new checker to be started an 'interval' from now,
 
624
1026
        # and every interval from then on.
 
625
1027
        if self.checker_initiator_tag is not None:
 
626
 
            gobject.source_remove(self.checker_initiator_tag)
 
627
 
        self.checker_initiator_tag = (gobject.timeout_add
 
628
 
                                      (self.interval_milliseconds(),
 
 
1028
            GLib.source_remove(self.checker_initiator_tag)
 
 
1029
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1030
            int(self.interval.total_seconds() * 1000),
 
630
1032
        # Schedule a disable() when 'timeout' has passed
 
631
1033
        if self.disable_initiator_tag is not None:
 
632
 
            gobject.source_remove(self.disable_initiator_tag)
 
633
 
        self.disable_initiator_tag = (gobject.timeout_add
 
634
 
                                   (self.timeout_milliseconds(),
 
 
1034
            GLib.source_remove(self.disable_initiator_tag)
 
 
1035
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1036
            int(self.timeout.total_seconds() * 1000), self.disable)
 
636
1037
        # Also start a new checker *right now*.
 
637
1038
        self.start_checker()
 
639
 
    def checker_callback(self, pid, condition, command):
 
 
1040
    def checker_callback(self, source, condition, connection,
 
640
1042
        """The checker has completed, so take appropriate actions."""
 
 
1043
        # Read return code from connection (see call_pipe)
 
 
1044
        returncode = connection.recv()
 
641
1047
        self.checker_callback_tag = None
 
642
1048
        self.checker = None
 
643
 
        if os.WIFEXITED(condition):
 
644
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1051
            self.last_checker_status = returncode
 
 
1052
            self.last_checker_signal = None
 
645
1053
            if self.last_checker_status == 0:
 
646
1054
                logger.info("Checker for %(name)s succeeded",
 
648
1056
                self.checked_ok()
 
650
 
                logger.info("Checker for %(name)s failed",
 
 
1058
                logger.info("Checker for %(name)s failed", vars(self))
 
653
1060
            self.last_checker_status = -1
 
 
1061
            self.last_checker_signal = -returncode
 
654
1062
            logger.warning("Checker for %(name)s crashed?",
 
657
1066
    def checked_ok(self):
 
658
1067
        """Assert that the client has been seen, alive and well."""
 
659
1068
        self.last_checked_ok = datetime.datetime.utcnow()
 
660
1069
        self.last_checker_status = 0
 
 
1070
        self.last_checker_signal = None
 
661
1071
        self.bump_timeout()
 
663
1073
    def bump_timeout(self, timeout=None):
 
664
1074
        """Bump up the timeout for this client."""
 
665
1075
        if timeout is None:
 
666
1076
            timeout = self.timeout
 
667
1077
        if self.disable_initiator_tag is not None:
 
668
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1078
            GLib.source_remove(self.disable_initiator_tag)
 
669
1079
            self.disable_initiator_tag = None
 
670
1080
        if getattr(self, "enabled", False):
 
671
 
            self.disable_initiator_tag = (gobject.timeout_add
 
672
 
                                          (timedelta_to_milliseconds
 
673
 
                                           (timeout), self.disable))
 
 
1081
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1082
                int(timeout.total_seconds() * 1000), self.disable)
 
674
1083
            self.expires = datetime.datetime.utcnow() + timeout
 
676
1085
    def need_approval(self):
 
677
1086
        self.last_approval_request = datetime.datetime.utcnow()
 
679
1088
    def start_checker(self):
 
680
1089
        """Start a new checker subprocess if one is not running.
 
682
1091
        If a checker already exists, leave it running and do
 
684
1093
        # The reason for not killing a running checker is that if we
 
 
689
1098
        # checkers alone, the checker would have to take more time
 
690
1099
        # than 'timeout' for the client to be disabled, which is as it
 
693
 
        # If a checker exists, make sure it is not a zombie
 
695
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
696
 
        except AttributeError:
 
698
 
        except OSError as error:
 
699
 
            if error.errno != errno.ECHILD:
 
703
 
                logger.warning("Checker was a zombie")
 
704
 
                gobject.source_remove(self.checker_callback_tag)
 
705
 
                self.checker_callback(pid, status,
 
706
 
                                      self.current_checker_command)
 
 
1102
        if self.checker is not None and not self.checker.is_alive():
 
 
1103
            logger.warning("Checker was not alive; joining")
 
707
1106
        # Start a new checker if needed
 
708
1107
        if self.checker is None:
 
709
1108
            # Escape attributes for the shell
 
710
 
            escaped_attrs = dict(
 
711
 
                (attr, re.escape(unicode(getattr(self, attr))))
 
713
 
                self.runtime_expansions)
 
 
1110
                attr: re.escape(str(getattr(self, attr)))
 
 
1111
                for attr in self.runtime_expansions}
 
715
1113
                command = self.checker_command % escaped_attrs
 
716
1114
            except TypeError as error:
 
717
1115
                logger.error('Could not format string "%s"',
 
718
 
                             self.checker_command, exc_info=error)
 
719
 
                return True # Try again later
 
 
1116
                             self.checker_command,
 
 
1118
                return True     # Try again later
 
720
1119
            self.current_checker_command = command
 
722
 
                logger.info("Starting checker %r for %s",
 
724
 
                # We don't need to redirect stdout and stderr, since
 
725
 
                # in normal mode, that is already done by daemon(),
 
726
 
                # and in debug mode we don't want to.  (Stdin is
 
727
 
                # always replaced by /dev/null.)
 
728
 
                # The exception is when not debugging but nevertheless
 
729
 
                # running in the foreground; use the previously
 
732
 
                if (not self.server_settings["debug"]
 
733
 
                    and self.server_settings["foreground"]):
 
734
 
                    popen_args.update({"stdout": wnull,
 
736
 
                self.checker = subprocess.Popen(command,
 
740
 
            except OSError as error:
 
741
 
                logger.error("Failed to start subprocess",
 
744
 
            self.checker_callback_tag = (gobject.child_watch_add
 
746
 
                                          self.checker_callback,
 
748
 
            # The checker may have completed before the gobject
 
749
 
            # watch was added.  Check for this.
 
751
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
752
 
            except OSError as error:
 
753
 
                if error.errno == errno.ECHILD:
 
754
 
                    # This should never happen
 
755
 
                    logger.error("Child process vanished",
 
760
 
                gobject.source_remove(self.checker_callback_tag)
 
761
 
                self.checker_callback(pid, status, command)
 
762
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
1120
            logger.info("Starting checker %r for %s", command,
 
 
1122
            # We don't need to redirect stdout and stderr, since
 
 
1123
            # in normal mode, that is already done by daemon(),
 
 
1124
            # and in debug mode we don't want to.  (Stdin is
 
 
1125
            # always replaced by /dev/null.)
 
 
1126
            # The exception is when not debugging but nevertheless
 
 
1127
            # running in the foreground; use the previously
 
 
1129
            popen_args = {"close_fds": True,
 
 
1132
            if (not self.server_settings["debug"]
 
 
1133
                and self.server_settings["foreground"]):
 
 
1134
                popen_args.update({"stdout": wnull,
 
 
1136
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1137
            self.checker = multiprocessing.Process(
 
 
1139
                args=(pipe[1], subprocess.call, command),
 
 
1141
            self.checker.start()
 
 
1142
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1143
                pipe[0].fileno(), GLib.IO_IN,
 
 
1144
                self.checker_callback, pipe[0], command)
 
 
1145
        # Re-run this periodically if run by GLib.timeout_add
 
765
1148
    def stop_checker(self):
 
766
1149
        """Force the checker process, if any, to stop."""
 
767
1150
        if self.checker_callback_tag:
 
768
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1151
            GLib.source_remove(self.checker_callback_tag)
 
769
1152
            self.checker_callback_tag = None
 
770
1153
        if getattr(self, "checker", None) is None:
 
772
1155
        logger.debug("Stopping checker for %(name)s", vars(self))
 
774
 
            self.checker.terminate()
 
776
 
            #if self.checker.poll() is None:
 
777
 
            #    self.checker.kill()
 
778
 
        except OSError as error:
 
779
 
            if error.errno != errno.ESRCH: # No such process
 
 
1156
        self.checker.terminate()
 
781
1157
        self.checker = None
 
784
 
def dbus_service_property(dbus_interface, signature="v",
 
785
 
                          access="readwrite", byte_arrays=False):
 
 
1160
def dbus_service_property(dbus_interface,
 
786
1164
    """Decorators for marking methods of a DBusObjectWithProperties to
 
787
1165
    become properties on the D-Bus.
 
789
1167
    The decorated method will be called with no arguments by "Get"
 
790
1168
    and with one argument by "Set".
 
792
1170
    The parameters, where they are supported, are the same as
 
793
1171
    dbus.service.method, except there is only "signature", since the
 
794
1172
    type from Get() and the type sent to Set() is the same.
 
 
870
 
class DBusObjectWithProperties(dbus.service.Object):
 
871
 
    """A D-Bus object with properties.
 
873
 
    Classes inheriting from this can use the dbus_service_property
 
874
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
875
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
1255
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1256
    """A D-Bus object with annotations.
 
 
1258
    Classes inheriting from this can use the dbus_annotations
 
 
1259
    decorator to add annotations to methods or signals.
 
879
1263
    def _is_dbus_thing(thing):
 
880
1264
        """Returns a function testing if an attribute is a D-Bus thing
 
882
1266
        If called like _is_dbus_thing("method") it returns a function
 
883
1267
        suitable for use as predicate to inspect.getmembers().
 
885
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
 
1269
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
888
1272
    def _get_all_dbus_things(self, thing):
 
889
1273
        """Returns a generator of (name, attribute) pairs
 
891
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
 
1275
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
893
1276
                 athing.__get__(self))
 
894
1277
                for cls in self.__class__.__mro__
 
895
1278
                for name, athing in
 
896
 
                inspect.getmembers(cls,
 
897
 
                                   self._is_dbus_thing(thing)))
 
 
1279
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1281
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1283
                         path_keyword='object_path',
 
 
1284
                         connection_keyword='connection')
 
 
1285
    def Introspect(self, object_path, connection):
 
 
1286
        """Overloading of standard D-Bus method.
 
 
1288
        Inserts annotation tags on methods and signals.
 
 
1290
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1293
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1295
            for if_tag in document.getElementsByTagName("interface"):
 
 
1296
                # Add annotation tags
 
 
1297
                for typ in ("method", "signal"):
 
 
1298
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1300
                        for name, prop in (self.
 
 
1301
                                           _get_all_dbus_things(typ)):
 
 
1302
                            if (name == tag.getAttribute("name")
 
 
1303
                                and prop._dbus_interface
 
 
1304
                                == if_tag.getAttribute("name")):
 
 
1305
                                annots.update(getattr(
 
 
1306
                                    prop, "_dbus_annotations", {}))
 
 
1307
                        for name, value in annots.items():
 
 
1308
                            ann_tag = document.createElement(
 
 
1310
                            ann_tag.setAttribute("name", name)
 
 
1311
                            ann_tag.setAttribute("value", value)
 
 
1312
                            tag.appendChild(ann_tag)
 
 
1313
                # Add interface annotation tags
 
 
1314
                for annotation, value in dict(
 
 
1315
                    itertools.chain.from_iterable(
 
 
1316
                        annotations().items()
 
 
1317
                        for name, annotations
 
 
1318
                        in self._get_all_dbus_things("interface")
 
 
1319
                        if name == if_tag.getAttribute("name")
 
 
1321
                    ann_tag = document.createElement("annotation")
 
 
1322
                    ann_tag.setAttribute("name", annotation)
 
 
1323
                    ann_tag.setAttribute("value", value)
 
 
1324
                    if_tag.appendChild(ann_tag)
 
 
1325
                # Fix argument name for the Introspect method itself
 
 
1326
                if (if_tag.getAttribute("name")
 
 
1327
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1328
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1329
                        if cn.getAttribute("name") == "Introspect":
 
 
1330
                            for arg in cn.getElementsByTagName("arg"):
 
 
1331
                                if (arg.getAttribute("direction")
 
 
1333
                                    arg.setAttribute("name",
 
 
1335
            xmlstring = document.toxml("utf-8")
 
 
1337
        except (AttributeError, xml.dom.DOMException,
 
 
1338
                xml.parsers.expat.ExpatError) as error:
 
 
1339
            logger.error("Failed to override Introspection method",
 
 
1344
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
 
1345
    """A D-Bus object with properties.
 
 
1347
    Classes inheriting from this can use the dbus_service_property
 
 
1348
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
1349
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
899
1352
    def _get_dbus_property(self, interface_name, property_name):
 
900
1353
        """Returns a bound method if one exists which is a D-Bus
 
901
1354
        property with the specified name and interface.
 
903
 
        for cls in  self.__class__.__mro__:
 
904
 
            for name, value in (inspect.getmembers
 
906
 
                                 self._is_dbus_thing("property"))):
 
 
1356
        for cls in self.__class__.__mro__:
 
 
1357
            for name, value in inspect.getmembers(
 
 
1358
                    cls, self._is_dbus_thing("property")):
 
907
1359
                if (value._dbus_name == property_name
 
908
1360
                    and value._dbus_interface == interface_name):
 
909
1361
                    return value.__get__(self)
 
911
1363
        # No such property
 
912
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
913
 
                                   + interface_name + "."
 
916
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1364
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1365
            self.dbus_object_path, interface_name, property_name))
 
 
1368
    def _get_all_interface_names(cls):
 
 
1369
        """Get a sequence of all interfaces supported by an object"""
 
 
1370
        return (name for name in set(getattr(getattr(x, attr),
 
 
1371
                                             "_dbus_interface", None)
 
 
1372
                                     for x in (inspect.getmro(cls))
 
 
1374
                if name is not None)
 
 
1376
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
917
1378
                         out_signature="v")
 
918
1379
    def Get(self, interface_name, property_name):
 
919
1380
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
1051
1509
        return xmlstring
 
 
1513
    dbus.OBJECT_MANAGER_IFACE
 
 
1514
except AttributeError:
 
 
1515
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1518
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1519
    """A D-Bus object with an ObjectManager.
 
 
1521
    Classes inheriting from this exposes the standard
 
 
1522
    GetManagedObjects call and the InterfacesAdded and
 
 
1523
    InterfacesRemoved signals on the standard
 
 
1524
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1526
    Note: No signals are sent automatically; they must be sent
 
 
1529
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1530
                         out_signature="a{oa{sa{sv}}}")
 
 
1531
    def GetManagedObjects(self):
 
 
1532
        """This function must be overridden"""
 
 
1533
        raise NotImplementedError()
 
 
1535
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1536
                         signature="oa{sa{sv}}")
 
 
1537
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1540
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1541
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1544
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1546
                         path_keyword='object_path',
 
 
1547
                         connection_keyword='connection')
 
 
1548
    def Introspect(self, object_path, connection):
 
 
1549
        """Overloading of standard D-Bus method.
 
 
1551
        Override return argument name of GetManagedObjects to be
 
 
1552
        "objpath_interfaces_and_properties"
 
 
1554
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1558
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1560
            for if_tag in document.getElementsByTagName("interface"):
 
 
1561
                # Fix argument name for the GetManagedObjects method
 
 
1562
                if (if_tag.getAttribute("name")
 
 
1563
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1564
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1565
                        if (cn.getAttribute("name")
 
 
1566
                            == "GetManagedObjects"):
 
 
1567
                            for arg in cn.getElementsByTagName("arg"):
 
 
1568
                                if (arg.getAttribute("direction")
 
 
1572
                                        "objpath_interfaces"
 
 
1574
            xmlstring = document.toxml("utf-8")
 
 
1576
        except (AttributeError, xml.dom.DOMException,
 
 
1577
                xml.parsers.expat.ExpatError) as error:
 
 
1578
            logger.error("Failed to override Introspection method",
 
1054
1583
def datetime_to_dbus(dt, variant_level=0):
 
1055
1584
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1057
 
        return dbus.String("", variant_level = variant_level)
 
1058
 
    return dbus.String(dt.isoformat(),
 
1059
 
                       variant_level=variant_level)
 
 
1586
        return dbus.String("", variant_level=variant_level)
 
 
1587
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1062
1590
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1411
1951
        server to mandos-client
 
1415
1955
    # Rejected - signal
 
1416
1956
    @dbus.service.signal(_interface, signature="s")
 
1417
1957
    def Rejected(self, reason):
 
1421
1961
    # NeedApproval - signal
 
1422
1962
    @dbus.service.signal(_interface, signature="tb")
 
1423
1963
    def NeedApproval(self, timeout, default):
 
1425
1965
        return self.need_approval()
 
1429
1969
    # Approve - method
 
1430
1970
    @dbus.service.method(_interface, in_signature="b")
 
1431
1971
    def Approve(self, value):
 
1432
1972
        self.approve(value)
 
1434
1974
    # CheckedOK - method
 
1435
1975
    @dbus.service.method(_interface)
 
1436
1976
    def CheckedOK(self):
 
1437
1977
        self.checked_ok()
 
1439
1979
    # Enable - method
 
 
1980
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1440
1981
    @dbus.service.method(_interface)
 
1441
1982
    def Enable(self):
 
1445
1986
    # StartChecker - method
 
 
1987
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1446
1988
    @dbus.service.method(_interface)
 
1447
1989
    def StartChecker(self):
 
1449
1991
        self.start_checker()
 
1451
1993
    # Disable - method
 
 
1994
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1452
1995
    @dbus.service.method(_interface)
 
1453
1996
    def Disable(self):
 
1457
2000
    # StopChecker - method
 
 
2001
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1458
2002
    @dbus.service.method(_interface)
 
1459
2003
    def StopChecker(self):
 
1460
2004
        self.stop_checker()
 
1464
2008
    # ApprovalPending - property
 
1465
2009
    @dbus_service_property(_interface, signature="b", access="read")
 
1466
2010
    def ApprovalPending_dbus_property(self):
 
1467
2011
        return dbus.Boolean(bool(self.approvals_pending))
 
1469
2013
    # ApprovedByDefault - property
 
1470
 
    @dbus_service_property(_interface, signature="b",
 
 
2014
    @dbus_service_property(_interface,
 
1471
2016
                           access="readwrite")
 
1472
2017
    def ApprovedByDefault_dbus_property(self, value=None):
 
1473
2018
        if value is None:       # get
 
1474
2019
            return dbus.Boolean(self.approved_by_default)
 
1475
2020
        self.approved_by_default = bool(value)
 
1477
2022
    # ApprovalDelay - property
 
1478
 
    @dbus_service_property(_interface, signature="t",
 
 
2023
    @dbus_service_property(_interface,
 
1479
2025
                           access="readwrite")
 
1480
2026
    def ApprovalDelay_dbus_property(self, value=None):
 
1481
2027
        if value is None:       # get
 
1482
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2028
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1483
2030
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1485
2032
    # ApprovalDuration - property
 
1486
 
    @dbus_service_property(_interface, signature="t",
 
 
2033
    @dbus_service_property(_interface,
 
1487
2035
                           access="readwrite")
 
1488
2036
    def ApprovalDuration_dbus_property(self, value=None):
 
1489
2037
        if value is None:       # get
 
1490
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1491
 
                    self.approval_duration))
 
 
2038
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1492
2040
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1494
2042
    # Name - property
 
 
2044
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1495
2045
    @dbus_service_property(_interface, signature="s", access="read")
 
1496
2046
    def Name_dbus_property(self):
 
1497
2047
        return dbus.String(self.name)
 
 
2051
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2052
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2053
    def KeyID_dbus_property(self):
 
 
2054
        return dbus.String(self.key_id)
 
1499
2056
    # Fingerprint - property
 
 
2058
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1500
2059
    @dbus_service_property(_interface, signature="s", access="read")
 
1501
2060
    def Fingerprint_dbus_property(self):
 
1502
2061
        return dbus.String(self.fingerprint)
 
1504
2063
    # Host - property
 
1505
 
    @dbus_service_property(_interface, signature="s",
 
 
2064
    @dbus_service_property(_interface,
 
1506
2066
                           access="readwrite")
 
1507
2067
    def Host_dbus_property(self, value=None):
 
1508
2068
        if value is None:       # get
 
1509
2069
            return dbus.String(self.host)
 
1510
 
        self.host = unicode(value)
 
 
2070
        self.host = str(value)
 
1512
2072
    # Created - property
 
 
2074
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1513
2075
    @dbus_service_property(_interface, signature="s", access="read")
 
1514
2076
    def Created_dbus_property(self):
 
1515
2077
        return datetime_to_dbus(self.created)
 
1517
2079
    # LastEnabled - property
 
1518
2080
    @dbus_service_property(_interface, signature="s", access="read")
 
1519
2081
    def LastEnabled_dbus_property(self):
 
1520
2082
        return datetime_to_dbus(self.last_enabled)
 
1522
2084
    # Enabled - property
 
1523
 
    @dbus_service_property(_interface, signature="b",
 
 
2085
    @dbus_service_property(_interface,
 
1524
2087
                           access="readwrite")
 
1525
2088
    def Enabled_dbus_property(self, value=None):
 
1526
2089
        if value is None:       # get
 
 
1574
2138
                if (getattr(self, "disable_initiator_tag", None)
 
1577
 
                gobject.source_remove(self.disable_initiator_tag)
 
1578
 
                self.disable_initiator_tag = (
 
1579
 
                    gobject.timeout_add(
 
1580
 
                        timedelta_to_milliseconds(self.expires - now),
 
 
2141
                GLib.source_remove(self.disable_initiator_tag)
 
 
2142
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2143
                    int((self.expires - now).total_seconds() * 1000),
 
1583
2146
    # ExtendedTimeout - property
 
1584
 
    @dbus_service_property(_interface, signature="t",
 
 
2147
    @dbus_service_property(_interface,
 
1585
2149
                           access="readwrite")
 
1586
2150
    def ExtendedTimeout_dbus_property(self, value=None):
 
1587
2151
        if value is None:       # get
 
1588
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2152
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1589
2154
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1591
2156
    # Interval - property
 
1592
 
    @dbus_service_property(_interface, signature="t",
 
 
2157
    @dbus_service_property(_interface,
 
1593
2159
                           access="readwrite")
 
1594
2160
    def Interval_dbus_property(self, value=None):
 
1595
2161
        if value is None:       # get
 
1596
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2162
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1597
2163
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1598
2164
        if getattr(self, "checker_initiator_tag", None) is None:
 
1600
2166
        if self.enabled:
 
1601
2167
            # Reschedule checker run
 
1602
 
            gobject.source_remove(self.checker_initiator_tag)
 
1603
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1604
 
                                          (value, self.start_checker))
 
1605
 
            self.start_checker()    # Start one now, too
 
 
2168
            GLib.source_remove(self.checker_initiator_tag)
 
 
2169
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2170
                value, self.start_checker)
 
 
2171
            self.start_checker()  # Start one now, too
 
1607
2173
    # Checker - property
 
1608
 
    @dbus_service_property(_interface, signature="s",
 
 
2174
    @dbus_service_property(_interface,
 
1609
2176
                           access="readwrite")
 
1610
2177
    def Checker_dbus_property(self, value=None):
 
1611
2178
        if value is None:       # get
 
1612
2179
            return dbus.String(self.checker_command)
 
1613
 
        self.checker_command = unicode(value)
 
 
2180
        self.checker_command = str(value)
 
1615
2182
    # CheckerRunning - property
 
1616
 
    @dbus_service_property(_interface, signature="b",
 
 
2183
    @dbus_service_property(_interface,
 
1617
2185
                           access="readwrite")
 
1618
2186
    def CheckerRunning_dbus_property(self, value=None):
 
1619
2187
        if value is None:       # get
 
 
1792
2371
                        delay -= time2 - time
 
1795
 
                while sent_size < len(client.secret):
 
1797
 
                        sent = session.send(client.secret[sent_size:])
 
1798
 
                    except gnutls.errors.GNUTLSError as error:
 
1799
 
                        logger.warning("gnutls send failed",
 
1802
 
                    logger.debug("Sent: %d, remaining: %d",
 
1803
 
                                 sent, len(client.secret)
 
1804
 
                                 - (sent_size + sent))
 
 
2374
                    session.send(client.secret)
 
 
2375
                except gnutls.Error as error:
 
 
2376
                    logger.warning("gnutls send failed",
 
1807
2380
                logger.info("Sending secret to %s", client.name)
 
1808
2381
                # bump the timeout using extended_timeout
 
1809
2382
                client.bump_timeout(client.extended_timeout)
 
1810
2383
                if self.server.use_dbus:
 
1811
2384
                    # Emit D-Bus signal
 
1812
2385
                    client.GotSecret()
 
1815
2388
                if approval_required:
 
1816
2389
                    client.approvals_pending -= 1
 
1819
 
                except gnutls.errors.GNUTLSError as error:
 
 
2392
                except gnutls.Error as error:
 
1820
2393
                    logger.warning("GnuTLS bye failed",
 
1821
2394
                                   exc_info=error)
 
1824
2397
    def peer_certificate(session):
 
1825
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1826
 
        # If not an OpenPGP certificate...
 
1827
 
        if (gnutls.library.functions
 
1828
 
            .gnutls_certificate_type_get(session._c_object)
 
1829
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1830
 
            # ...do the normal thing
 
1831
 
            return session.peer_certificate
 
 
2398
        "Return the peer's certificate as a bytestring"
 
 
2400
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2402
        except AttributeError:
 
 
2403
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2404
        if gnutls.has_rawpk:
 
 
2405
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2407
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2408
        # If not a valid certificate type...
 
 
2409
        if cert_type not in valid_cert_types:
 
 
2410
            logger.info("Cert type %r not in %r", cert_type,
 
 
2412
            # ...return invalid data
 
1832
2414
        list_size = ctypes.c_uint(1)
 
1833
 
        cert_list = (gnutls.library.functions
 
1834
 
                     .gnutls_certificate_get_peers
 
 
2415
        cert_list = (gnutls.certificate_get_peers
 
1835
2416
                     (session._c_object, ctypes.byref(list_size)))
 
1836
2417
        if not bool(cert_list) and list_size.value != 0:
 
1837
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2418
            raise gnutls.Error("error getting peer certificate")
 
1839
2419
        if list_size.value == 0:
 
1841
2421
        cert = cert_list[0]
 
1842
2422
        return ctypes.string_at(cert.data, cert.size)
 
 
2425
    def key_id(certificate):
 
 
2426
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2427
        # New GnuTLS "datum" with the public key
 
 
2428
        datum = gnutls.datum_t(
 
 
2429
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2430
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2431
            ctypes.c_uint(len(certificate)))
 
 
2432
        # XXX all these need to be created in the gnutls "module"
 
 
2433
        # New empty GnuTLS certificate
 
 
2434
        pubkey = gnutls.pubkey_t()
 
 
2435
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2436
        # Import the raw public key into the certificate
 
 
2437
        gnutls.pubkey_import(pubkey,
 
 
2438
                             ctypes.byref(datum),
 
 
2439
                             gnutls.X509_FMT_DER)
 
 
2440
        # New buffer for the key ID
 
 
2441
        buf = ctypes.create_string_buffer(32)
 
 
2442
        buf_len = ctypes.c_size_t(len(buf))
 
 
2443
        # Get the key ID from the raw public key into the buffer
 
 
2444
        gnutls.pubkey_get_key_id(pubkey,
 
 
2445
                                 gnutls.KEYID_USE_SHA256,
 
 
2446
                                 ctypes.cast(ctypes.byref(buf),
 
 
2447
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2448
                                 ctypes.byref(buf_len))
 
 
2449
        # Deinit the certificate
 
 
2450
        gnutls.pubkey_deinit(pubkey)
 
 
2452
        # Convert the buffer to a Python bytestring
 
 
2453
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2454
        # Convert the bytestring to hexadecimal notation
 
 
2455
        hex_key_id = binascii.hexlify(key_id).upper()
 
1845
2459
    def fingerprint(openpgp):
 
1846
2460
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1847
2461
        # New GnuTLS "datum" with the OpenPGP public key
 
1848
 
        datum = (gnutls.library.types
 
1849
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1852
 
                                 ctypes.c_uint(len(openpgp))))
 
 
2462
        datum = gnutls.datum_t(
 
 
2463
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2464
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2465
            ctypes.c_uint(len(openpgp)))
 
1853
2466
        # New empty GnuTLS certificate
 
1854
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1855
 
        (gnutls.library.functions
 
1856
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2467
        crt = gnutls.openpgp_crt_t()
 
 
2468
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1857
2469
        # Import the OpenPGP public key into the certificate
 
1858
 
        (gnutls.library.functions
 
1859
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1860
 
                                    gnutls.library.constants
 
1861
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2470
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2471
                                  gnutls.OPENPGP_FMT_RAW)
 
1862
2472
        # Verify the self signature in the key
 
1863
2473
        crtverify = ctypes.c_uint()
 
1864
 
        (gnutls.library.functions
 
1865
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1866
 
                                         ctypes.byref(crtverify)))
 
 
2474
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2475
                                       ctypes.byref(crtverify))
 
1867
2476
        if crtverify.value != 0:
 
1868
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1869
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2477
            gnutls.openpgp_crt_deinit(crt)
 
 
2478
            raise gnutls.CertificateSecurityError(code
 
1871
2480
        # New buffer for the fingerprint
 
1872
2481
        buf = ctypes.create_string_buffer(20)
 
1873
2482
        buf_len = ctypes.c_size_t()
 
1874
2483
        # Get the fingerprint from the certificate into the buffer
 
1875
 
        (gnutls.library.functions
 
1876
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1877
 
                                             ctypes.byref(buf_len)))
 
 
2484
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2485
                                           ctypes.byref(buf_len))
 
1878
2486
        # Deinit the certificate
 
1879
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2487
        gnutls.openpgp_crt_deinit(crt)
 
1880
2488
        # Convert the buffer to a Python bytestring
 
1881
2489
        fpr = ctypes.string_at(buf, buf_len.value)
 
1882
2490
        # Convert the bytestring to hexadecimal notation
 
 
1965
2579
        # socket_wrapper(), if socketfd was set.
 
1966
2580
        socketserver.TCPServer.__init__(self, server_address,
 
1967
2581
                                        RequestHandlerClass)
 
1969
2583
    def server_bind(self):
 
1970
2584
        """This overrides the normal server_bind() function
 
1971
2585
        to bind to an interface if one was specified, and also NOT to
 
1972
2586
        bind to an address or port if they were not specified."""
 
 
2587
        global SO_BINDTODEVICE
 
1973
2588
        if self.interface is not None:
 
1974
2589
            if SO_BINDTODEVICE is None:
 
1975
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1976
 
                             " cannot bind to interface %s",
 
1980
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1982
 
                                           str(self.interface + '\0'))
 
1983
 
                except socket.error as error:
 
1984
 
                    if error.errno == errno.EPERM:
 
1985
 
                        logger.error("No permission to bind to"
 
1986
 
                                     " interface %s", self.interface)
 
1987
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1988
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1989
 
                                     " cannot bind to interface %s",
 
1991
 
                    elif error.errno == errno.ENODEV:
 
1992
 
                        logger.error("Interface %s does not exist,"
 
1993
 
                                     " cannot bind", self.interface)
 
 
2590
                # Fall back to a hard-coded value which seems to be
 
 
2592
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2593
                SO_BINDTODEVICE = 25
 
 
2595
                self.socket.setsockopt(
 
 
2596
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2597
                    (self.interface + "\0").encode("utf-8"))
 
 
2598
            except socket.error as error:
 
 
2599
                if error.errno == errno.EPERM:
 
 
2600
                    logger.error("No permission to bind to"
 
 
2601
                                 " interface %s", self.interface)
 
 
2602
                elif error.errno == errno.ENOPROTOOPT:
 
 
2603
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2604
                                 " cannot bind to interface %s",
 
 
2606
                elif error.errno == errno.ENODEV:
 
 
2607
                    logger.error("Interface %s does not exist,"
 
 
2608
                                 " cannot bind", self.interface)
 
1996
2611
        # Only bind(2) the socket if we really need to.
 
1997
2612
        if self.server_address[0] or self.server_address[1]:
 
 
2613
            if self.server_address[1]:
 
 
2614
                self.allow_reuse_address = True
 
1998
2615
            if not self.server_address[0]:
 
1999
2616
                if self.address_family == socket.AF_INET6:
 
2000
 
                    any_address = "::" # in6addr_any
 
 
2617
                    any_address = "::"  # in6addr_any
 
2002
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
 
2619
                    any_address = "0.0.0.0"  # INADDR_ANY
 
2003
2620
                self.server_address = (any_address,
 
2004
2621
                                       self.server_address[1])
 
2005
2622
            elif not self.server_address[1]:
 
2006
 
                self.server_address = (self.server_address[0],
 
 
2623
                self.server_address = (self.server_address[0], 0)
 
2008
2624
#                 if self.interface:
 
2009
2625
#                     self.server_address = (self.server_address[0],
 
 
2035
2656
        self.gnutls_priority = gnutls_priority
 
2036
2657
        IPv6_TCPServer.__init__(self, server_address,
 
2037
2658
                                RequestHandlerClass,
 
2038
 
                                interface = interface,
 
2039
 
                                use_ipv6 = use_ipv6,
 
2040
 
                                socketfd = socketfd)
 
 
2659
                                interface=interface,
 
2041
2663
    def server_activate(self):
 
2042
2664
        if self.enabled:
 
2043
2665
            return socketserver.TCPServer.server_activate(self)
 
2045
2667
    def enable(self):
 
2046
2668
        self.enabled = True
 
2048
2670
    def add_pipe(self, parent_pipe, proc):
 
2049
2671
        # Call "handle_ipc" for both data and EOF events
 
2050
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
2051
 
                             gobject.IO_IN | gobject.IO_HUP,
 
2052
 
                             functools.partial(self.handle_ipc,
 
2057
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2058
 
                   proc = None, client_object=None):
 
 
2673
            parent_pipe.fileno(),
 
 
2674
            GLib.IO_IN | GLib.IO_HUP,
 
 
2675
            functools.partial(self.handle_ipc,
 
 
2676
                              parent_pipe=parent_pipe,
 
 
2679
    def handle_ipc(self, source, condition,
 
 
2682
                   client_object=None):
 
2059
2683
        # error, or the other end of multiprocessing.Pipe has closed
 
2060
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
 
2684
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2061
2685
            # Wait for other process to exit
 
2065
2689
        # Read a request from the child
 
2066
2690
        request = parent_pipe.recv()
 
2067
2691
        command = request[0]
 
2069
2693
        if command == 'init':
 
2071
 
            address = request[2]
 
2073
 
            for c in self.clients.itervalues():
 
2074
 
                if c.fingerprint == fpr:
 
 
2694
            key_id = request[1].decode("ascii")
 
 
2695
            fpr = request[2].decode("ascii")
 
 
2696
            address = request[3]
 
 
2698
            for c in self.clients.values():
 
 
2699
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2701
                if key_id and c.key_id == key_id:
 
 
2704
                if fpr and c.fingerprint == fpr:
 
2078
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2079
 
                            "dress: %s", fpr, address)
 
 
2708
                logger.info("Client not found for key ID: %s, address"
 
 
2709
                            ": %s", key_id or fpr, address)
 
2080
2710
                if self.use_dbus:
 
2081
2711
                    # Emit D-Bus signal
 
2082
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2712
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
2084
2714
                parent_pipe.send(False)
 
2087
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
2088
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
2089
 
                                 functools.partial(self.handle_ipc,
 
 
2718
                parent_pipe.fileno(),
 
 
2719
                GLib.IO_IN | GLib.IO_HUP,
 
 
2720
                functools.partial(self.handle_ipc,
 
 
2721
                                  parent_pipe=parent_pipe,
 
 
2723
                                  client_object=client))
 
2095
2724
            parent_pipe.send(True)
 
2096
2725
            # remove the old hook in favor of the new above hook on
 
 
 
3131
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2484
3133
    except OSError as error:
 
 
3134
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3135
                       .format(uid, gid, os.strerror(error.errno)))
 
2485
3136
        if error.errno != errno.EPERM:
 
2489
3140
        # Enable all possible GnuTLS debugging
 
2491
3142
        # "Use a log level over 10 to enable all debugging options."
 
2492
3143
        # - GnuTLS manual
 
2493
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2495
 
        @gnutls.library.types.gnutls_log_func
 
 
3144
        gnutls.global_set_log_level(11)
 
2496
3147
        def debug_gnutls(level, string):
 
2497
3148
            logger.debug("GnuTLS: %s", string[:-1])
 
2499
 
        (gnutls.library.functions
 
2500
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3150
        gnutls.global_set_log_function(debug_gnutls)
 
2502
3152
        # Redirect stdin so all checkers get /dev/null
 
2503
3153
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2504
3154
        os.dup2(null, sys.stdin.fileno())
 
2508
3158
    # Need to fork before connecting to D-Bus
 
2509
3159
    if not foreground:
 
2510
3160
        # Close all input and output, do double fork, etc.
 
2513
 
    # multiprocessing will use threads, so before we use gobject we
 
2514
 
    # need to inform gobject that threads will be used.
 
2515
 
    gobject.threads_init()
 
 
3163
    if gi.version_info < (3, 10, 2):
 
 
3164
        # multiprocessing will use threads, so before we use GLib we
 
 
3165
        # need to inform GLib that threads will be used.
 
2517
3168
    global main_loop
 
2518
3169
    # From the Avahi example code
 
2519
3170
    DBusGMainLoop(set_as_default=True)
 
2520
 
    main_loop = gobject.MainLoop()
 
 
3171
    main_loop = GLib.MainLoop()
 
2521
3172
    bus = dbus.SystemBus()
 
2522
3173
    # End of Avahi example code
 
2525
3176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2526
 
                                            bus, do_not_queue=True)
 
2527
 
            old_bus_name = (dbus.service.BusName
 
2528
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2530
 
        except dbus.exceptions.NameExistsException as e:
 
 
3179
            old_bus_name = dbus.service.BusName(
 
 
3180
                "se.bsnet.fukt.Mandos", bus,
 
 
3182
        except dbus.exceptions.DBusException as e:
 
2531
3183
            logger.error("Disabling D-Bus:", exc_info=e)
 
2532
3184
            use_dbus = False
 
2533
3185
            server_settings["use_dbus"] = False
 
2534
3186
            tcp_server.use_dbus = False
 
2535
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2536
 
    service = AvahiServiceToSyslog(name =
 
2537
 
                                   server_settings["servicename"],
 
2538
 
                                   servicetype = "_mandos._tcp",
 
2539
 
                                   protocol = protocol, bus = bus)
 
2540
 
    if server_settings["interface"]:
 
2541
 
        service.interface = (if_nametoindex
 
2542
 
                             (str(server_settings["interface"])))
 
 
3188
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3189
        service = AvahiServiceToSyslog(
 
 
3190
            name=server_settings["servicename"],
 
 
3191
            servicetype="_mandos._tcp",
 
 
3194
        if server_settings["interface"]:
 
 
3195
            service.interface = if_nametoindex(
 
 
3196
                server_settings["interface"].encode("utf-8"))
 
2544
3198
    global multiprocessing_manager
 
2545
3199
    multiprocessing_manager = multiprocessing.Manager()
 
2547
3201
    client_class = Client
 
2549
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
3203
        client_class = functools.partial(ClientDBus, bus=bus)
 
2551
3205
    client_settings = Client.config_parser(client_config)
 
2552
3206
    old_client_settings = {}
 
2553
3207
    clients_data = {}
 
2555
3209
    # This is used to redirect stdout and stderr for checker processes
 
2557
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
 
3211
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
2558
3212
    # Only used if server is running in foreground but not in debug
 
2560
3214
    if debug or not foreground:
 
2563
3217
    # Get client data and settings from last running state.
 
2564
3218
    if server_settings["restore"]:
 
2566
3220
            with open(stored_state_path, "rb") as stored_state:
 
2567
 
                clients_data, old_client_settings = (pickle.load
 
 
3221
                if sys.version_info.major == 2:
 
 
3222
                    clients_data, old_client_settings = pickle.load(
 
 
3225
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3226
                        pickle.load(stored_state, encoding="bytes"))
 
 
3227
                    #   Fix bytes to strings
 
 
3230
                    clients_data = {(key.decode("utf-8")
 
 
3231
                                     if isinstance(key, bytes)
 
 
3234
                                    bytes_clients_data.items()}
 
 
3235
                    del bytes_clients_data
 
 
3236
                    for key in clients_data:
 
 
3237
                        value = {(k.decode("utf-8")
 
 
3238
                                  if isinstance(k, bytes) else k): v
 
 
3240
                                 clients_data[key].items()}
 
 
3241
                        clients_data[key] = value
 
 
3243
                        value["client_structure"] = [
 
 
3245
                             if isinstance(s, bytes)
 
 
3247
                            value["client_structure"]]
 
 
3249
                        for k in ("name", "host"):
 
 
3250
                            if isinstance(value[k], bytes):
 
 
3251
                                value[k] = value[k].decode("utf-8")
 
 
3252
                        if "key_id" not in value:
 
 
3253
                            value["key_id"] = ""
 
 
3254
                        elif "fingerprint" not in value:
 
 
3255
                            value["fingerprint"] = ""
 
 
3256
                    #  old_client_settings
 
 
3258
                    old_client_settings = {
 
 
3259
                        (key.decode("utf-8")
 
 
3260
                         if isinstance(key, bytes)
 
 
3263
                        bytes_old_client_settings.items()}
 
 
3264
                    del bytes_old_client_settings
 
 
3266
                    for value in old_client_settings.values():
 
 
3267
                        if isinstance(value["host"], bytes):
 
 
3268
                            value["host"] = (value["host"]
 
2569
3270
            os.remove(stored_state_path)
 
2570
3271
        except IOError as e:
 
2571
3272
            if e.errno == errno.ENOENT:
 
2572
 
                logger.warning("Could not load persistent state: {0}"
 
2573
 
                                .format(os.strerror(e.errno)))
 
 
3273
                logger.warning("Could not load persistent state:"
 
 
3274
                               " {}".format(os.strerror(e.errno)))
 
2575
3276
                logger.critical("Could not load persistent state:",
 
2578
3279
        except EOFError as e:
 
2579
3280
            logger.warning("Could not load persistent state: "
 
2580
 
                           "EOFError:", exc_info=e)
 
2582
3284
    with PGPEngine() as pgp:
 
2583
 
        for client_name, client in clients_data.iteritems():
 
 
3285
        for client_name, client in clients_data.items():
 
2584
3286
            # Skip removed clients
 
2585
3287
            if client_name not in client_settings:
 
2588
3290
            # Decide which value to use after restoring saved state.
 
2589
3291
            # We have three different values: Old config file,
 
2590
3292
            # new config file, and saved state.
 
 
2648
3350
    for client_name in (set(client_settings)
 
2649
3351
                        - set(old_client_settings)):
 
2650
3352
        clients_data[client_name] = client_settings[client_name]
 
2652
3354
    # Create all client objects
 
2653
 
    for client_name, client in clients_data.iteritems():
 
 
3355
    for client_name, client in clients_data.items():
 
2654
3356
        tcp_server.clients[client_name] = client_class(
 
2655
 
            name = client_name, settings = client,
 
2656
 
            server_settings = server_settings)
 
 
3359
            server_settings=server_settings)
 
2658
3361
    if not tcp_server.clients:
 
2659
3362
        logger.warning("No clients defined")
 
2661
3364
    if not foreground:
 
2662
3365
        if pidfile is not None:
 
2666
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
3369
                    print(pid, file=pidfile)
 
2667
3370
            except IOError:
 
2668
3371
                logger.error("Could not write to file %r with PID %d",
 
2669
3372
                             pidfilename, pid)
 
2671
3374
        del pidfilename
 
2673
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2674
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3376
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3377
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3378
                             lambda: main_loop.quit() and False)
 
2677
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2678
 
                                        "se.bsnet.fukt.Mandos"})
 
2679
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
3382
        @alternate_dbus_interfaces(
 
 
3383
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3384
        class MandosDBusService(DBusObjectWithObjectManager):
 
2680
3385
            """A D-Bus proxy object"""
 
2681
3387
            def __init__(self):
 
2682
3388
                dbus.service.Object.__init__(self, bus, "/")
 
2683
3390
            _interface = "se.recompile.Mandos"
 
2685
 
            @dbus_interface_annotations(_interface)
 
2687
 
                return { "org.freedesktop.DBus.Property"
 
2688
 
                         ".EmitsChangedSignal":
 
2691
3392
            @dbus.service.signal(_interface, signature="o")
 
2692
3393
            def ClientAdded(self, objpath):
 
2696
3397
            @dbus.service.signal(_interface, signature="ss")
 
2697
 
            def ClientNotFound(self, fingerprint, address):
 
 
3398
            def ClientNotFound(self, key_id, address):
 
 
3402
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2701
3404
            @dbus.service.signal(_interface, signature="os")
 
2702
3405
            def ClientRemoved(self, objpath, name):
 
 
3409
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2706
3411
            @dbus.service.method(_interface, out_signature="ao")
 
2707
3412
            def GetAllClients(self):
 
2709
 
                return dbus.Array(c.dbus_object_path
 
2711
 
                                  tcp_server.clients.itervalues())
 
 
3414
                return dbus.Array(c.dbus_object_path for c in
 
 
3415
                                  tcp_server.clients.values())
 
 
3417
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2713
3419
            @dbus.service.method(_interface,
 
2714
3420
                                 out_signature="a{oa{sv}}")
 
2715
3421
            def GetAllClientsWithProperties(self):
 
2717
3423
                return dbus.Dictionary(
 
2718
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2719
 
                     for c in tcp_server.clients.itervalues()),
 
 
3424
                    {c.dbus_object_path: c.GetAll(
 
 
3425
                        "se.recompile.Mandos.Client")
 
 
3426
                     for c in tcp_server.clients.values()},
 
2720
3427
                    signature="oa{sv}")
 
2722
3429
            @dbus.service.method(_interface, in_signature="o")
 
2723
3430
            def RemoveClient(self, object_path):
 
2725
 
                for c in tcp_server.clients.itervalues():
 
 
3432
                for c in tcp_server.clients.values():
 
2726
3433
                    if c.dbus_object_path == object_path:
 
2727
3434
                        del tcp_server.clients[c.name]
 
2728
3435
                        c.remove_from_connection()
 
2729
 
                        # Don't signal anything except ClientRemoved
 
 
3436
                        # Don't signal the disabling
 
2730
3437
                        c.disable(quiet=True)
 
2732
 
                        self.ClientRemoved(object_path, c.name)
 
 
3438
                        # Emit D-Bus signal for removal
 
 
3439
                        self.client_removed_signal(c)
 
2734
3441
                raise KeyError(object_path)
 
 
3445
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3446
                                 out_signature="a{oa{sa{sv}}}")
 
 
3447
            def GetManagedObjects(self):
 
 
3449
                return dbus.Dictionary(
 
 
3450
                    {client.dbus_object_path:
 
 
3452
                         {interface: client.GetAll(interface)
 
 
3454
                          client._get_all_interface_names()})
 
 
3455
                     for client in tcp_server.clients.values()})
 
 
3457
            def client_added_signal(self, client):
 
 
3458
                """Send the new standard signal and the old signal"""
 
 
3460
                    # New standard signal
 
 
3461
                    self.InterfacesAdded(
 
 
3462
                        client.dbus_object_path,
 
 
3464
                            {interface: client.GetAll(interface)
 
 
3466
                             client._get_all_interface_names()}))
 
 
3468
                    self.ClientAdded(client.dbus_object_path)
 
 
3470
            def client_removed_signal(self, client):
 
 
3471
                """Send the new standard signal and the old signal"""
 
 
3473
                    # New standard signal
 
 
3474
                    self.InterfacesRemoved(
 
 
3475
                        client.dbus_object_path,
 
 
3476
                        client._get_all_interface_names())
 
 
3478
                    self.ClientRemoved(client.dbus_object_path,
 
2738
3481
        mandos_dbus_service = MandosDBusService()
 
 
3483
    # Save modules to variables to exempt the modules from being
 
 
3484
    # unloaded before the function registered with atexit() is run.
 
 
3485
    mp = multiprocessing
 
2741
3489
        "Cleanup function; run on exit"
 
2744
 
        multiprocessing.active_children()
 
 
3493
        mp.active_children()
 
2746
3495
        if not (tcp_server.clients or client_settings):
 
2749
3498
        # Store client before exiting. Secrets are encrypted with key
 
2750
3499
        # based on what config file has. If config file is
 
2751
3500
        # removed/edited, old secret will thus be unrecovable.
 
2753
3502
        with PGPEngine() as pgp:
 
2754
 
            for client in tcp_server.clients.itervalues():
 
 
3503
            for client in tcp_server.clients.values():
 
2755
3504
                key = client_settings[client.name]["secret"]
 
2756
3505
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2758
3507
                client_dict = {}
 
2760
3509
                # A list of attributes that can not be pickled
 
2762
 
                exclude = set(("bus", "changedstate", "secret",
 
2763
 
                               "checker", "server_settings"))
 
2764
 
                for name, typ in (inspect.getmembers
 
2765
 
                                  (dbus.service.Object)):
 
 
3511
                exclude = {"bus", "changedstate", "secret",
 
 
3512
                           "checker", "server_settings"}
 
 
3513
                for name, typ in inspect.getmembers(dbus.service
 
2766
3515
                    exclude.add(name)
 
2768
3517
                client_dict["encrypted_secret"] = (client
 
2769
3518
                                                   .encrypted_secret)
 
2770
3519
                for attr in client.client_structure:
 
2771
3520
                    if attr not in exclude:
 
2772
3521
                        client_dict[attr] = getattr(client, attr)
 
2774
3523
                clients[client.name] = client_dict
 
2775
3524
                del client_settings[client.name]["secret"]
 
2778
 
            with (tempfile.NamedTemporaryFile
 
2779
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2780
 
                   dir=os.path.dirname(stored_state_path),
 
2781
 
                   delete=False)) as stored_state:
 
2782
 
                pickle.dump((clients, client_settings), stored_state)
 
2783
 
                tempname=stored_state.name
 
 
3527
            with tempfile.NamedTemporaryFile(
 
 
3531
                    dir=os.path.dirname(stored_state_path),
 
 
3532
                    delete=False) as stored_state:
 
 
3533
                pickle.dump((clients, client_settings), stored_state,
 
 
3535
                tempname = stored_state.name
 
2784
3536
            os.rename(tempname, stored_state_path)
 
2785
3537
        except (IOError, OSError) as e: