168
230
            os.rmdir(self.tempdir)
 
169
231
            self.tempdir = None
 
171
233
    def password_encode(self, password):
 
172
234
        # Passphrase can not be empty and can not contain newlines or
 
173
235
        # NUL bytes.  So we prefix it and hex encode it.
 
174
 
        return b"mandos" + binascii.hexlify(password)
 
 
236
        encoded = b"mandos" + binascii.hexlify(password)
 
 
237
        if len(encoded) > 2048:
 
 
238
            # GnuPG can't handle long passwords, so encode differently
 
 
239
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
240
                       .replace(b"\n", b"\\n")
 
 
241
                       .replace(b"\0", b"\\x00"))
 
176
244
    def encrypt(self, data, password):
 
177
 
        self.gnupg.passphrase = self.password_encode(password)
 
178
 
        with open(os.devnull) as devnull:
 
180
 
                proc = self.gnupg.run(['--symmetric'],
 
181
 
                                      create_fhs=['stdin', 'stdout'],
 
182
 
                                      attach_fhs={'stderr': devnull})
 
183
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
185
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
 
                    ciphertext = f.read()
 
190
 
        self.gnupg.passphrase = None
 
 
245
        passphrase = self.password_encode(password)
 
 
246
        with tempfile.NamedTemporaryFile(
 
 
247
                dir=self.tempdir) as passfile:
 
 
248
            passfile.write(passphrase)
 
 
250
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
254
                                    stdin=subprocess.PIPE,
 
 
255
                                    stdout=subprocess.PIPE,
 
 
256
                                    stderr=subprocess.PIPE)
 
 
257
            ciphertext, err = proc.communicate(input=data)
 
 
258
        if proc.returncode != 0:
 
191
260
        return ciphertext
 
193
262
    def decrypt(self, data, password):
 
194
 
        self.gnupg.passphrase = self.password_encode(password)
 
195
 
        with open(os.devnull) as devnull:
 
197
 
                proc = self.gnupg.run(['--decrypt'],
 
198
 
                                      create_fhs=['stdin', 'stdout'],
 
199
 
                                      attach_fhs={'stderr': devnull})
 
200
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
202
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
 
                    decrypted_plaintext = f.read()
 
207
 
        self.gnupg.passphrase = None
 
 
263
        passphrase = self.password_encode(password)
 
 
264
        with tempfile.NamedTemporaryFile(
 
 
265
                dir=self.tempdir) as passfile:
 
 
266
            passfile.write(passphrase)
 
 
268
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
272
                                    stdin=subprocess.PIPE,
 
 
273
                                    stdout=subprocess.PIPE,
 
 
274
                                    stderr=subprocess.PIPE)
 
 
275
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
276
        if proc.returncode != 0:
 
208
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
 
212
307
class AvahiError(Exception):
 
213
308
    def __init__(self, value, *args, **kwargs):
 
214
309
        self.value = value
 
215
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
216
 
    def __unicode__(self):
 
217
 
        return unicode(repr(self.value))
 
 
