From 701a5c9a368149d81a9119ef809eabdc3ba73faf Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Fri, 2 Mar 2018 11:16:47 -0500 Subject: [PATCH] hides client_secret from act stream --- awx/api/views.py | 8 ++++---- awx/main/utils/common.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 1163f4c332..a5f4a662b3 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -211,7 +211,7 @@ class ApiRootView(APIView): class ApiOAuthAuthorizationRootView(APIView): permission_classes = (AllowAny,) - view_name = _("API OAuth Authorization Root") + view_name = _("API OAuth 2 Authorization Root") versioning_class = None def get(self, request, format=None): @@ -1499,7 +1499,7 @@ class UserMeList(ListAPIView): class OAuth2ApplicationList(ListCreateAPIView): - view_name = _("OAuth Applications") + view_name = _("OAuth 2 Applications") model = OAuth2Application serializer_class = OAuth2ApplicationSerializer @@ -1507,7 +1507,7 @@ class OAuth2ApplicationList(ListCreateAPIView): class OAuth2ApplicationDetail(RetrieveUpdateDestroyAPIView): - view_name = _("OAuth Application Detail") + view_name = _("OAuth 2 Application Detail") model = OAuth2Application serializer_class = OAuth2ApplicationSerializer @@ -1515,7 +1515,7 @@ class OAuth2ApplicationDetail(RetrieveUpdateDestroyAPIView): class ApplicationOAuth2TokenList(SubListCreateAPIView): - view_name = _("OAuth Application Tokens") + view_name = _("OAuth 2 Application Tokens") model = OAuth2AccessToken serializer_class = OAuth2TokenSerializer diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 7572eb3f1c..dde9052b4f 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -335,18 +335,18 @@ def update_scm_url(scm_type, url, username=True, password=True, def get_allowed_fields(obj, serializer_mapping): - from django.contrib.auth.models import User if serializer_mapping is not None and obj.__class__ in serializer_mapping: serializer_actual = serializer_mapping[obj.__class__]() allowed_fields = [x for x in serializer_actual.fields if not serializer_actual.fields[x].read_only] + ['id'] else: allowed_fields = [x.name for x in obj._meta.fields] - - if isinstance(obj, User): + if obj._meta.model_name == 'user': field_blacklist = ['last_login'] allowed_fields = [f for f in allowed_fields if f not in field_blacklist] - + if obj._meta.model_name == 'oauth2application': + field_blacklist = ['client_secret'] + allowed_fields = [f for f in allowed_fields if f not in field_blacklist] return allowed_fields