External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2810 from rooftopcellist/hide_app_client_secret

Browse Source 
hide client_secret from API
This commit is contained in:
Christian Adams
2018-08-09 17:44:12 -04:00
committed by GitHub
parent 5f0b34de38 1bc83b488b
commit 71beb9a257
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/serializers.py
View File

@@ -44,7 +44,7 @@ from awx.main.constants import (
SCHEDULEABLE_PROVIDERS, SCHEDULEABLE_PROVIDERS,
ANSI_SGR_PATTERN, ANSI_SGR_PATTERN,
ACTIVE_STATES, ACTIVE_STATES,
TOKEN_CENSOR, CENSOR_VALUE,
CHOICES_PRIVILEGE_ESCALATION_METHODS, CHOICES_PRIVILEGE_ESCALATION_METHODS,
) )
from awx.main.models import * # noqa from awx.main.models import * # noqa
@@ -1021,7 +1021,7 @@ class BaseOAuth2TokenSerializer(BaseSerializer):
if request.method == 'POST': if request.method == 'POST':
return obj.token return obj.token
else: else:
return TOKEN_CENSOR return CENSOR_VALUE
except ObjectDoesNotExist: except ObjectDoesNotExist:
return '' return ''
@@ -1033,7 +1033,7 @@ class BaseOAuth2TokenSerializer(BaseSerializer):
elif request.method == 'POST': elif request.method == 'POST':
return getattr(obj.refresh_token, 'token', '') return getattr(obj.refresh_token, 'token', '')
else: else:
return TOKEN_CENSOR return CENSOR_VALUE
except ObjectDoesNotExist: except ObjectDoesNotExist:
return None return None
@@ -1181,6 +1181,9 @@ class OAuth2ApplicationSerializer(BaseSerializer):
def to_representation(self, obj): def to_representation(self, obj):
ret = super(OAuth2ApplicationSerializer, self).to_representation(obj) ret = super(OAuth2ApplicationSerializer, self).to_representation(obj)
request = self.context.get('request', None)
if request.method != 'POST' and obj.client_type == 'confidential':
ret['client_secret'] = CENSOR_VALUE
if obj.client_type == 'public': if obj.client_type == 'public':
ret.pop('client_secret', None) ret.pop('client_secret', None)
return ret return ret
@@ -1201,7 +1204,7 @@ class OAuth2ApplicationSerializer(BaseSerializer):
return obj.updated return obj.updated
def _summary_field_tokens(self, obj): def _summary_field_tokens(self, obj):
token_list = [{'id': x.pk, 'token': TOKEN_CENSOR, 'scope': x.scope} for x in obj.oauth2accesstoken_set.all()[:10]] token_list = [{'id': x.pk, 'token': CENSOR_VALUE, 'scope': x.scope} for x in obj.oauth2accesstoken_set.all()[:10]]
if has_model_field_prefetched(obj, 'oauth2accesstoken_set'): if has_model_field_prefetched(obj, 'oauth2accesstoken_set'):
token_count = len(obj.oauth2accesstoken_set.all()) token_count = len(obj.oauth2accesstoken_set.all())
else: else:

4
awx/api/views.py
View File

@@ -1601,6 +1601,10 @@ class OAuth2ApplicationDetail(RetrieveUpdateDestroyAPIView):
serializer_class = OAuth2ApplicationSerializer serializer_class = OAuth2ApplicationSerializer
swagger_topic = 'Authentication' swagger_topic = 'Authentication'
def update_raw_data(self, data):
data.pop('client_secret', None)
return super(OAuth2ApplicationDetail, self).update_raw_data(data)
class ApplicationOAuth2TokenList(SubListCreateAPIView): class ApplicationOAuth2TokenList(SubListCreateAPIView):

2
awx/main/constants.py
View File

@@ -28,4 +28,4 @@ STANDARD_INVENTORY_UPDATE_ENV = {
} }
CAN_CANCEL = ('new', 'pending', 'waiting', 'running') CAN_CANCEL = ('new', 'pending', 'waiting', 'running')
ACTIVE_STATES = CAN_CANCEL ACTIVE_STATES = CAN_CANCEL
TOKEN_CENSOR = '************' CENSOR_VALUE = '************'

6
awx/main/signals.py
View File

@@ -33,7 +33,7 @@ import six
# AWX # AWX
from awx.main.models import * # noqa from awx.main.models import * # noqa
from awx.api.serializers import * # noqa from awx.api.serializers import * # noqa
from awx.main.constants import TOKEN_CENSOR from awx.main.constants import CENSOR_VALUE
from awx.main.utils import model_instance_diff, model_to_dict, camelcase_to_underscore, get_current_apps from awx.main.utils import model_instance_diff, model_to_dict, camelcase_to_underscore, get_current_apps
from awx.main.utils import ignore_inventory_computed_fields, ignore_inventory_group_removal, _inventory_updates from awx.main.utils import ignore_inventory_computed_fields, ignore_inventory_group_removal, _inventory_updates
from awx.main.tasks import update_inventory_computed_fields from awx.main.tasks import update_inventory_computed_fields
@@ -428,7 +428,7 @@ def activity_stream_create(sender, instance, created, **kwargs):
if 'extra_vars' in changes: if 'extra_vars' in changes:
changes['extra_vars'] = instance.display_extra_vars() changes['extra_vars'] = instance.display_extra_vars()
if type(instance) == OAuth2AccessToken: if type(instance) == OAuth2AccessToken:
changes['token'] = TOKEN_CENSOR changes['token'] = CENSOR_VALUE
activity_entry = get_activity_stream_class()( activity_entry = get_activity_stream_class()(
operation='create', operation='create',
object1=object1, object1=object1,
@@ -495,7 +495,7 @@ def activity_stream_delete(sender, instance, **kwargs):
changes = model_to_dict(instance) changes = model_to_dict(instance)
object1 = camelcase_to_underscore(instance.__class__.__name__) object1 = camelcase_to_underscore(instance.__class__.__name__)
if type(instance) == OAuth2AccessToken: if type(instance) == OAuth2AccessToken:
changes['token'] = TOKEN_CENSOR changes['token'] = CENSOR_VALUE
activity_entry = get_activity_stream_class()( activity_entry = get_activity_stream_class()(
operation='delete', operation='delete',
changes=json.dumps(changes), changes=json.dumps(changes),