External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 20:07:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #511 from cchurch/ldap-filter-dash-support

Browse Source 
[3.2.2] Support dash in LDAP attribute names in filters.
This commit is contained in:
Chris Church
2017-10-09 14:10:58 -04:00
committed by Matthew Jones
parent 7b792926eb c067788428
commit 2b539cab85
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/sso/tests/unit/test_ldap.py
View File

@@ -1,6 +1,7 @@
import ldap import ldap
from awx.sso.backends import LDAPSettings from awx.sso.backends import LDAPSettings
from awx.sso.validators import validate_ldap_filter
def test_ldap_default_settings(mocker): def test_ldap_default_settings(mocker):
@@ -19,3 +20,7 @@ def test_ldap_default_network_timeout(mocker):
ldap.OPT_REFERRALS: 0, ldap.OPT_REFERRALS: 0,
ldap.OPT_NETWORK_TIMEOUT: 30 ldap.OPT_NETWORK_TIMEOUT: 30
} }
def test_ldap_filter_validator():
validate_ldap_filter('(test-uid=%(user)s)', with_user=True)

2
awx/sso/validators.py
View File

@@ -47,7 +47,7 @@ def validate_ldap_filter(value, with_user=False):
dn_value = value.replace('%(user)s', 'USER') dn_value = value.replace('%(user)s', 'USER')
else: else:
dn_value = value dn_value = value
if re.match(r'^\([A-Za-z0-9]+?=[^()]+?\)$', dn_value): if re.match(r'^\([A-Za-z0-9-]+?=[^()]+?\)$', dn_value):
return return
elif re.match(r'^\([&|!]\(.*?\)\)$', dn_value): elif re.match(r'^\([&|!]\(.*?\)\)$', dn_value):
try: try: