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

Remove IPAdmin.sasl_interactive_bind_s

Browse Source 
Also, rename remaining uses of SASL_AUTH to SASL_GSSAPI to better
reflect what it is.

Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
This commit is contained in:
Petr Viktorin 2013-01-29 12:01:36 -05:00 committed by Martin Kosek
parent f9f6cd6e3a
commit 1ee66ffe03
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipaserver/dcerpc.py
View File

@ -441,15 +441,12 @@ class DomainValidator(object):
if auth: if auth:
(ccache_name, principal) = self.__kinit_as_trusted_account(info, auth) (ccache_name, principal) = self.__kinit_as_trusted_account(info, auth)
if ccache_name: if ccache_name:
cb_info = dict()
# pass empty dict, SASL GSSAPI is able to get all from the ccache
sasl_auth = _ldap.sasl.sasl(cb_info,'GSSAPI')
old_ccache = os.environ.get('KRB5CCNAME') old_ccache = os.environ.get('KRB5CCNAME')
os.environ["KRB5CCNAME"] = ccache_name os.environ["KRB5CCNAME"] = ccache_name
# OPT_X_SASL_NOCANON is used to avoid hard requirement for PTR # OPT_X_SASL_NOCANON is used to avoid hard requirement for PTR
# records pointing back to the same host name # records pointing back to the same host name
conn.set_option(_ldap.OPT_X_SASL_NOCANON, _ldap.OPT_ON) conn.set_option(_ldap.OPT_X_SASL_NOCANON, _ldap.OPT_ON)
conn.sasl_interactive_bind_s(None, sasl_auth) conn.do_sasl_gssapi_bind()
if basedn is None: if basedn is None:
# Use domain root base DN # Use domain root base DN
basedn = DN(*map(lambda p: ('dc', p), info['dns_domain'].split('.'))) basedn = DN(*map(lambda p: ('dc', p), info['dns_domain'].split('.')))

10
ipaserver/ipaldap.py
View File

@ -41,7 +41,7 @@ from ipapython.ipa_log_manager import log_mgr
from ipapython.dn import DN, RDN from ipapython.dn import DN, RDN
# Global variable to define SASL auth # Global variable to define SASL auth
SASL_AUTH = ldap.sasl.sasl({}, 'GSSAPI') SASL_GSSAPI = ldap.sasl.sasl({}, 'GSSAPI')
DEFAULT_TIMEOUT = 10 DEFAULT_TIMEOUT = 10
DN_SYNTAX_OID = '1.3.6.1.4.1.1466.115.121.1.12' DN_SYNTAX_OID = '1.3.6.1.4.1.1466.115.121.1.12'
@ -1617,12 +1617,12 @@ class IPAdmin(LDAPClient):
def do_sasl_gssapi_bind(self, timeout=DEFAULT_TIMEOUT): def do_sasl_gssapi_bind(self, timeout=DEFAULT_TIMEOUT):
self.__bind_with_wait( self.__bind_with_wait(
self.sasl_interactive_bind_s, timeout, None, SASL_AUTH) self.conn.sasl_interactive_bind_s, timeout, None, SASL_GSSAPI)
def do_external_bind(self, user_name=None, timeout=DEFAULT_TIMEOUT): def do_external_bind(self, user_name=None, timeout=DEFAULT_TIMEOUT):
auth_tokens = ldap.sasl.external(user_name) auth_tokens = ldap.sasl.external(user_name)
self.__bind_with_wait( self.__bind_with_wait(
self.sasl_interactive_bind_s, timeout, None, auth_tokens) self.conn.sasl_interactive_bind_s, timeout, None, auth_tokens)
def updateEntry(self,dn,oldentry,newentry): def updateEntry(self,dn,oldentry,newentry):
# FIXME: for backwards compatibility only # FIXME: for backwards compatibility only
@ -1712,10 +1712,6 @@ class IPAdmin(LDAPClient):
# FIXME: for backwards compatibility only # FIXME: for backwards compatibility only
return self.conn.set_option(*args, **kwargs) return self.conn.set_option(*args, **kwargs)
def sasl_interactive_bind_s(self, *args, **kwargs):
# FIXME: for backwards compatibility only
return self.conn.sasl_interactive_bind_s(*args, **kwargs)
def encode(self, *args, **kwargs): def encode(self, *args, **kwargs):
# FIXME: for backwards compatibility only # FIXME: for backwards compatibility only
return self.conn.encode(*args, **kwargs) return self.conn.encode(*args, **kwargs)

4
ipaserver/plugins/ldap2.py
View File

@ -36,7 +36,7 @@ import krbV
import ldap as _ldap import ldap as _ldap
from ipapython.dn import DN from ipapython.dn import DN
from ipaserver.ipaldap import SASL_AUTH, IPASimpleLDAPObject, LDAPClient from ipaserver.ipaldap import SASL_GSSAPI, IPASimpleLDAPObject, LDAPClient
try: try:
@ -156,7 +156,7 @@ class ldap2(LDAPClient, CrudBackend):
context=krbV.default_context()).principal().name context=krbV.default_context()).principal().name
os.environ['KRB5CCNAME'] = ccache os.environ['KRB5CCNAME'] = ccache
conn.sasl_interactive_bind_s(None, SASL_AUTH) conn.sasl_interactive_bind_s(None, SASL_GSSAPI)
setattr(context, 'principal', principal) setattr(context, 'principal', principal)
else: else:
# no kerberos ccache, use simple bind or external sasl # no kerberos ccache, use simple bind or external sasl