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

Merge pull request #211 from jangsutsr/fix_114

Browse Source 
Add Tower Configuration setting AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR
This commit is contained in:
Aaron Tan
2017-09-19 13:28:30 -04:00
committed by GitHub
parent b46c6e4aad d271757eba
commit ee762d4bbd
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/sso/conf.py
View File

@@ -293,6 +293,17 @@ register(
default='MemberDNGroupType', default='MemberDNGroupType',
) )
register(
'AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR',
field_class=fields.CharField,
default='member',
label=_('LDAP Group Type Member Attribute'),
help_text=_('Specify member_attr when AUTH_LDAP_GROUP_TYPE=MemberDNGroupType.'),
category=_('LDAP'),
category_slug='ldap',
feature_required='ldap',
)
register( register(
'AUTH_LDAP_REQUIRE_GROUP', 'AUTH_LDAP_REQUIRE_GROUP',
field_class=fields.LDAPDNField, field_class=fields.LDAPDNField,

3
awx/sso/fields.py
View File

@@ -323,7 +323,8 @@ class LDAPGroupTypeField(fields.ChoiceField):
if not data: if not data:
return None return None
if data.endswith('MemberDNGroupType'): if data.endswith('MemberDNGroupType'):
return getattr(django_auth_ldap.config, data)(member_attr='member') from django.conf import settings
return getattr(django_auth_ldap.config, data)(member_attr=settings.AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR)
else: else:
return getattr(django_auth_ldap.config, data)() return getattr(django_auth_ldap.config, data)()