diff options
| author | Simo Sorce <simo@redhat.com> | 2017-03-06 14:19:30 -0500 |
|---|---|---|
| committer | Tomas Krizek <tkrizek@redhat.com> | 2017-03-07 20:09:57 +0100 |
| commit | adf8aabf10a57383aa6216625921503b83575757 (patch) | |
| tree | 9aa710940c98da7f5d08aa6fd11b6c33481ed012 | |
| parent | f447489707812643ee918266f99ca1ac82a408af (diff) | |
| download | freeipa-adf8aabf10a57383aa6216625921503b83575757.tar.gz freeipa-adf8aabf10a57383aa6216625921503b83575757.tar.xz freeipa-adf8aabf10a57383aa6216625921503b83575757.zip | |
Use GSS-SPNEGO if connecting locally
GSS-SPNEGO allows us to negotiate a SASL bind with less roundtrips
therefore use it when possible.
We only enable it for local connections for now because we only
recently fixed Cyrus SASL to do proper GSS-SPNEGO negotiation. This
change means a newer and an older version are not compatible.
Restricting ourselves to the local host prevents issues with
incompatible services, and it is ok for us as we are only really
looking for speedups for the local short-lived connections performed
by the framework. Most other clients have longer lived connections,
so peformance improvements there are not as important.
Ticket: https://pagure.io/freeipa/issue/6656
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
| -rw-r--r-- | ipapython/ipaldap.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index 82d45b9a7..b15859892 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -52,6 +52,7 @@ if six.PY3: # Global variable to define SASL auth SASL_GSSAPI = ldap.sasl.sasl({}, 'GSSAPI') +SASL_GSS_SPNEGO = ldap.sasl.sasl({}, 'GSS-SPNEGO') _debug_log_ldap = False @@ -1112,7 +1113,10 @@ class LDAPClient(object): Perform SASL bind operation using the SASL GSSAPI mechanism. """ with self.error_handler(): - auth_tokens = ldap.sasl.sasl({}, 'GSSAPI') + if self._protocol == 'ldapi': + auth_tokens = SASL_GSS_SPNEGO + else: + auth_tokens = SASL_GSSAPI self._flush_schema() self.conn.sasl_interactive_bind_s( '', auth_tokens, server_controls, client_controls) |