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

Merge pull request #455 from wwitzel3/release_3.2.0

Browse Source 
Various SAML / auth fixes.
This commit is contained in:
Wayne Witzel III
2017-09-22 16:10:49 -04:00
committed by GitHub
parent b2b45ddeda e9e027ecd7
commit 9e9692971f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/organization.py
View File

@@ -236,7 +236,9 @@ class AuthToken(BaseModel):
valid_n_tokens_qs = self.user.auth_tokens.filter( valid_n_tokens_qs = self.user.auth_tokens.filter(
expires__gt=now, expires__gt=now,
reason='', reason='',
).order_by('-created')[0:settings.AUTH_TOKEN_PER_USER] ).order_by('-created')
if settings.AUTH_TOKEN_PER_USER != -1:
valid_n_tokens_qs = valid_n_tokens_qs[0:settings.AUTH_TOKEN_PER_USER]
valid_n_tokens = valid_n_tokens_qs.values_list('key', flat=True) valid_n_tokens = valid_n_tokens_qs.values_list('key', flat=True)
return bool(self.key in valid_n_tokens) return bool(self.key in valid_n_tokens)

5
awx/sso/backends.py
View File

@@ -136,8 +136,9 @@ class LDAPBackend(BaseLDAPBackend):
def _decorate_enterprise_user(user, provider): def _decorate_enterprise_user(user, provider):
user.set_unusable_password() user.set_unusable_password()
user.save() user.save()
enterprise_auth = UserEnterpriseAuth(user=user, provider=provider) enterprise_auth, created = UserEnterpriseAuth.objects.get_or_create(user=user, provider=provider)
enterprise_auth.save() if created:
enterprise_auth.save()
return enterprise_auth return enterprise_auth