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

try-except auth_header

Browse Source
This commit is contained in:
adamscmRH 2018-06-21 16:29:40 -04:00
parent 01a1d6ffd0
commit b7f5161835
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
awx/api/authentication.py
View File

@ -46,17 +46,14 @@ class SessionAuthentication(authentication.SessionAuthentication):
class LoggedOAuth2Authentication(OAuth2Authentication):
def authenticate(self, request):
if 'Bearer' in request.META['HTTP_AUTHORIZATION']:
ret = super(LoggedOAuth2Authentication, self).authenticate(request)
if ret:
user, token = ret
username = user.username if user else '<none>'
logger.debug(smart_text(
u"User {} performed a {} to {} through the API using OAuth token {}.".format(
username, request.method, request.path, token.pk
)
))
setattr(user, 'oauth_scopes', [x for x in token.scope.split() if x])
return ret
else:
return None
ret = super(LoggedOAuth2Authentication, self).authenticate(request)
if ret:
user, token = ret
username = user.username if user else '<none>'
logger.info(smart_text(
u"User {} performed a {} to {} through the API using OAuth token {}.".format(
username, request.method, request.path, token.pk
)
))
setattr(user, 'oauth_scopes', [x for x in token.scope.split() if x])
return ret

7
awx/api/generics.py
View File

@ -234,8 +234,11 @@ class APIView(views.APIView):
was attempted.
"""
for authenticator in self.get_authenticators():
resp_hdr = authenticator.authenticate_header(request)
if not resp_hdr:
try:
resp_hdr = authenticator.authenticate_header(request)
if not resp_hdr:
continue
except AttributeError:
continue
req_hdr = get_authorization_header(request)
if not req_hdr: