cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-12-04 19:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected a mistake with the new LDAP search filter cleansing that broke LDAP altogether. Moved the filtering to only target the user DN with Active Directory LDAP connections.

Browse Source
This commit is contained in:
Matt Scott 2023-12-08 06:17:34 -05:00
parent 7b6aafbb2c
commit 59a32a148f
No known key found for this signature in database
GPG Key ID: A9A0AFFC0E079001
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerdnsadmin/models/user.py
View File

@ -146,8 +146,6 @@ class User(db.Model):
def ldap_search(self, searchFilter, baseDN, retrieveAttributes=None): def ldap_search(self, searchFilter, baseDN, retrieveAttributes=None):
searchScope = ldap.SCOPE_SUBTREE searchScope = ldap.SCOPE_SUBTREE
searchFilter = self.escape_filter_chars(searchFilter)
try: try:
conn = self.ldap_init_conn() conn = self.ldap_init_conn()
if Setting().get('ldap_type') == 'ad': if Setting().get('ldap_type') == 'ad':
@ -292,7 +290,7 @@ class User(db.Model):
Operator=LDAP_OPERATOR_GROUP, Operator=LDAP_OPERATOR_GROUP,
User=LDAP_USER_GROUP, User=LDAP_USER_GROUP,
) )
user_dn = ldap_result[0][0][0] user_dn = self.escape_filter_chars(ldap_result[0][0][0])
sf_groups = "" sf_groups = ""
for group in ldap_group_security_roles.values(): for group in ldap_group_security_roles.values():