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

Fix a problem with a change in results from User.has_usable_password

Browse Source
This commit is contained in:
Jeff Bradberry
2019-07-09 15:59:07 -04:00
parent 210517eeb1
commit 1093a662f1
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/sso/backends.py
View File

@@ -179,7 +179,7 @@ def _decorate_enterprise_user(user, provider):
def _get_or_set_enterprise_user(username, password, provider): def _get_or_set_enterprise_user(username, password, provider):
created = False created = False
try: try:
user = User.objects.all().prefetch_related('enterprise_auth').get(username=username) user = User.objects.prefetch_related('enterprise_auth').get(username=username)
except User.DoesNotExist: except User.DoesNotExist:
user = User(username=username) user = User(username=username)
enterprise_auth = _decorate_enterprise_user(user, provider) enterprise_auth = _decorate_enterprise_user(user, provider)

1
awx/sso/tests/conftest.py
View File

@@ -27,6 +27,7 @@ def existing_tacacsplus_user():
user = User.objects.get(username="foo") user = User.objects.get(username="foo")
except User.DoesNotExist: except User.DoesNotExist:
user = User(username="foo") user = User(username="foo")
user.set_unusable_password()
user.save() user.save()
enterprise_auth = UserEnterpriseAuth(user=user, provider='tacacs+') enterprise_auth = UserEnterpriseAuth(user=user, provider='tacacs+')
enterprise_auth.save() enterprise_auth.save()

7
awx/sso/tests/functional/test_get_or_set_enterprise_user.py
View File

@@ -8,8 +8,11 @@ from awx.sso.backends import _get_or_set_enterprise_user
@pytest.mark.django_db @pytest.mark.django_db
def test_fetch_user_if_exist(existing_tacacsplus_user): def test_fetch_user_if_exist(existing_tacacsplus_user):
new_user = _get_or_set_enterprise_user("foo", "password", "tacacs+") with mock.patch('awx.sso.backends.logger') as mocked_logger:
assert new_user == existing_tacacsplus_user new_user = _get_or_set_enterprise_user("foo", "password", "tacacs+")
mocked_logger.debug.assert_not_called()
mocked_logger.warn.assert_not_called()
assert new_user == existing_tacacsplus_user
@pytest.mark.django_db @pytest.mark.django_db