External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-05 01:59:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4901 from ryanpetrello/release_3.1.0

Browse Source 
allow certain LDAP settings fields to be nullable
This commit is contained in:
Ryan Petrello
2017-01-24 11:01:31 -05:00
committed by GitHub
parent f0e61671a6 0bcbaa5c86
commit b917ffbc63
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tests/functional/api/test_settings.py
View File

@@ -96,10 +96,15 @@ def test_empty_ldap_dn(get, put, patch, delete, admin, enterprise_license,
setting): setting):
url = reverse('api:setting_singleton_detail', args=('ldap',)) url = reverse('api:setting_singleton_detail', args=('ldap',))
Setting.objects.create(key='LICENSE', value=enterprise_license) Setting.objects.create(key='LICENSE', value=enterprise_license)
patch(url, user=admin, data={setting: ''}, expect=200) patch(url, user=admin, data={setting: ''}, expect=200)
resp = get(url, user=admin, expect=200) resp = get(url, user=admin, expect=200)
assert resp.data[setting] is None assert resp.data[setting] is None
patch(url, user=admin, data={setting: None}, expect=200)
resp = get(url, user=admin, expect=200)
assert resp.data[setting] is None
@pytest.mark.django_db @pytest.mark.django_db
def test_radius_settings(get, put, patch, delete, admin, enterprise_license, settings): def test_radius_settings(get, put, patch, delete, admin, enterprise_license, settings):

3
awx/sso/conf.py
View File

@@ -269,6 +269,7 @@ register(
'AUTH_LDAP_USER_DN_TEMPLATE', 'AUTH_LDAP_USER_DN_TEMPLATE',
field_class=fields.LDAPDNWithUserField, field_class=fields.LDAPDNWithUserField,
allow_blank=True, allow_blank=True,
allow_null=True,
default='', default='',
label=_('LDAP User DN Template'), label=_('LDAP User DN Template'),
help_text=_('Alternative to user search, if user DNs are all of the same ' help_text=_('Alternative to user search, if user DNs are all of the same '
@@ -338,6 +339,7 @@ register(
'AUTH_LDAP_REQUIRE_GROUP', 'AUTH_LDAP_REQUIRE_GROUP',
field_class=fields.LDAPDNField, field_class=fields.LDAPDNField,
allow_blank=True, allow_blank=True,
allow_null=True,
default='', default='',
label=_('LDAP Require Group'), label=_('LDAP Require Group'),
help_text=_('Group DN required to login. If specified, user must be a member ' help_text=_('Group DN required to login. If specified, user must be a member '
@@ -354,6 +356,7 @@ register(
'AUTH_LDAP_DENY_GROUP', 'AUTH_LDAP_DENY_GROUP',
field_class=fields.LDAPDNField, field_class=fields.LDAPDNField,
allow_blank=True, allow_blank=True,
allow_null=True,
default='', default='',
label=_('LDAP Deny Group'), label=_('LDAP Deny Group'),
help_text=_('Group DN denied from login. If specified, user will not be ' help_text=_('Group DN denied from login. If specified, user will not be '