310
        return super(AvahiError, self).__init__(value, *args,
 
219
314
class AvahiServiceError(AvahiError):
 
222
318
class AvahiGroupError(AvahiError):
 
226
322
class AvahiService(object):
 
227
323
    """An Avahi (Zeroconf) service.
 
230
326
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
231
327
               Used to optionally bind to the specified interface.
 
232
328
    name: string; Example: 'Mandos'
 
233
329
    type: string; Example: '_mandos._tcp'.
 
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
330
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
235
331
    port: integer; what port to announce
 
236
332
    TXT: list of strings; TXT record for the service
 
237
333
    domain: string; Domain to publish on, default to .local if empty.
 
 
366
492
                                    follow_name_owner_changes=True),
 
367
493
                avahi.DBUS_INTERFACE_SERVER)
 
368
494
        self.server.connect_to_signal("StateChanged",
 
369
 
                                 self.server_state_changed)
 
 
495
                                      self.server_state_changed)
 
370
496
        self.server_state_changed(self.server.GetState())
 
372
499
class AvahiServiceToSyslog(AvahiService):
 
 
500
    def rename(self, *args, **kwargs):
 
374
501
        """Add the new name to the syslog messages"""
 
375
 
        ret = AvahiService.rename(self)
 
376
 
        syslogger.setFormatter(logging.Formatter
 
377
 
                               ('Mandos (%s) [%%(process)d]:'
 
378
 
                                ' %%(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'
 
382
 
def timedelta_to_milliseconds(td):
 
383
 
    "Convert a datetime.timedelta() to milliseconds"
 
384
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
 
            + (td.seconds * 1000)
 
386
 
            + (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))
 
388
821
class Client(object):
 
389
822
    """A representation of a client host served by this server.
 
392
825
    approved:   bool(); 'None' if not yet approved/disapproved
 
393
826
    approval_delay: datetime.timedelta(); Time to wait for approval
 
394
827
    approval_duration: datetime.timedelta(); Duration of one approval
 
395
 
    checker:    subprocess.Popen(); a running checker process used
 
396
 
                                    to see if the client lives.
 
397
 
                                    'None' if no process is running.
 
398
 
    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
 
399
832
    checker_command: string; External command which is run to check
 
400
833
                     if client lives.  %() expansions are done at
 
401
834
                     runtime with vars(self) as dict, so that for
 
402
835
                     instance %(name)s can be used in the command.
 
403
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
836
    checker_initiator_tag: a GLib event source tag, or None
 
404
837
    created:    datetime.datetime(); (UTC) object creation
 
405
838
    client_structure: Object describing what attributes a client has
 
406
839
                      and is used for storing the client at exit
 
407
840
    current_checker_command: string; current running checker_command
 
408
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
841
    disable_initiator_tag: a GLib event source tag, or None
 
410
843
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
411
 
                 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
 
412
847
    host:       string; available for use by the checker command
 
413
848
    interval:   datetime.timedelta(); How often to start a new checker
 
414
849
    last_approval_request: datetime.datetime(); (UTC) or None
 
415
850
    last_checked_ok: datetime.datetime(); (UTC) or None
 
416
851
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
852
                         status of last checker. -1 reflects crashed
 
 
853
                         checker, -2 means no checker completed yet.
 
 
854
    last_checker_signal: The signal which killed the last checker, if
 
 
855
                         last_checker_status is -1
 
419
856
    last_enabled: datetime.datetime(); (UTC) or None
 
420
857
    name:       string; from the config file, used in log messages and
 
421
858
                        D-Bus identifiers
 
422
859
    secret:     bytestring; sent verbatim (over TLS) to client
 
423
860
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
424
861
                                      until this client is disabled
 
425
 
    extended_timeout:   extra long timeout when password has been sent
 
 
862
    extended_timeout:   extra long timeout when secret has been sent
 
426
863
    runtime_expansions: Allowed attributes for runtime expansion.
 
427
864
    expires:    datetime.datetime(); time (UTC) when a client will be
 
428
865
                disabled, or None
 
 
866
    server_settings: The server_settings dict from main()
 
431
869
    runtime_expansions = ("approval_delay", "approval_duration",
 
432
 
                          "created", "enabled", "fingerprint",
 
433
 
                          "host", "interval", "last_checked_ok",
 
 
870
                          "created", "enabled", "expires", "key_id",
 
 
871
                          "fingerprint", "host", "interval",
 
 
872
                          "last_approval_request", "last_checked_ok",
 
434
873
                          "last_enabled", "name", "timeout")
 
435
 
    client_defaults = { "timeout": "5m",
 
436
 
                        "extended_timeout": "15m",
 
438
 
                        "checker": "fping -q -- %%(host)s",
 
440
 
                        "approval_delay": "0s",
 
441
 
                        "approval_duration": "1s",
 
442
 
                        "approved_by_default": "True",
 
446
 
    def timeout_milliseconds(self):
 
447
 
        "Return the 'timeout' attribute in milliseconds"
 
448
 
        return timedelta_to_milliseconds(self.timeout)
 
450
 
    def extended_timeout_milliseconds(self):
 
451
 
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
454
 
    def interval_milliseconds(self):
 
455
 
        "Return the 'interval' attribute in milliseconds"
 
456
 
        return timedelta_to_milliseconds(self.interval)
 
458
 
    def approval_delay_milliseconds(self):
 
459
 
        return timedelta_to_milliseconds(self.approval_delay)
 
 
876
        "extended_timeout": "PT15M",
 
 
878
        "checker": "fping -q -- %%(host)s",
 
 
880
        "approval_delay": "PT0S",
 
 
881
        "approval_duration": "PT1S",
 
 
882
        "approved_by_default": "True",
 
462
887
    def config_parser(config):
 
 
541
970
        self.current_checker_command = None
 
542
971
        self.approved = None
 
543
972
        self.approvals_pending = 0
 
544
 
        self.changedstate = (multiprocessing_manager
 
545
 
                             .Condition(multiprocessing_manager
 
547
 
        self.client_structure = [attr for attr in
 
548
 
                                 self.__dict__.iterkeys()
 
 
973
        self.changedstate = multiprocessing_manager.Condition(
 
 
974
            multiprocessing_manager.Lock())
 
 
975
        self.client_structure = [attr
 
 
976
                                 for attr in self.__dict__.keys()
 
549
977
                                 if not attr.startswith("_")]
 
550
978
        self.client_structure.append("client_structure")
 
552
 
        for name, t in inspect.getmembers(type(self),
 
 
980
        for name, t in inspect.getmembers(
 
 
981
                type(self), lambda obj: isinstance(obj, property)):
 
556
982
            if not name.startswith("_"):
 
557
983
                self.client_structure.append(name)
 
559
985
    # Send notice to process children that client state has changed
 
560
986
    def send_changedstate(self):
 
561
987
        with self.changedstate:
 
562
988
            self.changedstate.notify_all()
 
564
990
    def enable(self):
 
565
991
        """Start this client's checker and timeout hooks"""
 
566
992
        if getattr(self, "enabled", False):
 
567
993
            # Already enabled
 
569
 
        self.send_changedstate()
 
570
995
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
996
        self.enabled = True
 
572
997
        self.last_enabled = datetime.datetime.utcnow()
 
573
998
        self.init_checker()
 
 
999
        self.send_changedstate()
 
575
1001
    def disable(self, quiet=True):
 
576
1002
        """Disable this client."""
 
577
1003
        if not getattr(self, "enabled", False):
 
580
 
            self.send_changedstate()
 
582
1006
            logger.info("Disabling client %s", self.name)
 
583
 
        if getattr(self, "disable_initiator_tag", False):
 
584
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1007
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
1008
            GLib.source_remove(self.disable_initiator_tag)
 
585
1009
            self.disable_initiator_tag = None
 
586
1010
        self.expires = None
 
587
 
        if getattr(self, "checker_initiator_tag", False):
 
588
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1011
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
1012
            GLib.source_remove(self.checker_initiator_tag)
 
589
1013
            self.checker_initiator_tag = None
 
590
1014
        self.stop_checker()
 
591
1015
        self.enabled = False
 
592
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1017
            self.send_changedstate()
 
 
1018
        # Do not run this again if called by a GLib.timeout_add
 
595
1021
    def __del__(self):
 
598
1024
    def init_checker(self):
 
599
1025
        # Schedule a new checker to be started an 'interval' from now,
 
600
1026
        # and every interval from then on.
 
601
 
        self.checker_initiator_tag = (gobject.timeout_add
 
602
 
                                      (self.interval_milliseconds(),
 
 
1027
        if self.checker_initiator_tag is not None:
 
 
1028
            GLib.source_remove(self.checker_initiator_tag)
 
 
1029
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1030
            int(self.interval.total_seconds() * 1000),
 
604
1032
        # Schedule a disable() when 'timeout' has passed
 
605
 
        self.disable_initiator_tag = (gobject.timeout_add
 
606
 
                                   (self.timeout_milliseconds(),
 
 
1033
        if self.disable_initiator_tag is not None:
 
 
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)
 
608
1037
        # Also start a new checker *right now*.
 
609
1038
        self.start_checker()
 
611
 
    def checker_callback(self, pid, condition, command):
 
 
1040
    def checker_callback(self, source, condition, connection,
 
612
1042
        """The checker has completed, so take appropriate actions."""
 
 
1043
        # Read return code from connection (see call_pipe)
 
 
1044
        returncode = connection.recv()
 
613
1047
        self.checker_callback_tag = None
 
614
1048
        self.checker = None
 
615
 
        if os.WIFEXITED(condition):
 
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1051
            self.last_checker_status = returncode
 
 
1052
            self.last_checker_signal = None
 
617
1053
            if self.last_checker_status == 0:
 
618
1054
                logger.info("Checker for %(name)s succeeded",
 
620
1056
                self.checked_ok()
 
622
 
                logger.info("Checker for %(name)s failed",
 
 
1058
                logger.info("Checker for %(name)s failed", vars(self))
 
625
1060
            self.last_checker_status = -1
 
 
1061
            self.last_checker_signal = -returncode
 
626
1062
            logger.warning("Checker for %(name)s crashed?",
 
629
 
    def checked_ok(self, timeout=None):
 
630
 
        """Bump up the timeout for this client.
 
632
 
        This should only be called when the client has been seen,
 
 
1066
    def checked_ok(self):
 
 
1067
        """Assert that the client has been seen, alive and well."""
 
 
1068
        self.last_checked_ok = datetime.datetime.utcnow()
 
 
1069
        self.last_checker_status = 0
 
 
1070
        self.last_checker_signal = None
 
 
1073
    def bump_timeout(self, timeout=None):
 
 
1074
        """Bump up the timeout for this client."""
 
635
1075
        if timeout is None:
 
636
1076
            timeout = self.timeout
 
637
 
        self.last_checked_ok = datetime.datetime.utcnow()
 
638
1077
        if self.disable_initiator_tag is not None:
 
639
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1078
            GLib.source_remove(self.disable_initiator_tag)
 
 
1079
            self.disable_initiator_tag = None
 
640
1080
        if getattr(self, "enabled", False):
 
641
 
            self.disable_initiator_tag = (gobject.timeout_add
 
642
 
                                          (timedelta_to_milliseconds
 
643
 
                                           (timeout), self.disable))
 
 
1081
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1082
                int(timeout.total_seconds() * 1000), self.disable)
 
644
1083
            self.expires = datetime.datetime.utcnow() + timeout
 
646
1085
    def need_approval(self):
 
647
1086
        self.last_approval_request = datetime.datetime.utcnow()
 
649
1088
    def start_checker(self):
 
650
1089
        """Start a new checker subprocess if one is not running.
 
652
1091
        If a checker already exists, leave it running and do
 
654
1093
        # The reason for not killing a running checker is that if we
 
655
 
        # did that, then if a checker (for some reason) started
 
656
 
        # running slowly and taking more than 'interval' time, the
 
657
 
        # client would inevitably timeout, since no checker would get
 
658
 
        # a chance to run to completion.  If we instead leave running
 
 
1094
        # did that, and if a checker (for some reason) started running
 
 
1095
        # slowly and taking more than 'interval' time, then the client
 
 
1096
        # would inevitably timeout, since no checker would get a
 
 
1097
        # chance to run to completion.  If we instead leave running
 
659
1098
        # checkers alone, the checker would have to take more time
 
660
1099
        # than 'timeout' for the client to be disabled, which is as it
 
663
 
        # If a checker exists, make sure it is not a zombie
 
665
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
666
 
        except (AttributeError, OSError) as error:
 
667
 
            if (isinstance(error, OSError)
 
668
 
                and error.errno != errno.ECHILD):
 
672
 
                logger.warning("Checker was a zombie")
 
673
 
                gobject.source_remove(self.checker_callback_tag)
 
674
 
                self.checker_callback(pid, status,
 
675
 
                                      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")
 
676
1106
        # Start a new checker if needed
 
677
1107
        if self.checker is None:
 
 
1108
            # Escape attributes for the shell
 
 
1110
                attr: re.escape(str(getattr(self, attr)))
 
 
1111
                for attr in self.runtime_expansions}
 
679
 
                # In case checker_command has exactly one % operator
 
680
 
                command = self.checker_command % self.host
 
682
 
                # Escape attributes for the shell
 
683
 
                escaped_attrs = dict(
 
685
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
689
 
                    self.runtime_expansions)
 
692
 
                    command = self.checker_command % escaped_attrs
 
693
 
                except TypeError as error:
 
694
 
                    logger.error('Could not format string "%s":'
 
695
 
                                 ' %s', self.checker_command, error)
 
696
 
                    return True # Try again later
 
 
1113
                command = self.checker_command % escaped_attrs
 
 
1114
            except TypeError as error:
 
 
1115
                logger.error('Could not format string "%s"',
 
 
1116
                             self.checker_command,
 
 
1118
                return True     # Try again later
 
697
1119
            self.current_checker_command = command
 
699
 
                logger.info("Starting checker %r for %s",
 
701
 
                # We don't need to redirect stdout and stderr, since
 
702
 
                # in normal mode, that is already done by daemon(),
 
703
 
                # and in debug mode we don't want to.  (Stdin is
 
704
 
                # always replaced by /dev/null.)
 
705
 
                self.checker = subprocess.Popen(command,
 
708
 
                self.checker_callback_tag = (gobject.child_watch_add
 
710
 
                                              self.checker_callback,
 
712
 
                # The checker may have completed before the gobject
 
713
 
                # watch was added.  Check for this.
 
714
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
716
 
                    gobject.source_remove(self.checker_callback_tag)
 
717
 
                    self.checker_callback(pid, status, command)
 
718
 
            except OSError as error:
 
719
 
                logger.error("Failed to start subprocess: %s",
 
721
 
        # 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
 
724
1148
    def stop_checker(self):
 
725
1149
        """Force the checker process, if any, to stop."""
 
726
1150
        if self.checker_callback_tag:
 
727
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1151
            GLib.source_remove(self.checker_callback_tag)
 
728
1152
            self.checker_callback_tag = None
 
729
1153
        if getattr(self, "checker", None) is None:
 
731
1155
        logger.debug("Stopping checker for %(name)s", vars(self))
 
733
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
735
 
            #if self.checker.poll() is None:
 
736
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
737
 
        except OSError as error:
 
738
 
            if error.errno != errno.ESRCH: # No such process
 
 
1156
        self.checker.terminate()
 
740
1157
        self.checker = None
 
743
 
def dbus_service_property(dbus_interface, signature="v",
 
744
 
                          access="readwrite", byte_arrays=False):
 
 
1160
def dbus_service_property(dbus_interface,
 
745
1164
    """Decorators for marking methods of a DBusObjectWithProperties to
 
746
1165
    become properties on the D-Bus.
 
748
1167
    The decorated method will be called with no arguments by "Get"
 
749
1168
    and with one argument by "Set".
 
751
1170
    The parameters, where they are supported, are the same as
 
752
1171
    dbus.service.method, except there is only "signature", since the
 
753
1172
    type from Get() and the type sent to Set() is the same.
 
 
792
 
class DBusObjectWithProperties(dbus.service.Object):
 
 
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.
 
 
1263
    def _is_dbus_thing(thing):
 
 
1264
        """Returns a function testing if an attribute is a D-Bus thing
 
 
1266
        If called like _is_dbus_thing("method") it returns a function
 
 
1267
        suitable for use as predicate to inspect.getmembers().
 
 
1269
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
1272
    def _get_all_dbus_things(self, thing):
 
 
1273
        """Returns a generator of (name, attribute) pairs
 
 
1275
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
1276
                 athing.__get__(self))
 
 
1277
                for cls in self.__class__.__mro__
 
 
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):
 
793
1345
    """A D-Bus object with properties.
 
795
1347
    Classes inheriting from this can use the dbus_service_property
 
796
1348
    decorator to expose methods as D-Bus properties.  It exposes the
 
797
1349
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
801
 
    def _is_dbus_property(obj):
 
802
 
        return getattr(obj, "_dbus_is_property", False)
 
804
 
    def _get_all_dbus_properties(self):
 
805
 
        """Returns a generator of (name, attribute) pairs
 
807
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
 
                for cls in self.__class__.__mro__
 
810
 
                inspect.getmembers(cls, self._is_dbus_property))
 
812
1352
    def _get_dbus_property(self, interface_name, property_name):
 
813
1353
        """Returns a bound method if one exists which is a D-Bus
 
814
1354
        property with the specified name and interface.
 
816
 
        for cls in  self.__class__.__mro__:
 
817
 
            for name, value in (inspect.getmembers
 
818
 
                                (cls, self._is_dbus_property)):
 
 
1356
        for cls in self.__class__.__mro__:
 
 
1357
            for name, value in inspect.getmembers(
 
 
1358
                    cls, self._is_dbus_thing("property")):
 
819
1359
                if (value._dbus_name == property_name
 
820
1360
                    and value._dbus_interface == interface_name):
 
821
1361
                    return value.__get__(self)
 
823
1363
        # No such property
 
824
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
825
 
                                   + interface_name + "."
 
828
 
    @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,
 
829
1378
                         out_signature="v")
 
830
1379
    def Get(self, interface_name, property_name):
 
831
1380
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
923
1505
        except (AttributeError, xml.dom.DOMException,
 
924
1506
                xml.parsers.expat.ExpatError) as error:
 
925
1507
            logger.error("Failed to override Introspection method",
 
930
 
def datetime_to_dbus (dt, variant_level=0):
 
 
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",
 
 
1583
def datetime_to_dbus(dt, variant_level=0):
 
931
1584
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
933
 
        return dbus.String("", variant_level = variant_level)
 
934
 
    return dbus.String(dt.isoformat(),
 
935
 
                       variant_level=variant_level)
 
938
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
940
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
 
    will add additional D-Bus attributes matching a certain pattern.
 
 
1586
        return dbus.String("", variant_level=variant_level)
 
 
1587
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1590
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1591
    """A class decorator; applied to a subclass of
 
 
1592
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1593
    interface names according to the "alt_interface_names" mapping.
 
 
1596
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1597
                                    "net.example.AlternateInterface"})
 
 
1598
    class SampleDBusObject(dbus.service.Object):
 
 
1599
        @dbus.service.method("org.example.Interface")
 
 
1600
        def SampleDBusMethod():
 
 
1603
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1604
    reachable via two interfaces: "org.example.Interface" and
 
 
1605
    "net.example.AlternateInterface", the latter of which will have
 
 
1606
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1607
    "true", unless "deprecate" is passed with a False value.
 
 
1609
    This works for methods and signals, and also for D-Bus properties
 
 
1610
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1611
    dbus_interface_annotations decorator).
 
943
 
    def __new__(mcs, name, bases, attr):
 
944
 
        # Go through all the base classes which could have D-Bus
 
945
 
        # methods, signals, or properties in them
 
946
 
        for base in (b for b in bases
 
947
 
                     if issubclass(b, dbus.service.Object)):
 
948
 
            # Go though all attributes of the base class
 
949
 
            for attrname, attribute in inspect.getmembers(base):
 
 
1615
        for orig_interface_name, alt_interface_name in (
 
 
1616
                alt_interface_names.items()):
 
 
1618
            interface_names = set()
 
 
1619
            # Go though all attributes of the class
 
 
1620
            for attrname, attribute in inspect.getmembers(cls):
 
950
1621
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
1622
                # with the wrong interface name
 
952
1623
                if (not hasattr(attribute, "_dbus_interface")
 
953
 
                    or not attribute._dbus_interface
 
954
 
                    .startswith("se.recompile.Mandos")):
 
 
1624
                    or not attribute._dbus_interface.startswith(
 
 
1625
                        orig_interface_name)):
 
956
1627
                # Create an alternate D-Bus interface name based on
 
957
1628
                # the current name
 
958
 
                alt_interface = (attribute._dbus_interface
 
959
 
                                 .replace("se.recompile.Mandos",
 
960
 
                                          "se.bsnet.fukt.Mandos"))
 
 
1629
                alt_interface = attribute._dbus_interface.replace(
 
 
1630
                    orig_interface_name, alt_interface_name)
 
 
1631
                interface_names.add(alt_interface)
 
961
1632
                # Is this a D-Bus signal?
 
962
1633
                if getattr(attribute, "_dbus_is_signal", False):
 
963
 
                    # Extract the original non-method function by
 
965
 
                    nonmethod_func = (dict(
 
 
1634
                    # Extract the original non-method undecorated
 
 
1635
                    # function by black magic
 
 
1636
                    if sys.version_info.major == 2:
 
 
1637
                        nonmethod_func = (dict(
 
966
1638
                            zip(attribute.func_code.co_freevars,
 
967
 
                                attribute.__closure__))["func"]
 
 
1639
                                attribute.__closure__))
 
 
1640
                                          ["func"].cell_contents)
 
 
1642
                        nonmethod_func = (dict(
 
 
1643
                            zip(attribute.__code__.co_freevars,
 
 
1644
                                attribute.__closure__))
 
 
1645
                                          ["func"].cell_contents)
 
969
1646
                    # Create a new, but exactly alike, function
 
970
1647
                    # object, and decorate it to be a new D-Bus signal
 
971
1648
                    # with the alternate D-Bus interface name
 
972
 
                    new_function = (dbus.service.signal
 
974
 
                                     attribute._dbus_signature)
 
976
 
                                nonmethod_func.func_code,
 
977
 
                                nonmethod_func.func_globals,
 
978
 
                                nonmethod_func.func_name,
 
979
 
                                nonmethod_func.func_defaults,
 
980
 
                                nonmethod_func.func_closure)))
 
 
1649
                    new_function = copy_function(nonmethod_func)
 
 
1650
                    new_function = (dbus.service.signal(
 
 
1652
                        attribute._dbus_signature)(new_function))
 
 
1653
                    # Copy annotations, if any
 
 
1655
                        new_function._dbus_annotations = dict(
 
 
1656
                            attribute._dbus_annotations)
 
 
1657
                    except AttributeError:
 
981
1660
                    # Define a creator of a function to call both the
 
982
 
                    # old and new functions, so both the old and new
 
983
 
                    # signals gets sent when the function is called
 
 
1661
                    # original and alternate functions, so both the
 
 
1662
                    # original and alternate signals gets sent when
 
 
1663
                    # the function is called
 
984
1664
                    def fixscope(func1, func2):
 
985
1665
                        """This function is a scope container to pass
 
986
1666
                        func1 and func2 to the "call_both" function
 
987
1667
                        outside of its arguments"""
 
 
1669
                        @functools.wraps(func2)
 
988
1670
                        def call_both(*args, **kwargs):
 
989
1671
                            """This function will emit two D-Bus
 
990
1672
                            signals by calling func1 and func2"""
 
991
1673
                            func1(*args, **kwargs)
 
992
1674
                            func2(*args, **kwargs)
 
 
1675
                        # Make wrapper function look like a D-Bus
 
 
1677
                        for name, attr in inspect.getmembers(func2):
 
 
1678
                            if name.startswith("_dbus_"):
 
 
1679
                                setattr(call_both, name, attr)
 
993
1681
                        return call_both
 
994
1682
                    # Create the "call_both" function and add it to
 
996
 
                    attr[attrname] = fixscope(attribute,
 
 
1684
                    attr[attrname] = fixscope(attribute, new_function)
 
998
1685
                # Is this a D-Bus method?
 
999
1686
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
1687
                    # Create a new, but exactly alike, function
 
1001
1688
                    # object.  Decorate it to be a new D-Bus method
 
1002
1689
                    # with the alternate D-Bus interface name.  Add it
 
1003
1690
                    # to the class.
 
1004
 
                    attr[attrname] = (dbus.service.method
 
1006
 
                                       attribute._dbus_in_signature,
 
1007
 
                                       attribute._dbus_out_signature)
 
1009
 
                                       (attribute.func_code,
 
1010
 
                                        attribute.func_globals,
 
1011
 
                                        attribute.func_name,
 
1012
 
                                        attribute.func_defaults,
 
1013
 
                                        attribute.func_closure)))
 
 
1692
                        dbus.service.method(
 
 
1694
                            attribute._dbus_in_signature,
 
 
1695
                            attribute._dbus_out_signature)
 
 
1696
                        (copy_function(attribute)))
 
 
1697
                    # Copy annotations, if any
 
 
1699
                        attr[attrname]._dbus_annotations = dict(
 
 
1700
                            attribute._dbus_annotations)
 
 
1701
                    except AttributeError:
 
1014
1703
                # Is this a D-Bus property?
 
1015
1704
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
1705
                    # Create a new, but exactly alike, function
 
1017
1706
                    # object, and decorate it to be a new D-Bus
 
1018
1707
                    # property with the alternate D-Bus interface
 
1019
1708
                    # name.  Add it to the class.
 
1020
 
                    attr[attrname] = (dbus_service_property
 
1022
 
                                       attribute._dbus_signature,
 
1023
 
                                       attribute._dbus_access,
 
1025
 
                                       ._dbus_get_args_options
 
1028
 
                                       (attribute.func_code,
 
1029
 
                                        attribute.func_globals,
 
1030
 
                                        attribute.func_name,
 
1031
 
                                        attribute.func_defaults,
 
1032
 
                                        attribute.func_closure)))
 
1033
 
        return type.__new__(mcs, name, bases, attr)
 
 
1709
                    attr[attrname] = (dbus_service_property(
 
 
1710
                        alt_interface, attribute._dbus_signature,
 
 
1711
                        attribute._dbus_access,
 
 
1712
                        attribute._dbus_get_args_options
 
 
1714
                                      (copy_function(attribute)))
 
 
1715
                    # Copy annotations, if any
 
 
1717
                        attr[attrname]._dbus_annotations = dict(
 
 
1718
                            attribute._dbus_annotations)
 
 
1719
                    except AttributeError:
 
 
1721
                # Is this a D-Bus interface?
 
 
1722
                elif getattr(attribute, "_dbus_is_interface", False):
 
 
1723
                    # Create a new, but exactly alike, function
 
 
1724
                    # object.  Decorate it to be a new D-Bus interface
 
 
1725
                    # with the alternate D-Bus interface name.  Add it
 
 
1728
                        dbus_interface_annotations(alt_interface)
 
 
1729
                        (copy_function(attribute)))
 
 
1731
                # Deprecate all alternate interfaces
 
 
1732
                iname = "_AlternateDBusNames_interface_annotation{}"
 
 
1733
                for interface_name in interface_names:
 
 
1735
                    @dbus_interface_annotations(interface_name)
 
 
1737
                        return {"org.freedesktop.DBus.Deprecated":
 
 
1739
                    # Find an unused name
 
 
1740
                    for aname in (iname.format(i)
 
 
1741
                                  for i in itertools.count()):
 
 
1742
                        if aname not in attr:
 
 
1746
                # Replace the class with a new subclass of it with
 
 
1747
                # methods, signals, etc. as created above.
 
 
1748
                if sys.version_info.major == 2:
 
 
1749
                    cls = type(b"{}Alternate".format(cls.__name__),
 
 
1752
                    cls = type("{}Alternate".format(cls.__name__),
 
 
1759
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1760
                            "se.bsnet.fukt.Mandos"})
 
1036
1761
class ClientDBus(Client, DBusObjectWithProperties):
 
1037
1762
    """A Client class using D-Bus
 
1040
1765
    dbus_object_path: dbus.ObjectPath
 
1041
1766
    bus: dbus.SystemBus()
 
1044
1769
    runtime_expansions = (Client.runtime_expansions
 
1045
 
                          + ("dbus_object_path",))
 
 
1770
                          + ("dbus_object_path", ))
 
 
1772
    _interface = "se.recompile.Mandos.Client"
 
1047
1774
    # dbus.service.Object doesn't use super(), so we can't either.
 
1049
 
    def __init__(self, bus = None, *args, **kwargs):
 
 
1776
    def __init__(self, bus=None, *args, **kwargs):
 
1051
1778
        Client.__init__(self, *args, **kwargs)
 
1052
 
        self._approvals_pending = 0
 
1054
 
        self._approvals_pending = 0
 
1055
1779
        # Only now, when this client is initialized, can it show up on
 
1057
 
        client_object_name = unicode(self.name).translate(
 
 
1781
        client_object_name = str(self.name).translate(
 
1058
1782
            {ord("."): ord("_"),
 
1059
1783
             ord("-"): ord("_")})
 
1060
 
        self.dbus_object_path = (dbus.ObjectPath
 
1061
 
                                 ("/clients/" + client_object_name))
 
 
1784
        self.dbus_object_path = dbus.ObjectPath(
 
 
1785
            "/clients/" + client_object_name)
 
1062
1786
        DBusObjectWithProperties.__init__(self, self.bus,
 
1063
1787
                                          self.dbus_object_path)
 
1065
 
    def notifychangeproperty(transform_func,
 
1066
 
                             dbus_name, type_func=lambda x: x,
 
 
1789
    def notifychangeproperty(transform_func, dbus_name,
 
 
1790
                             type_func=lambda x: x,
 
 
1792
                             invalidate_only=False,
 
 
1793
                             _interface=_interface):
 
1068
1794
        """ Modify a variable so that it's a property which announces
 
1069
1795
        its changes to DBus.
 
1071
1797
        transform_fun: Function that takes a value and a variant_level
 
1072
1798
                       and transforms it to a D-Bus type.
 
1073
1799
        dbus_name: D-Bus name of the variable
 
 
1075
1801
                   to the D-Bus.  Default: no transform
 
1076
1802
        variant_level: D-Bus variant level.  Default: 1
 
1078
 
        attrname = "_{0}".format(dbus_name)
 
 
1804
        attrname = "_{}".format(dbus_name)
 
1079
1806
        def setter(self, value):
 
1080
1807
            if hasattr(self, "dbus_object_path"):
 
1081
1808
                if (not hasattr(self, attrname) or
 
1082
1809
                    type_func(getattr(self, attrname, None))
 
1083
1810
                    != type_func(value)):
 
1084
 
                    dbus_value = transform_func(type_func(value),
 
1087
 
                    self.PropertyChanged(dbus.String(dbus_name),
 
 
1812
                        self.PropertiesChanged(
 
 
1813
                            _interface, dbus.Dictionary(),
 
 
1814
                            dbus.Array((dbus_name, )))
 
 
1816
                        dbus_value = transform_func(
 
 
1818
                            variant_level=variant_level)
 
 
1819
                        self.PropertyChanged(dbus.String(dbus_name),
 
 
1821
                        self.PropertiesChanged(
 
 
1823
                            dbus.Dictionary({dbus.String(dbus_name):
 
1089
1826
            setattr(self, attrname, value)
 
1091
1828
        return property(lambda self: getattr(self, attrname), setter)
 
1094
1830
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1095
1831
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1096
1832
                                             "ApprovalPending",
 
1098
1834
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1099
1835
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1101
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1102
 
                                   type_func = lambda checker:
 
1103
 
                                       checker is not None)
 
 
1837
    checker = notifychangeproperty(
 
 
1838
        dbus.Boolean, "CheckerRunning",
 
 
1839
        type_func=lambda checker: checker is not None)
 
1104
1840
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1105
1841
                                           "LastCheckedOK")
 
 
1842
    last_checker_status = notifychangeproperty(dbus.Int16,
 
 
1843
                                               "LastCheckerStatus")
 
1106
1844
    last_approval_request = notifychangeproperty(
 
1107
1845
        datetime_to_dbus, "LastApprovalRequest")
 
1108
1846
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1109
1847
                                               "ApprovedByDefault")
 
1110
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1113
 
                                          timedelta_to_milliseconds)
 
 
1848
    approval_delay = notifychangeproperty(
 
 
1849
        dbus.UInt64, "ApprovalDelay",
 
 
1850
        type_func=lambda td: td.total_seconds() * 1000)
 
1114
1851
    approval_duration = notifychangeproperty(
 
1115
1852
        dbus.UInt64, "ApprovalDuration",
 
1116
 
        type_func = timedelta_to_milliseconds)
 
 
1853
        type_func=lambda td: td.total_seconds() * 1000)
 
1117
1854
    host = notifychangeproperty(dbus.String, "Host")
 
1118
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1120
 
                                   timedelta_to_milliseconds)
 
 
1855
    timeout = notifychangeproperty(
 
 
1856
        dbus.UInt64, "Timeout",
 
 
1857
        type_func=lambda td: td.total_seconds() * 1000)
 
1121
1858
    extended_timeout = notifychangeproperty(
 
1122
1859
        dbus.UInt64, "ExtendedTimeout",
 
1123
 
        type_func = timedelta_to_milliseconds)
 
1124
 
    interval = notifychangeproperty(dbus.UInt64,
 
1127
 
                                    timedelta_to_milliseconds)
 
 
1860
        type_func=lambda td: td.total_seconds() * 1000)
 
 
1861
    interval = notifychangeproperty(
 
 
1862
        dbus.UInt64, "Interval",
 
 
1863
        type_func=lambda td: td.total_seconds() * 1000)
 
1128
1864
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
 
1865
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
 
1866
                                  invalidate_only=True)
 
1130
1868
    del notifychangeproperty
 
1132
1870
    def __del__(self, *args, **kwargs):
 
1134
1872
            self.remove_from_connection()
 
 
1214
1951
        server to mandos-client
 
1218
1955
    # Rejected - signal
 
1219
1956
    @dbus.service.signal(_interface, signature="s")
 
1220
1957
    def Rejected(self, reason):
 
1224
1961
    # NeedApproval - signal
 
1225
1962
    @dbus.service.signal(_interface, signature="tb")
 
1226
1963
    def NeedApproval(self, timeout, default):
 
1228
1965
        return self.need_approval()
 
1230
 
    # NeRwequest - signal
 
1231
 
    @dbus.service.signal(_interface, signature="s")
 
1232
 
    def NewRequest(self, ip):
 
1234
 
        Is sent after a client request a password.
 
1240
1969
    # Approve - method
 
1241
1970
    @dbus.service.method(_interface, in_signature="b")
 
1242
1971
    def Approve(self, value):
 
1243
1972
        self.approve(value)
 
1245
1974
    # CheckedOK - method
 
1246
1975
    @dbus.service.method(_interface)
 
1247
1976
    def CheckedOK(self):
 
1248
1977
        self.checked_ok()
 
1250
1979
    # Enable - method
 
 
1980
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1251
1981
    @dbus.service.method(_interface)
 
1252
1982
    def Enable(self):
 
1256
1986
    # StartChecker - method
 
 
1987
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1257
1988
    @dbus.service.method(_interface)
 
1258
1989
    def StartChecker(self):
 
1260
1991
        self.start_checker()
 
1262
1993
    # Disable - method
 
 
1994
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1263
1995
    @dbus.service.method(_interface)
 
1264
1996
    def Disable(self):
 
1268
2000
    # StopChecker - method
 
 
2001
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1269
2002
    @dbus.service.method(_interface)
 
1270
2003
    def StopChecker(self):
 
1271
2004
        self.stop_checker()
 
1275
2008
    # ApprovalPending - property
 
1276
2009
    @dbus_service_property(_interface, signature="b", access="read")
 
1277
2010
    def ApprovalPending_dbus_property(self):
 
1278
2011
        return dbus.Boolean(bool(self.approvals_pending))
 
1280
2013
    # ApprovedByDefault - property
 
1281
 
    @dbus_service_property(_interface, signature="b",
 
 
2014
    @dbus_service_property(_interface,
 
1282
2016
                           access="readwrite")
 
1283
2017
    def ApprovedByDefault_dbus_property(self, value=None):
 
1284
2018
        if value is None:       # get
 
1285
2019
            return dbus.Boolean(self.approved_by_default)
 
1286
2020
        self.approved_by_default = bool(value)
 
1288
2022
    # ApprovalDelay - property
 
1289
 
    @dbus_service_property(_interface, signature="t",
 
 
2023
    @dbus_service_property(_interface,
 
1290
2025
                           access="readwrite")
 
1291
2026
    def ApprovalDelay_dbus_property(self, value=None):
 
1292
2027
        if value is None:       # get
 
1293
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2028
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1294
2030
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1296
2032
    # ApprovalDuration - property
 
1297
 
    @dbus_service_property(_interface, signature="t",
 
 
2033
    @dbus_service_property(_interface,
 
1298
2035
                           access="readwrite")
 
1299
2036
    def ApprovalDuration_dbus_property(self, value=None):
 
1300
2037
        if value is None:       # get
 
1301
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1302
 
                    self.approval_duration))
 
 
2038
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1303
2040
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1305
2042
    # Name - property
 
 
2044
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1306
2045
    @dbus_service_property(_interface, signature="s", access="read")
 
1307
2046
    def Name_dbus_property(self):
 
1308
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)
 
1310
2056
    # Fingerprint - property
 
 
2058
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1311
2059
    @dbus_service_property(_interface, signature="s", access="read")
 
1312
2060
    def Fingerprint_dbus_property(self):
 
1313
2061
        return dbus.String(self.fingerprint)
 
1315
2063
    # Host - property
 
1316
 
    @dbus_service_property(_interface, signature="s",
 
 
2064
    @dbus_service_property(_interface,
 
1317
2066
                           access="readwrite")
 
1318
2067
    def Host_dbus_property(self, value=None):
 
1319
2068
        if value is None:       # get
 
1320
2069
            return dbus.String(self.host)
 
1321
 
        self.host = unicode(value)
 
 
2070
        self.host = str(value)
 
1323
2072
    # Created - property
 
 
2074
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1324
2075
    @dbus_service_property(_interface, signature="s", access="read")
 
1325
2076
    def Created_dbus_property(self):
 
1326
2077
        return datetime_to_dbus(self.created)
 
1328
2079
    # LastEnabled - property
 
1329
2080
    @dbus_service_property(_interface, signature="s", access="read")
 
1330
2081
    def LastEnabled_dbus_property(self):
 
1331
2082
        return datetime_to_dbus(self.last_enabled)
 
1333
2084
    # Enabled - property
 
1334
 
    @dbus_service_property(_interface, signature="b",
 
 
2085
    @dbus_service_property(_interface,
 
1335
2087
                           access="readwrite")
 
1336
2088
    def Enabled_dbus_property(self, value=None):
 
1337
2089
        if value is None:       # get
 
 
1344
2096
    # LastCheckedOK - property
 
1345
 
    @dbus_service_property(_interface, signature="s",
 
 
2097
    @dbus_service_property(_interface,
 
1346
2099
                           access="readwrite")
 
1347
2100
    def LastCheckedOK_dbus_property(self, value=None):
 
1348
2101
        if value is not None:
 
1349
2102
            self.checked_ok()
 
1351
2104
        return datetime_to_dbus(self.last_checked_ok)
 
 
2106
    # LastCheckerStatus - property
 
 
2107
    @dbus_service_property(_interface, signature="n", access="read")
 
 
2108
    def LastCheckerStatus_dbus_property(self):
 
 
2109
        return dbus.Int16(self.last_checker_status)
 
1353
2111
    # Expires - property
 
1354
2112
    @dbus_service_property(_interface, signature="s", access="read")
 
1355
2113
    def Expires_dbus_property(self):
 
1356
2114
        return datetime_to_dbus(self.expires)
 
1358
2116
    # LastApprovalRequest - property
 
1359
2117
    @dbus_service_property(_interface, signature="s", access="read")
 
1360
2118
    def LastApprovalRequest_dbus_property(self):
 
1361
2119
        return datetime_to_dbus(self.last_approval_request)
 
1363
2121
    # Timeout - property
 
1364
 
    @dbus_service_property(_interface, signature="t",
 
 
2122
    @dbus_service_property(_interface,
 
1365
2124
                           access="readwrite")
 
1366
2125
    def Timeout_dbus_property(self, value=None):
 
1367
2126
        if value is None:       # get
 
1368
 
            return dbus.UInt64(self.timeout_milliseconds())
 
 
2127
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
 
2128
        old_timeout = self.timeout
 
1369
2129
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1370
 
        # Reschedule timeout
 
 
2130
        # Reschedule disabling
 
1371
2131
        if self.enabled:
 
1372
2132
            now = datetime.datetime.utcnow()
 
1373
 
            time_to_die = timedelta_to_milliseconds(
 
1374
 
                (self.last_checked_ok + self.timeout) - now)
 
1375
 
            if time_to_die <= 0:
 
 
2133
            self.expires += self.timeout - old_timeout
 
 
2134
            if self.expires <= now:
 
1376
2135
                # The timeout has passed
 
1379
 
                self.expires = (now +
 
1380
 
                                datetime.timedelta(milliseconds =
 
1382
2138
                if (getattr(self, "disable_initiator_tag", None)
 
1385
 
                gobject.source_remove(self.disable_initiator_tag)
 
1386
 
                self.disable_initiator_tag = (gobject.timeout_add
 
 
2141
                GLib.source_remove(self.disable_initiator_tag)
 
 
2142
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2143
                    int((self.expires - now).total_seconds() * 1000),
 
1390
2146
    # ExtendedTimeout - property
 
1391
 
    @dbus_service_property(_interface, signature="t",
 
 
2147
    @dbus_service_property(_interface,
 
1392
2149
                           access="readwrite")
 
1393
2150
    def ExtendedTimeout_dbus_property(self, value=None):
 
1394
2151
        if value is None:       # get
 
1395
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2152
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1396
2154
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1398
2156
    # Interval - property
 
1399
 
    @dbus_service_property(_interface, signature="t",
 
 
2157
    @dbus_service_property(_interface,
 
1400
2159
                           access="readwrite")
 
1401
2160
    def Interval_dbus_property(self, value=None):
 
1402
2161
        if value is None:       # get
 
1403
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2162
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1404
2163
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1405
2164
        if getattr(self, "checker_initiator_tag", None) is None:
 
1407
2166
        if self.enabled:
 
1408
2167
            # Reschedule checker run
 
1409
 
            gobject.source_remove(self.checker_initiator_tag)
 
1410
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1411
 
                                          (value, self.start_checker))
 
1412
 
            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
 
1414
2173
    # Checker - property
 
1415
 
    @dbus_service_property(_interface, signature="s",
 
 
2174
    @dbus_service_property(_interface,
 
1416
2176
                           access="readwrite")
 
1417
2177
    def Checker_dbus_property(self, value=None):
 
1418
2178
        if value is None:       # get
 
1419
2179
            return dbus.String(self.checker_command)
 
1420
 
        self.checker_command = unicode(value)
 
 
2180
        self.checker_command = str(value)
 
1422
2182
    # CheckerRunning - property
 
1423
 
    @dbus_service_property(_interface, signature="b",
 
 
2183
    @dbus_service_property(_interface,
 
1424
2185
                           access="readwrite")
 
1425
2186
    def CheckerRunning_dbus_property(self, value=None):
 
1426
2187
        if value is None:       # get
 
 
1459
2228
        if data[0] == 'data':
 
1461
2230
        if data[0] == 'function':
 
1462
2232
            def func(*args, **kwargs):
 
1463
2233
                self._pipe.send(('funcall', name, args, kwargs))
 
1464
2234
                return self._pipe.recv()[1]
 
1467
2238
    def __setattr__(self, name, value):
 
1468
2239
        if name == '_pipe':
 
1469
2240
            return super(ProxyClient, self).__setattr__(name, value)
 
1470
2241
        self._pipe.send(('setattr', name, value))
 
1473
 
class ClientDBusTransitional(ClientDBus):
 
1474
 
    __metaclass__ = AlternateDBusNamesMetaclass
 
1477
2244
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1478
2245
    """A class to handle client connections.
 
1480
2247
    Instantiated once for each connection to handle it.
 
1481
2248
    Note: This will run in its own forked process."""
 
1483
2250
    def handle(self):
 
1484
2251
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1485
2252
            logger.info("TCP connection from: %s",
 
1486
 
                        unicode(self.client_address))
 
 
2253
                        str(self.client_address))
 
1487
2254
            logger.debug("Pipe FD: %d",
 
1488
2255
                         self.server.child_pipe.fileno())
 
1490
 
            session = (gnutls.connection
 
1491
 
                       .ClientSession(self.request,
 
1493
 
                                      .X509Credentials()))
 
1495
 
            # Note: gnutls.connection.X509Credentials is really a
 
1496
 
            # generic GnuTLS certificate credentials object so long as
 
1497
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1498
 
            # here despite using OpenPGP certificates.
 
1500
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1501
 
            #                      "+AES-256-CBC", "+SHA1",
 
1502
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2257
            session = gnutls.ClientSession(self.request)
 
 
2259
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2260
            #                       "+AES-256-CBC", "+SHA1",
 
 
2261
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1504
2263
            # Use a fallback default, since this MUST be set.
 
1505
2264
            priority = self.server.gnutls_priority
 
1506
2265
            if priority is None:
 
1507
2266
                priority = "NORMAL"
 
1508
 
            (gnutls.library.functions
 
1509
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2267
            gnutls.priority_set_direct(session._c_object,
 
 
2268
                                       priority.encode("utf-8"),
 
1512
2271
            # Start communication using the Mandos protocol
 
1513
2272
            # Get protocol number
 
1514
2273
            line = self.request.makefile().readline()
 
1515
2274
            logger.debug("Protocol version: %r", line)
 
1517
2276
                if int(line.strip().split()[0]) > 1:
 
 
2277
                    raise RuntimeError(line)
 
1519
2278
            except (ValueError, IndexError, RuntimeError) as error:
 
1520
2279
                logger.error("Unknown protocol version: %s", error)
 
1523
2282
            # Start GnuTLS connection
 
1525
2284
                session.handshake()
 
1526
 
            except gnutls.errors.GNUTLSError as error:
 
 
2285
            except gnutls.Error as error:
 
1527
2286
                logger.warning("Handshake failed: %s", error)
 
1528
2287
                # Do not run session.bye() here: the session is not
 
1529
2288
                # established.  Just abandon the request.
 
1531
2290
            logger.debug("Handshake succeeded")
 
1533
2292
            approval_required = False
 
1536
 
                    fpr = self.fingerprint(self.peer_certificate
 
1539
 
                        gnutls.errors.GNUTLSError) as error:
 
1540
 
                    logger.warning("Bad certificate: %s", error)
 
1542
 
                logger.debug("Fingerprint: %s", fpr)
 
1545
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2294
                if gnutls.has_rawpk:
 
 
2297
                        key_id = self.key_id(
 
 
2298
                            self.peer_certificate(session))
 
 
2299
                    except (TypeError, gnutls.Error) as error:
 
 
2300
                        logger.warning("Bad certificate: %s", error)
 
 
2302
                    logger.debug("Key ID: %s", key_id)
 
 
2307
                        fpr = self.fingerprint(
 
 
2308
                            self.peer_certificate(session))
 
 
2309
                    except (TypeError, gnutls.Error) as error:
 
 
2310
                        logger.warning("Bad certificate: %s", error)
 
 
2312
                    logger.debug("Fingerprint: %s", fpr)
 
 
2315
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1546
2316
                                         self.client_address)
 
1547
2317
                except KeyError:
 
1550
 
                if self.server.use_dbus:
 
1552
 
                    client.NewRequest(str(self.client_address))
 
1554
2320
                if client.approval_delay:
 
1555
2321
                    delay = client.approval_delay
 
1556
2322
                    client.approvals_pending += 1
 
1557
2323
                    approval_required = True
 
1560
2326
                    if not client.enabled:
 
1561
2327
                        logger.info("Client %s is disabled",
 
1563
2329
                        if self.server.use_dbus:
 
1564
2330
                            # Emit D-Bus signal
 
1565
2331
                            client.Rejected("Disabled")
 
1568
2334
                    if client.approved or not client.approval_delay:
 
1569
 
                        #We are approved or approval is disabled
 
 
2335
                        # We are approved or approval is disabled
 
1571
2337
                    elif client.approved is None:
 
1572
2338
                        logger.info("Client %s needs approval",
 
 
1607
2371
                        delay -= time2 - time
 
1610
 
                while sent_size < len(client.secret):
 
1612
 
                        sent = session.send(client.secret[sent_size:])
 
1613
 
                    except gnutls.errors.GNUTLSError as error:
 
1614
 
                        logger.warning("gnutls send failed")
 
1616
 
                    logger.debug("Sent: %d, remaining: %d",
 
1617
 
                                 sent, len(client.secret)
 
1618
 
                                 - (sent_size + sent))
 
 
2374
                    session.send(client.secret)
 
 
2375
                except gnutls.Error as error:
 
 
2376
                    logger.warning("gnutls send failed",
 
1621
2380
                logger.info("Sending secret to %s", client.name)
 
1622
2381
                # bump the timeout using extended_timeout
 
1623
 
                client.checked_ok(client.extended_timeout)
 
 
2382
                client.bump_timeout(client.extended_timeout)
 
1624
2383
                if self.server.use_dbus:
 
1625
2384
                    # Emit D-Bus signal
 
1626
2385
                    client.GotSecret()
 
1629
2388
                if approval_required:
 
1630
2389
                    client.approvals_pending -= 1
 
1633
 
                except gnutls.errors.GNUTLSError as error:
 
1634
 
                    logger.warning("GnuTLS bye failed")
 
 
2392
                except gnutls.Error as error:
 
 
2393
                    logger.warning("GnuTLS bye failed",
 
1637
2397
    def peer_certificate(session):
 
1638
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1639
 
        # If not an OpenPGP certificate...
 
1640
 
        if (gnutls.library.functions
 
1641
 
            .gnutls_certificate_type_get(session._c_object)
 
1642
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1643
 
            # ...do the normal thing
 
1644
 
            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
 
1645
2414
        list_size = ctypes.c_uint(1)
 
1646
 
        cert_list = (gnutls.library.functions
 
1647
 
                     .gnutls_certificate_get_peers
 
 
2415
        cert_list = (gnutls.certificate_get_peers
 
1648
2416
                     (session._c_object, ctypes.byref(list_size)))
 
1649
2417
        if not bool(cert_list) and list_size.value != 0:
 
1650
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2418
            raise gnutls.Error("error getting peer certificate")
 
1652
2419
        if list_size.value == 0:
 
1654
2421
        cert = cert_list[0]
 
1655
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()
 
1658
2459
    def fingerprint(openpgp):
 
1659
2460
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1660
2461
        # New GnuTLS "datum" with the OpenPGP public key
 
1661
 
        datum = (gnutls.library.types
 
1662
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1665
 
                                 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)))
 
1666
2466
        # New empty GnuTLS certificate
 
1667
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1668
 
        (gnutls.library.functions
 
1669
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2467
        crt = gnutls.openpgp_crt_t()
 
 
2468
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1670
2469
        # Import the OpenPGP public key into the certificate
 
1671
 
        (gnutls.library.functions
 
1672
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1673
 
                                    gnutls.library.constants
 
1674
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2470
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2471
                                  gnutls.OPENPGP_FMT_RAW)
 
1675
2472
        # Verify the self signature in the key
 
1676
2473
        crtverify = ctypes.c_uint()
 
1677
 
        (gnutls.library.functions
 
1678
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1679
 
                                         ctypes.byref(crtverify)))
 
 
2474
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2475
                                       ctypes.byref(crtverify))
 
1680
2476
        if crtverify.value != 0:
 
1681
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1682
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2477
            gnutls.openpgp_crt_deinit(crt)
 
 
2478
            raise gnutls.CertificateSecurityError(code
 
1684
2480
        # New buffer for the fingerprint
 
1685
2481
        buf = ctypes.create_string_buffer(20)
 
1686
2482
        buf_len = ctypes.c_size_t()
 
1687
2483
        # Get the fingerprint from the certificate into the buffer
 
1688
 
        (gnutls.library.functions
 
1689
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1690
 
                                             ctypes.byref(buf_len)))
 
 
2484
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2485
                                           ctypes.byref(buf_len))
 
1691
2486
        # Deinit the certificate
 
1692
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2487
        gnutls.openpgp_crt_deinit(crt)
 
1693
2488
        # Convert the buffer to a Python bytestring
 
1694
2489
        fpr = ctypes.string_at(buf, buf_len.value)
 
1695
2490
        # Convert the bytestring to hexadecimal notation
 
 
1700
2495
class MultiprocessingMixIn(object):
 
1701
2496
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1702
2498
    def sub_process_main(self, request, address):
 
1704
2500
            self.finish_request(request, address)
 
1705
2501
        except Exception:
 
1706
2502
            self.handle_error(request, address)
 
1707
2503
        self.close_request(request)
 
1709
2505
    def process_request(self, request, address):
 
1710
2506
        """Start a new process to process the request."""
 
1711
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
 
2507
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2508
                                       args=(request, address))
 
1718
2513
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1719
2514
    """ adds a pipe to the MixIn """
 
1720
2516
    def process_request(self, request, client_address):
 
1721
2517
        """Overrides and wraps the original process_request().
 
1723
2519
        This function creates a new pipe in self.pipe
 
1725
2521
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1727
2523
        proc = MultiprocessingMixIn.process_request(self, request,
 
1728
2524
                                                    client_address)
 
1729
2525
        self.child_pipe.close()
 
1730
2526
        self.add_pipe(parent_pipe, proc)
 
1732
2528
    def add_pipe(self, parent_pipe, proc):
 
1733
2529
        """Dummy function; override as necessary"""
 
1734
 
        raise NotImplementedError
 
 
2530
        raise NotImplementedError()
 
1737
2533
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1738
2534
                     socketserver.TCPServer, object):
 
1739
2535
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1742
2538
        enabled:        Boolean; whether this server is activated yet
 
1743
2539
        interface:      None or a network interface name (string)
 
1744
2540
        use_ipv6:       Boolean; to use IPv6 or not
 
1746
2543
    def __init__(self, server_address, RequestHandlerClass,
 
1747
 
                 interface=None, use_ipv6=True):
 
 
2547
        """If socketfd is set, use that file descriptor instead of
 
 
2548
        creating a new one with socket.socket().
 
1748
2550
        self.interface = interface
 
1750
2552
            self.address_family = socket.AF_INET6
 
 
2553
        if socketfd is not None:
 
 
2554
            # Save the file descriptor
 
 
2555
            self.socketfd = socketfd
 
 
2556
            # Save the original socket.socket() function
 
 
2557
            self.socket_socket = socket.socket
 
 
2559
            # To implement --socket, we monkey patch socket.socket.
 
 
2561
            # (When socketserver.TCPServer is a new-style class, we
 
 
2562
            # could make self.socket into a property instead of monkey
 
 
2563
            # patching socket.socket.)
 
 
2565
            # Create a one-time-only replacement for socket.socket()
 
 
2566
            @functools.wraps(socket.socket)
 
 
2567
            def socket_wrapper(*args, **kwargs):
 
 
2568
                # Restore original function so subsequent calls are
 
 
2570
                socket.socket = self.socket_socket
 
 
2571
                del self.socket_socket
 
 
2572
                # This time only, return a new socket object from the
 
 
2573
                # saved file descriptor.
 
 
2574
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
2575
            # Replace socket.socket() function with wrapper
 
 
2576
            socket.socket = socket_wrapper
 
 
2577
        # The socketserver.TCPServer.__init__ will call
 
 
2578
        # socket.socket(), which might be our replacement,
 
 
2579
        # socket_wrapper(), if socketfd was set.
 
1751
2580
        socketserver.TCPServer.__init__(self, server_address,
 
1752
2581
                                        RequestHandlerClass)
 
1753
2583
    def server_bind(self):
 
1754
2584
        """This overrides the normal server_bind() function
 
1755
2585
        to bind to an interface if one was specified, and also NOT to
 
1756
2586
        bind to an address or port if they were not specified."""
 
 
2587
        global SO_BINDTODEVICE
 
1757
2588
        if self.interface is not None:
 
1758
2589
            if SO_BINDTODEVICE is None:
 
1759
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1760
 
                             " cannot bind to interface %s",
 
1764
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1768
 
                except socket.error as error:
 
1769
 
                    if error[0] == errno.EPERM:
 
1770
 
                        logger.error("No permission to"
 
1771
 
                                     " bind to interface %s",
 
1773
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1774
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1775
 
                                     " cannot bind to interface %s",
 
 
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)
 
1779
2611
        # Only bind(2) the socket if we really need to.
 
1780
2612
        if self.server_address[0] or self.server_address[1]:
 
 
2613
            if self.server_address[1]:
 
 
2614
                self.allow_reuse_address = True
 
1781
2615
            if not self.server_address[0]:
 
1782
2616
                if self.address_family == socket.AF_INET6:
 
1783
 
                    any_address = "::" # in6addr_any
 
 
2617
                    any_address = "::"  # in6addr_any
 
1785
 
                    any_address = socket.INADDR_ANY
 
 
2619
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1786
2620
                self.server_address = (any_address,
 
1787
2621
                                       self.server_address[1])
 
1788
2622
            elif not self.server_address[1]:
 
1789
 
                self.server_address = (self.server_address[0],
 
 
2623
                self.server_address = (self.server_address[0], 0)
 
1791
2624
#                 if self.interface:
 
1792
2625
#                     self.server_address = (self.server_address[0],
 
 
1818
2656
        self.gnutls_priority = gnutls_priority
 
1819
2657
        IPv6_TCPServer.__init__(self, server_address,
 
1820
2658
                                RequestHandlerClass,
 
1821
 
                                interface = interface,
 
1822
 
                                use_ipv6 = use_ipv6)
 
 
2659
                                interface=interface,
 
1823
2663
    def server_activate(self):
 
1824
2664
        if self.enabled:
 
1825
2665
            return socketserver.TCPServer.server_activate(self)
 
1827
2667
    def enable(self):
 
1828
2668
        self.enabled = True
 
1830
2670
    def add_pipe(self, parent_pipe, proc):
 
1831
2671
        # Call "handle_ipc" for both data and EOF events
 
1832
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1833
 
                             gobject.IO_IN | gobject.IO_HUP,
 
1834
 
                             functools.partial(self.handle_ipc,
 
1839
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1840
 
                   proc = None, client_object=None):
 
1842
 
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1845
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
 
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
 
                                    # broken, usually for pipes and
 
1851
 
        conditions_string = ' | '.join(name
 
1853
 
                                       condition_names.iteritems()
 
1854
 
                                       if cond & condition)
 
 
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):
 
1855
2683
        # error, or the other end of multiprocessing.Pipe has closed
 
1856
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
 
2684
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
1857
2685
            # Wait for other process to exit
 
1861
2689
        # Read a request from the child
 
1862
2690
        request = parent_pipe.recv()
 
1863
2691
        command = request[0]
 
1865
2693
        if command == 'init':
 
1867
 
            address = request[2]
 
1869
 
            for c in self.clients.itervalues():
 
1870
 
                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:
 
1874
 
                logger.info("Client not found for fingerprint: %s, ad"
 
1875
 
                            "dress: %s", fpr, address)
 
 
2708
                logger.info("Client not found for key ID: %s, address"
 
 
2709
                            ": %s", key_id or fpr, address)
 
1876
2710
                if self.use_dbus:
 
1877
2711
                    # Emit D-Bus signal
 
1878
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2712
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
1880
2714
                parent_pipe.send(False)
 
1883
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
1884
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
1885
 
                                 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))
 
1891
2724
            parent_pipe.send(True)
 
1892
2725
            # remove the old hook in favor of the new above hook on
 
 
1896
2729
            funcname = request[1]
 
1897
2730
            args = request[2]
 
1898
2731
            kwargs = request[3]
 
1900
2733
            parent_pipe.send(('data', getattr(client_object,
 
1901
2734
                                              funcname)(*args,
 
1904
2737
        if command == 'getattr':
 
1905
2738
            attrname = request[1]
 
1906
 
            if callable(client_object.__getattribute__(attrname)):
 
1907
 
                parent_pipe.send(('function',))
 
 
2739
            if isinstance(client_object.__getattribute__(attrname),
 
 
2740
                          collections.Callable):
 
 
2741
                parent_pipe.send(('function', ))
 
1909
 
                parent_pipe.send(('data', client_object
 
1910
 
                                  .__getattribute__(attrname)))
 
 
2744
                    'data', client_object.__getattribute__(attrname)))
 
1912
2746
        if command == 'setattr':
 
1913
2747
            attrname = request[1]
 
1914
2748
            value = request[2]
 
1915
2749
            setattr(client_object, attrname, value)
 
 
2754
def rfc3339_duration_to_delta(duration):
 
 
2755
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2757
    >>> rfc3339_duration_to_delta("P7D")
 
 
2758
    datetime.timedelta(7)
 
 
2759
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2760
    datetime.timedelta(0, 60)
 
 
2761
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2762
    datetime.timedelta(0, 3600)
 
 
2763
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2764
    datetime.timedelta(1)
 
 
2765
    >>> rfc3339_duration_to_delta("P1W")
 
 
2766
    datetime.timedelta(7)
 
 
2767
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2768
    datetime.timedelta(0, 330)
 
 
2769
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2770
    datetime.timedelta(1, 200)
 
 
2773
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2774
    # possible - there would have to be multiple places for the same
 
 
2775
    # values, like seconds.  The current code, while more esoteric, is
 
 
2776
    # cleaner without depending on a parsing library.  If Python had a
 
 
2777
    # built-in library for parsing we would use it, but we'd like to
 
 
2778
    # avoid excessive use of external libraries.
 
 
2780
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2781
    Token = collections.namedtuple("Token", (
 
 
2782
        "regexp",  # To match token; if "value" is not None, must have
 
 
2783
                   # a "group" containing digits
 
 
2784
        "value",   # datetime.timedelta or None
 
 
2785
        "followers"))           # Tokens valid after this token
 
 
2786
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2787
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2788
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2789
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2790
                         datetime.timedelta(seconds=1),
 
 
2791
                         frozenset((token_end, )))
 
 
2792
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2793
                         datetime.timedelta(minutes=1),
 
 
2794
                         frozenset((token_second, token_end)))
 
 
2795
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2796
                       datetime.timedelta(hours=1),
 
 
2797
                       frozenset((token_minute, token_end)))
 
 
2798
    token_time = Token(re.compile(r"T"),
 
 
2800
                       frozenset((token_hour, token_minute,
 
 
2802
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2803
                      datetime.timedelta(days=1),
 
 
2804
                      frozenset((token_time, token_end)))
 
 
2805
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2806
                        datetime.timedelta(weeks=4),
 
 
2807
                        frozenset((token_day, token_end)))
 
 
2808
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2809
                       datetime.timedelta(weeks=52),
 
 
2810
                       frozenset((token_month, token_end)))
 
 
2811
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2812
                       datetime.timedelta(weeks=1),
 
 
2813
                       frozenset((token_end, )))
 
 
2814
    token_duration = Token(re.compile(r"P"), None,
 
 
2815
                           frozenset((token_year, token_month,
 
 
2816
                                      token_day, token_time,
 
 
2818
    # Define starting values:
 
 
2820
    value = datetime.timedelta()
 
 
2822
    # Following valid tokens
 
 
2823
    followers = frozenset((token_duration, ))
 
 
2824
    # String left to parse
 
 
2826
    # Loop until end token is found
 
 
2827
    while found_token is not token_end:
 
 
2828
        # Search for any currently valid tokens
 
 
2829
        for token in followers:
 
 
2830
            match = token.regexp.match(s)
 
 
2831
            if match is not None:
 
 
2833
                if token.value is not None:
 
 
2834
                    # Value found, parse digits
 
 
2835
                    factor = int(match.group(1), 10)
 
 
2836
                    # Add to value so far
 
 
2837
                    value += factor * token.value
 
 
2838
                # Strip token from string
 
 
2839
                s = token.regexp.sub("", s, 1)
 
 
2842
                # Set valid next tokens
 
 
2843
                followers = found_token.followers
 
 
2846
            # No currently valid tokens were found
 
 
2847
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
1920
2853
def string_to_delta(interval):
 
1921
2854
    """Parse a string and return a datetime.timedelta
 
1923
2856
    >>> string_to_delta('7d')
 
1924
2857
    datetime.timedelta(7)
 
1925
2858
    >>> string_to_delta('60s')
 
 
2014
2953
    parser.add_argument("--no-dbus", action="store_false",
 
2015
2954
                        dest="use_dbus", help="Do not provide D-Bus"
 
2016
 
                        " system bus interface")
 
 
2955
                        " system bus interface", default=None)
 
2017
2956
    parser.add_argument("--no-ipv6", action="store_false",
 
2018
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2957
                        dest="use_ipv6", help="Do not use IPv6",
 
2019
2959
    parser.add_argument("--no-restore", action="store_false",
 
2020
2960
                        dest="restore", help="Do not restore stored"
 
 
2961
                        " state", default=None)
 
 
2962
    parser.add_argument("--socket", type=int,
 
 
2963
                        help="Specify a file descriptor to a network"
 
 
2964
                        " socket to use instead of creating one")
 
2022
2965
    parser.add_argument("--statedir", metavar="DIR",
 
2023
2966
                        help="Directory to save/restore state in")
 
 
2967
    parser.add_argument("--foreground", action="store_true",
 
 
2968
                        help="Run in foreground", default=None)
 
 
2969
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2970
                        dest="zeroconf", help="Do not use Zeroconf",
 
2025
2973
    options = parser.parse_args()
 
2027
2975
    if options.check:
 
 
2977
        fail_count, test_count = doctest.testmod()
 
 
2978
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2032
2980
    # Default values for config file for server-global settings
 
2033
 
    server_defaults = { "interface": "",
 
2038
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2039
 
                        "servicename": "Mandos",
 
2044
 
                        "statedir": "/var/lib/mandos"
 
 
2981
    if gnutls.has_rawpk:
 
 
2982
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2983
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2985
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2986
                    ":+SIGN-DSA-SHA256")
 
 
2987
    server_defaults = {"interface": "",
 
 
2991
                       "priority": priority,
 
 
2992
                       "servicename": "Mandos",
 
 
2998
                       "statedir": "/var/lib/mandos",
 
 
2999
                       "foreground": "False",
 
2047
3004
    # Parse config file for server-global settings
 
2048
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3005
    server_config = configparser.ConfigParser(server_defaults)
 
2049
3006
    del server_defaults
 
2050
 
    server_config.read(os.path.join(options.configdir,
 
2052
 
    # Convert the SafeConfigParser object to a dict
 
 
3007
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3008
    # Convert the ConfigParser object to a dict
 
2053
3009
    server_settings = server_config.defaults()
 
2054
3010
    # Use the appropriate methods on the non-string config options
 
2055
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3011
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3012
                   "foreground", "zeroconf"):
 
2056
3013
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2058
3015
    if server_settings["port"]:
 
2059
3016
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
3018
    if server_settings["socket"]:
 
 
3019
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
3021
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
3022
        # over with an opened os.devnull.  But we don't want this to
 
 
3023
        # happen with a supplied network socket.
 
 
3024
        if 0 <= server_settings["socket"] <= 2:
 
 
3025
            server_settings["socket"] = os.dup(server_settings
 
2061
3027
    del server_config
 
2063
3029
    # Override the settings from the config file with command line
 
2064
3030
    # options, if set.
 
2065
3031
    for option in ("interface", "address", "port", "debug",
 
2066
 
                   "priority", "servicename", "configdir",
 
2067
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
 
3032
                   "priority", "servicename", "configdir", "use_dbus",
 
 
3033
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
3034
                   "socket", "foreground", "zeroconf"):
 
2069
3035
        value = getattr(options, option)
 
2070
3036
        if value is not None:
 
2071
3037
            server_settings[option] = value
 
2073
3039
    # Force all strings to be unicode
 
2074
3040
    for option in server_settings.keys():
 
2075
 
        if type(server_settings[option]) is str:
 
2076
 
            server_settings[option] = unicode(server_settings[option])
 
 
3041
        if isinstance(server_settings[option], bytes):
 
 
3042
            server_settings[option] = (server_settings[option]
 
 
3044
    # Force all boolean options to be boolean
 
 
3045
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3046
                   "foreground", "zeroconf"):
 
 
3047
        server_settings[option] = bool(server_settings[option])
 
 
3048
    # Debug implies foreground
 
 
3049
    if server_settings["debug"]:
 
 
3050
        server_settings["foreground"] = True
 
2077
3051
    # Now we have our good server settings in "server_settings"
 
2079
3053
    ##################################################################
 
 
3055
    if (not server_settings["zeroconf"]
 
 
3056
        and not (server_settings["port"]
 
 
3057
                 or server_settings["socket"] != "")):
 
 
3058
        parser.error("Needs port or socket to work without Zeroconf")
 
2081
3060
    # For convenience
 
2082
3061
    debug = server_settings["debug"]
 
2083
3062
    debuglevel = server_settings["debuglevel"]
 
 
2095
3076
            level = getattr(logging, debuglevel.upper())
 
2096
3077
            initlogger(debug, level)
 
2098
3079
    if server_settings["servicename"] != "Mandos":
 
2099
 
        syslogger.setFormatter(logging.Formatter
 
2100
 
                               ('Mandos (%s) [%%(process)d]:'
 
2101
 
                                ' %%(levelname)s: %%(message)s'
 
2102
 
                                % server_settings["servicename"]))
 
 
3080
        syslogger.setFormatter(
 
 
3081
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
3082
                              ' %(levelname)s: %(message)s'.format(
 
 
3083
                                  server_settings["servicename"])))
 
2104
3085
    # Parse config file with clients
 
2105
 
    client_config = configparser.SafeConfigParser(Client
 
 
3086
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2107
3087
    client_config.read(os.path.join(server_settings["configdir"],
 
2108
3088
                                    "clients.conf"))
 
2110
3090
    global mandos_dbus_service
 
2111
3091
    mandos_dbus_service = None
 
2113
 
    tcp_server = MandosServer((server_settings["address"],
 
2114
 
                               server_settings["port"]),
 
2116
 
                              interface=(server_settings["interface"]
 
2120
 
                              server_settings["priority"],
 
2123
 
        pidfilename = "/var/run/mandos.pid"
 
2125
 
            pidfile = open(pidfilename, "w")
 
2127
 
            logger.error("Could not open file %r", pidfilename)
 
2130
 
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
2134
 
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
 
            gid = pwd.getpwnam("mandos").pw_gid
 
 
3094
    if server_settings["socket"] != "":
 
 
3095
        socketfd = server_settings["socket"]
 
 
3096
    tcp_server = MandosServer(
 
 
3097
        (server_settings["address"], server_settings["port"]),
 
 
3099
        interface=(server_settings["interface"] or None),
 
 
3101
        gnutls_priority=server_settings["priority"],
 
 
3105
        pidfilename = "/run/mandos.pid"
 
 
3106
        if not os.path.isdir("/run/."):
 
 
3107
            pidfilename = "/var/run/mandos.pid"
 
 
3110
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
3111
        except IOError as e:
 
 
3112
            logger.error("Could not open file %r", pidfilename,
 
 
3115
    for name, group in (("_mandos", "_mandos"),
 
 
3116
                        ("mandos", "mandos"),
 
 
3117
                        ("nobody", "nogroup")):
 
 
3119
            uid = pwd.getpwnam(name).pw_uid
 
 
3120
            gid = pwd.getpwnam(group).pw_gid
 
2136
3122
        except KeyError:
 
2138
 
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
 
                gid = pwd.getpwnam("nobody").pw_gid
 
 
3131
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2146
3133
    except OSError as error:
 
2147
 
        if error[0] != errno.EPERM:
 
 
3134
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3135
                       .format(uid, gid, os.strerror(error.errno)))
 
 
3136
        if error.errno != errno.EPERM:
 
2151
3140
        # Enable all possible GnuTLS debugging
 
2153
3142
        # "Use a log level over 10 to enable all debugging options."
 
2154
3143
        # - GnuTLS manual
 
2155
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2157
 
        @gnutls.library.types.gnutls_log_func
 
 
3144
        gnutls.global_set_log_level(11)
 
2158
3147
        def debug_gnutls(level, string):
 
2159
3148
            logger.debug("GnuTLS: %s", string[:-1])
 
2161
 
        (gnutls.library.functions
 
2162
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3150
        gnutls.global_set_log_function(debug_gnutls)
 
2164
3152
        # Redirect stdin so all checkers get /dev/null
 
2165
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
3153
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2166
3154
        os.dup2(null, sys.stdin.fileno())
 
2170
3158
    # Need to fork before connecting to D-Bus
 
2172
3160
        # Close all input and output, do double fork, etc.
 
2175
 
    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.
 
2177
3168
    global main_loop
 
2178
3169
    # From the Avahi example code
 
2179
 
    DBusGMainLoop(set_as_default=True )
 
2180
 
    main_loop = gobject.MainLoop()
 
 
3170
    DBusGMainLoop(set_as_default=True)
 
 
3171
    main_loop = GLib.MainLoop()
 
2181
3172
    bus = dbus.SystemBus()
 
2182
3173
    # End of Avahi example code
 
2185
3176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2186
 
                                            bus, do_not_queue=True)
 
2187
 
            old_bus_name = (dbus.service.BusName
 
2188
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2190
 
        except dbus.exceptions.NameExistsException as e:
 
2191
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
 
3179
            old_bus_name = dbus.service.BusName(
 
 
3180
                "se.bsnet.fukt.Mandos", bus,
 
 
3182
        except dbus.exceptions.DBusException as e:
 
 
3183
            logger.error("Disabling D-Bus:", exc_info=e)
 
2192
3184
            use_dbus = False
 
2193
3185
            server_settings["use_dbus"] = False
 
2194
3186
            tcp_server.use_dbus = False
 
2195
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2196
 
    service = AvahiServiceToSyslog(name =
 
2197
 
                                   server_settings["servicename"],
 
2198
 
                                   servicetype = "_mandos._tcp",
 
2199
 
                                   protocol = protocol, bus = bus)
 
2200
 
    if server_settings["interface"]:
 
2201
 
        service.interface = (if_nametoindex
 
2202
 
                             (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"))
 
2204
3198
    global multiprocessing_manager
 
2205
3199
    multiprocessing_manager = multiprocessing.Manager()
 
2207
3201
    client_class = Client
 
2209
 
        client_class = functools.partial(ClientDBusTransitional,
 
 
3203
        client_class = functools.partial(ClientDBus, bus=bus)
 
2212
3205
    client_settings = Client.config_parser(client_config)
 
2213
3206
    old_client_settings = {}
 
2214
3207
    clients_data = {}
 
 
3209
    # This is used to redirect stdout and stderr for checker processes
 
 
3211
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3212
    # Only used if server is running in foreground but not in debug
 
 
3214
    if debug or not foreground:
 
2216
3217
    # Get client data and settings from last running state.
 
2217
3218
    if server_settings["restore"]:
 
2219
3220
            with open(stored_state_path, "rb") as stored_state:
 
2220
 
                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"]
 
2222
3270
            os.remove(stored_state_path)
 
2223
3271
        except IOError as e:
 
2224
 
            logger.warning("Could not load persistent state: {0}"
 
2226
 
            if e.errno != errno.ENOENT:
 
 
3272
            if e.errno == errno.ENOENT:
 
 
3273
                logger.warning("Could not load persistent state:"
 
 
3274
                               " {}".format(os.strerror(e.errno)))
 
 
3276
                logger.critical("Could not load persistent state:",
 
2228
3279
        except EOFError as e:
 
2229
3280
            logger.warning("Could not load persistent state: "
 
2230
 
                           "EOFError: {0}".format(e))
 
2232
3284
    with PGPEngine() as pgp:
 
2233
 
        for client_name, client in clients_data.iteritems():
 
 
3285
        for client_name, client in clients_data.items():
 
 
3286
            # Skip removed clients
 
 
3287
            if client_name not in client_settings:
 
2234
3290
            # Decide which value to use after restoring saved state.
 
2235
3291
            # We have three different values: Old config file,
 
2236
3292
            # new config file, and saved state.
 
 
2295
3351
                        - set(old_client_settings)):
 
2296
3352
        clients_data[client_name] = client_settings[client_name]
 
2298
 
    # Create clients all clients
 
2299
 
    for client_name, client in clients_data.iteritems():
 
 
3354
    # Create all client objects
 
 
3355
    for client_name, client in clients_data.items():
 
2300
3356
        tcp_server.clients[client_name] = client_class(
 
2301
 
            name = client_name, settings = client)
 
 
3359
            server_settings=server_settings)
 
2303
3361
    if not tcp_server.clients:
 
2304
3362
        logger.warning("No clients defined")
 
2310
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2313
 
            logger.error("Could not write to file %r with PID %d",
 
2316
 
            # "pidfile" was never created
 
 
3365
        if pidfile is not None:
 
 
3369
                    print(pid, file=pidfile)
 
 
3371
                logger.error("Could not write to file %r with PID %d",
 
2318
3374
        del pidfilename
 
2319
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2321
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2322
 
    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)
 
2325
 
        class MandosDBusService(dbus.service.Object):
 
 
3382
        @alternate_dbus_interfaces(
 
 
3383
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3384
        class MandosDBusService(DBusObjectWithObjectManager):
 
2326
3385
            """A D-Bus proxy object"""
 
2327
3387
            def __init__(self):
 
2328
3388
                dbus.service.Object.__init__(self, bus, "/")
 
2329
3390
            _interface = "se.recompile.Mandos"
 
2331
3392
            @dbus.service.signal(_interface, signature="o")
 
2332
3393
            def ClientAdded(self, objpath):
 
2336
3397
            @dbus.service.signal(_interface, signature="ss")
 
2337
 
            def ClientNotFound(self, fingerprint, address):
 
 
3398
            def ClientNotFound(self, key_id, address):
 
 
3402
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2341
3404
            @dbus.service.signal(_interface, signature="os")
 
2342
3405
            def ClientRemoved(self, objpath, name):
 
 
3409
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2346
3411
            @dbus.service.method(_interface, out_signature="ao")
 
2347
3412
            def GetAllClients(self):
 
2349
 
                return dbus.Array(c.dbus_object_path
 
2351
 
                                  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":
 
2353
3419
            @dbus.service.method(_interface,
 
2354
3420
                                 out_signature="a{oa{sv}}")
 
2355
3421
            def GetAllClientsWithProperties(self):
 
2357
3423
                return dbus.Dictionary(
 
2358
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2359
 
                     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()},
 
2360
3427
                    signature="oa{sv}")
 
2362
3429
            @dbus.service.method(_interface, in_signature="o")
 
2363
3430
            def RemoveClient(self, object_path):
 
2365
 
                for c in tcp_server.clients.itervalues():
 
 
3432
                for c in tcp_server.clients.values():
 
2366
3433
                    if c.dbus_object_path == object_path:
 
2367
3434
                        del tcp_server.clients[c.name]
 
2368
3435
                        c.remove_from_connection()
 
2369
 
                        # Don't signal anything except ClientRemoved
 
 
3436
                        # Don't signal the disabling
 
2370
3437
                        c.disable(quiet=True)
 
2372
 
                        self.ClientRemoved(object_path, c.name)
 
 
3438
                        # Emit D-Bus signal for removal
 
 
3439
                        self.client_removed_signal(c)
 
2374
3441
                raise KeyError(object_path)
 
2378
 
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
 
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
 
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,
 
 
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
 
2383
3489
        "Cleanup function; run on exit"
 
2386
 
        multiprocessing.active_children()
 
 
3493
        mp.active_children()
 
2387
3495
        if not (tcp_server.clients or client_settings):
 
2390
3498
        # Store client before exiting. Secrets are encrypted with key
 
2391
3499
        # based on what config file has. If config file is
 
2392
3500
        # removed/edited, old secret will thus be unrecovable.
 
2394
3502
        with PGPEngine() as pgp:
 
2395
 
            for client in tcp_server.clients.itervalues():
 
 
3503
            for client in tcp_server.clients.values():
 
2396
3504
                key = client_settings[client.name]["secret"]
 
2397
3505
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2399
3507
                client_dict = {}
 
2401
3509
                # A list of attributes that can not be pickled
 
2403
 
                exclude = set(("bus", "changedstate", "secret",
 
2405
 
                for name, typ in (inspect.getmembers
 
2406
 
                                  (dbus.service.Object)):
 
 
3511
                exclude = {"bus", "changedstate", "secret",
 
 
3512
                           "checker", "server_settings"}
 
 
3513
                for name, typ in inspect.getmembers(dbus.service
 
2407
3515
                    exclude.add(name)
 
2409
3517
                client_dict["encrypted_secret"] = (client
 
2410
3518
                                                   .encrypted_secret)
 
2411
3519
                for attr in client.client_structure:
 
2412
3520
                    if attr not in exclude:
 
2413
3521
                        client_dict[attr] = getattr(client, attr)
 
2415
3523
                clients[client.name] = client_dict
 
2416
3524
                del client_settings[client.name]["secret"]
 
2419
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2422
 
                                                (stored_state_path))
 
2423
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2424
 
                pickle.dump((clients, client_settings), stored_state)
 
 
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
 
2425
3536
            os.rename(tempname, stored_state_path)
 
2426
3537
        except (IOError, OSError) as e:
 
2427
 
            logger.warning("Could not save persistent state: {0}"
 
2431
3540
                    os.remove(tempname)
 
2432
3541
                except NameError:
 
2434
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
 
3543
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3544
                logger.warning("Could not save persistent state: {}"
 
 
3545
                               .format(os.strerror(e.errno)))
 
 
3547
                logger.warning("Could not save persistent state:",
 
2438
3551
        # Delete all clients, and settings from config
 
2439
3552
        while tcp_server.clients:
 
2440
3553
            name, client = tcp_server.clients.popitem()
 
2442
3555
                client.remove_from_connection()
 
2443
 
            # Don't signal anything except ClientRemoved
 
 
3556
            # Don't signal the disabling
 
2444
3557
            client.disable(quiet=True)
 
 
3558
            # Emit D-Bus signal for removal
 
2447
 
                mandos_dbus_service.ClientRemoved(client
 
 
3560
                mandos_dbus_service.client_removed_signal(client)
 
2450
3561
        client_settings.clear()
 
2452
3563
    atexit.register(cleanup)
 
2454
 
    for client in tcp_server.clients.itervalues():
 
 
3565
    for client in tcp_server.clients.values():
 
2457
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3567
            # Emit D-Bus signal for adding
 
 
3568
            mandos_dbus_service.client_added_signal(client)
 
2458
3569
        # Need to initiate checking of clients
 
2459
3570
        if client.enabled:
 
2460
3571
            client.init_checker()
 
2462
3573
    tcp_server.enable()
 
2463
3574
    tcp_server.server_activate()
 
2465
3576
    # Find out what port we got
 
2466
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3578
        service.port = tcp_server.socket.getsockname()[1]
 
2468
3580
        logger.info("Now listening on address %r, port %d,"
 
2469
 
                    " flowinfo %d, scope_id %d"
 
2470
 
                    % tcp_server.socket.getsockname())
 
 
3581
                    " flowinfo %d, scope_id %d",
 
 
3582
                    *tcp_server.socket.getsockname())
 
2472
 
        logger.info("Now listening on address %r, port %d"
 
2473
 
                    % tcp_server.socket.getsockname())
 
2475
 
    #service.interface = tcp_server.socket.getsockname()[3]
 
 
3584
        logger.info("Now listening on address %r, port %d",
 
 
3585
                    *tcp_server.socket.getsockname())
 
 
3587
    # service.interface = tcp_server.socket.getsockname()[3]
 
2478
 
        # From the Avahi example code
 
2481
 
        except dbus.exceptions.DBusException as error:
 
2482
 
            logger.critical("DBusException: %s", error)
 
2485
 
        # End of Avahi example code
 
2487
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2488
 
                             lambda *args, **kwargs:
 
2489
 
                             (tcp_server.handle_request
 
2490
 
                              (*args[2:], **kwargs) or True))
 
 
3591
            # From the Avahi example code
 
 
3594
            except dbus.exceptions.DBusException as error:
 
 
3595
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3598
            # End of Avahi example code
 
 
3600
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
 
3601
                          lambda *args, **kwargs:
 
 
3602
                          (tcp_server.handle_request
 
 
3603
                           (*args[2:], **kwargs) or True))
 
2492
3605
        logger.debug("Starting main loop")
 
2493
3606
        main_loop.run()
 
2494
3607
    except AvahiError as error:
 
2495
 
        logger.critical("AvahiError: %s", error)
 
 
3608
        logger.critical("Avahi Error", exc_info=error)
 
2498
3611
    except KeyboardInterrupt: