try-except auth_header

awx/api/authentication.py

@@ -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)
-            ret = super(LoggedOAuth2Authentication, self).authenticate(request)
+        if ret:
-            if ret:
+            user, token = ret
-                user, token = ret
+            username = user.username if user else '<none>'
-                username = user.username if user else '<none>'
+            logger.info(smart_text(
-                logger.debug(smart_text(
+                u"User {} performed a {} to {} through the API using OAuth token {}.".format(
-                    u"User {} performed a {} to {} through the API using OAuth token {}.".format(
+                    username, request.method, request.path, token.pk
-                        username, request.method, request.path, token.pk
+                )
-                    )
+            ))
-                ))
+            setattr(user, 'oauth_scopes', [x for x in token.scope.split() if x])
-                setattr(user, 'oauth_scopes', [x for x in token.scope.split() if x])
+        return ret
-            return ret
-        else:
-            return None

awx/api/generics.py

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