pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplifies the search of the LDAP user name by adding to the user's search condition directly in the existing search filter.

pull/35/head
Romulo Rodriguez 2020-08-24 12:47:09 +05:30 committed by Akshay Joshi
parent 52d0241a17
commit e6bd085c15
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/pgadmin/authenticate/ldap.py
View File

@ -225,8 +225,14 @@ class LDAPAuthentication(BaseAuthentication):
elif not search_base_dn or search_base_dn == '<Search-Base-DN>':
search_base_dn = config.LDAP_BASE_DN
search_filter = "({0}={1})".format(config.LDAP_USERNAME_ATTRIBUTE,
self.username)
if config.LDAP_SEARCH_FILTER:
search_filter = "(&{0}{1})".format(search_filter,
config.LDAP_SEARCH_FILTER)
self.conn.search(search_base=search_base_dn,
search_filter=config.LDAP_SEARCH_FILTER,
search_filter=search_filter,
search_scope=config.LDAP_SEARCH_SCOPE,
attributes=ALL_ATTRIBUTES
)
@ -247,9 +253,11 @@ class LDAPAuthentication(BaseAuthentication):
)
return False, ERROR_SEARCHING_LDAP_DIRECTORY.format(e.args[0])
for entry in self.conn.entries:
if config.LDAP_USERNAME_ATTRIBUTE in entry and self.username == \
entry[config.LDAP_USERNAME_ATTRIBUTE].value:
return True, entry
return False, ERROR_SEARCHING_LDAP_DIRECTORY.format(
"Could not find the specified user.")
results = len(self.conn.entries)
if results > 1:
return False, ERROR_SEARCHING_LDAP_DIRECTORY.format(
"More than one result found.")
elif results < 1:
return False, ERROR_SEARCHING_LDAP_DIRECTORY.format(
"Could not find the specified user.")
return True, self.conn.entries[0]