openstack
/
keystone
Code Issues Proposed changes

Revert "Fix python3 compatibility on LDAP search DN from id" 

This reverts commit 79ed42ee67,
which shouldn't have been backported to stable/queens because the
following patch, which switched to bytes_mode=False, doesn't exist
in stable/queens: https://review.opendev.org/#/c/613648/.

Change-Id: I3c0fe74559f1bbf66f717fbaeb1e1dd435e7eb2c
Closes-Bug: #1850634
This commit is contained in:
Corey Bryant 2019-10-30 08:49:24 -04:00
parent 65cb669e78
commit e8b04cc426
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/identity/backends/ldap/common.py
View File

@ -1284,8 +1284,9 @@ class BaseLdap(object):
def _dn_to_id(self, dn):
# Check if the naming attribute in the DN is the same as keystone's
# configured 'id' attribute'. If so, extract the ID value from the DN
if self.id_attr == ldap.dn.str2dn(dn)[0][0][0].lower():
return ldap.dn.str2dn(dn)[0][0][1]
if self.id_attr == utf8_decode(
ldap.dn.str2dn(utf8_encode(dn))[0][0][0].lower()):
return utf8_decode(ldap.dn.str2dn(utf8_encode(dn))[0][0][1])
else:
# The 'ID' attribute is NOT in the DN, so we need to perform an
# LDAP search to look it up from the user entry itself.