openstack
/
keystone
Code Issues Proposed changes

Fix python3 compatibility on LDAP search DN from id 

In Python 3, python-ldap no longer allows bytes for some fields (DNs,
RDNs, attribute names, queries). Instead, text values are represented
as str, the Unicode text type.

[1] More details about byte/str usage in python-ldap can be found at:
http://www.python-ldap.org/en/latest/bytes_mode.html#bytes-mode

Change-Id: I63e3715032cd8edb11fbff7651f5ba1af506dc9d
Related-Bug: #1798184
(cherry picked from commit 03531a5691)
This commit is contained in:
Raildo Mascena 2019-07-24 10:20:17 -03:00 committed by Lance Bragstad
parent 9d9451e13c
commit 79ed42ee67
1 changed files with 2 additions and 3 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,9 +1284,8 @@ 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 == utf8_decode(
ldap.dn.str2dn(utf8_encode(dn))[0][0][0].lower()):
return utf8_decode(ldap.dn.str2dn(utf8_encode(dn))[0][0][1])
if self.id_attr == ldap.dn.str2dn(dn)[0][0][0].lower():
return ldap.dn.str2dn(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.