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

Merge pull request #463 from jangsutsr/7666-fix

Browse Source 
Restore SAML enterprise user auth logic
This commit is contained in:
Aaron Tan
2017-09-26 10:03:08 -04:00
committed by GitHub
parent a6e6298575 9bae656676
commit 723f4b0a7a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/sso/backends.py
View File

@@ -266,16 +266,12 @@ class SAMLAuth(BaseSAMLAuth):
if not feature_enabled('enterprise_auth'): if not feature_enabled('enterprise_auth'):
logger.error("Unable to authenticate, license does not support SAML authentication") logger.error("Unable to authenticate, license does not support SAML authentication")
return None return None
created = False
try:
user = User.objects.get(username=kwargs.get('username', ''))
if user and not user.is_in_enterprise_category('saml'):
return None
except User.DoesNotExist:
created = True
user = super(SAMLAuth, self).authenticate(*args, **kwargs) user = super(SAMLAuth, self).authenticate(*args, **kwargs)
if user and created: # Comes from https://github.com/omab/python-social-auth/blob/v0.2.21/social/backends/base.py#L91
if getattr(user, 'is_new', False):
_decorate_enterprise_user(user, 'saml') _decorate_enterprise_user(user, 'saml')
elif user and not user.is_in_enterprise_category('saml'):
return None
return user return user
def get_user(self, user_id): def get_user(self, user_id):