IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ldap: Use LDAPClient bind and unbind methods in ldap2

Browse Source 
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Jan Cholasta
2014-11-21 20:14:12 +01:00
parent 232e04d861
commit 32505157ea
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ipaserver/plugins/ldap2.py
View File

@@ -162,47 +162,41 @@ class ldap2(LDAPClient, CrudBackend):
conn.set_option(_ldap.OPT_X_SASL_SSF_MIN, minssf) conn.set_option(_ldap.OPT_X_SASL_SSF_MIN, minssf)
if maxssf < minssf: if maxssf < minssf:
conn.set_option(_ldap.OPT_X_SASL_SSF_MAX, minssf) conn.set_option(_ldap.OPT_X_SASL_SSF_MAX, minssf)
if ccache is not None:
if isinstance(ccache, krbV.CCache):
principal = ccache.principal().name
# Get a fully qualified CCACHE name (schema+name)
# As we do not use the krbV.CCache object later,
# we can safely overwrite it
ccache = "%(type)s:%(name)s" % dict(type=ccache.type,
name=ccache.name)
else:
principal = krbV.CCache(name=ccache,
context=krbV.default_context()).principal().name
os.environ['KRB5CCNAME'] = ccache if ccache is not None:
conn.sasl_interactive_bind_s(None, SASL_GSSAPI, if isinstance(ccache, krbV.CCache):
serverctrls=serverctrls, principal = ccache.principal().name
clientctrls=clientctrls) # Get a fully qualified CCACHE name (schema+name)
setattr(context, 'principal', principal) # As we do not use the krbV.CCache object later,
# we can safely overwrite it
ccache = "%(type)s:%(name)s" % dict(type=ccache.type,
name=ccache.name)
else: else:
# no kerberos ccache, use simple bind or external sasl principal = krbV.CCache(name=ccache,
if autobind: context=krbV.default_context()).principal().name
pent = pwd.getpwuid(os.geteuid())
auth_tokens = _ldap.sasl.external(pent.pw_name) os.environ['KRB5CCNAME'] = ccache
conn.sasl_interactive_bind_s(None, auth_tokens, self.gssapi_bind(server_controls=serverctrls,
serverctrls=serverctrls, client_controls=clientctrls)
clientctrls=clientctrls) setattr(context, 'principal', principal)
else: else:
conn.simple_bind_s(bind_dn, bind_pw, # no kerberos ccache, use simple bind or external sasl
serverctrls=serverctrls, if autobind:
clientctrls=clientctrls) pent = pwd.getpwuid(os.geteuid())
self.external_bind(pent.pw_name,
server_controls=serverctrls,
client_controls=clientctrls)
else:
self.simple_bind(bind_dn, bind_pw,
server_controls=serverctrls,
client_controls=clientctrls)
return conn return conn
def destroy_connection(self): def destroy_connection(self):
"""Disconnect from LDAP server.""" """Disconnect from LDAP server."""
try: try:
self.conn.unbind_s() self.unbind()
except _ldap.LDAPError:
# ignore when trying to unbind multiple times
pass
try:
LDAPClient._disconnect(self) LDAPClient._disconnect(self)
except errors.PublicError: except errors.PublicError:
# ignore when trying to unbind multiple times # ignore when trying to unbind multiple times