cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-09 15:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1238 from melck/fix-ldap-ad-nested-member

Browse Source 
Fix LDAP user group search for nested groups #1238
This commit is contained in:
Matt Scott 2023-03-18 16:03:48 -04:00 committed by GitHub
commit defb3e5a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
powerdnsadmin/models/user.py
View File

@ -5,6 +5,7 @@ import bcrypt
import pyotp import pyotp
import ldap import ldap
import ldap.filter import ldap.filter
from collections import OrderedDict
from flask import current_app from flask import current_app
from flask_login import AnonymousUserMixin from flask_login import AnonymousUserMixin
from sqlalchemy import orm from sqlalchemy import orm
@ -283,53 +284,62 @@ class User(db.Model):
LDAP_USER_GROUP)) LDAP_USER_GROUP))
return False return False
elif LDAP_TYPE == 'ad': elif LDAP_TYPE == 'ad':
ldap_admin_group_filter, ldap_operator_group, ldap_user_group = "", "", "" ldap_group_security_roles = OrderedDict(
if LDAP_ADMIN_GROUP: Administrator=LDAP_ADMIN_GROUP,
ldap_admin_group_filter = "(memberOf:1.2.840.113556.1.4.1941:={0})".format(LDAP_ADMIN_GROUP) Operator=LDAP_OPERATOR_GROUP,
if LDAP_OPERATOR_GROUP: User=LDAP_USER_GROUP,
ldap_operator_group = "(memberOf:1.2.840.113556.1.4.1941:={0})".format(LDAP_OPERATOR_GROUP) )
if LDAP_USER_GROUP: user_dn = ldap_result[0][0][0]
ldap_user_group = "(memberOf:1.2.840.113556.1.4.1941:={0})".format(LDAP_USER_GROUP) sf_groups = ""
searchFilter = "(&({0}={1})(|{2}{3}{4}))".format(LDAP_FILTER_USERNAME, self.username,
ldap_admin_group_filter,
ldap_operator_group, ldap_user_group)
ldap_result = self.ldap_search(searchFilter, LDAP_BASE_DN)
user_ad_member_of = ldap_result[0][0][1].get(
'memberOf')
if not user_ad_member_of: for group in ldap_group_security_roles.values():
if not group:
continue
sf_groups += f"(distinguishedName={group})"
sf_member_user = f"(member:1.2.840.113556.1.4.1941:={user_dn})"
search_filter = f"(&(|{sf_groups}){sf_member_user})"
current_app.logger.debug(f"LDAP groupSearchFilter '{search_filter}'")
ldap_user_groups = [
group[0][0]
for group in self.ldap_search(
search_filter,
LDAP_BASE_DN
)
]
if not ldap_user_groups:
current_app.logger.error( current_app.logger.error(
'User {0} does not belong to any group while LDAP_GROUP_SECURITY_ENABLED is ON' f"User '{self.username}' "
.format(self.username)) "does not belong to any group "
"while LDAP_GROUP_SECURITY_ENABLED is ON"
)
return False return False
user_ad_member_of = [g.decode("utf-8") for g in user_ad_member_of] current_app.logger.debug(
"LDAP User security groups "
f"for user '{self.username}': "
" ".join(ldap_user_groups)
)
if (LDAP_ADMIN_GROUP in user_ad_member_of): for role, ldap_group in ldap_group_security_roles.items():
role_name = 'Administrator' # Continue when groups is not defined or
# user is'nt member of LDAP group
if not ldap_group or not ldap_group in ldap_user_groups:
continue
role_name = role
current_app.logger.info( current_app.logger.info(
'User {0} is part of the "{1}" group that allows admin access to PowerDNS-Admin' f"User '{self.username}' member of "
.format(self.username, f"the '{ldap_group}' group that allows "
LDAP_ADMIN_GROUP)) f"'{role}' access to to PowerDNS-Admin"
elif (LDAP_OPERATOR_GROUP in user_ad_member_of): )
role_name = 'Operator'
current_app.logger.info( # Stop loop on first found
'User {0} is part of the "{1}" group that allows operator access to PowerDNS-Admin' break
.format(self.username,
LDAP_OPERATOR_GROUP))
elif (LDAP_USER_GROUP in user_ad_member_of):
current_app.logger.info(
'User {0} is part of the "{1}" group that allows user access to PowerDNS-Admin'
.format(self.username,
LDAP_USER_GROUP))
else:
current_app.logger.error(
'User {0} is not part of the "{1}", "{2}" or "{3}" groups that allow access to PowerDNS-Admin'
.format(self.username,
LDAP_ADMIN_GROUP,
LDAP_OPERATOR_GROUP,
LDAP_USER_GROUP))
return False
else: else:
current_app.logger.error('Invalid LDAP type') current_app.logger.error('Invalid LDAP type')
return False return False