External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1378 from rooftopcellist/no_patch_app

Browse Source 
disallow changing token-app
This commit is contained in:
Christian Adams
2018-03-09 10:33:24 -05:00
committed by GitHub
parent 181af03ab9 91c0f2da6f
commit cee12c4e6c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/serializers.py
View File

@@ -939,7 +939,6 @@ class UserAuthorizedTokenSerializer(BaseSerializer):
'expires', 'scope', 'application', 'expires', 'scope', 'application',
) )
read_only_fields = ('user', 'token', 'expires') read_only_fields = ('user', 'token', 'expires')
read_only_on_update_fields = ('application',)
def get_token(self, obj): def get_token(self, obj):
request = self.context.get('request', None) request = self.context.get('request', None)
@@ -1106,6 +1105,12 @@ class OAuth2TokenSerializer(BaseSerializer):
return obj return obj
class OAuth2TokenDetailSerializer(OAuth2TokenSerializer):
class Meta:
read_only_fields = ('*', 'user', 'application')
class OAuth2AuthorizedTokenSerializer(BaseSerializer): class OAuth2AuthorizedTokenSerializer(BaseSerializer):
refresh_token = serializers.SerializerMethodField() refresh_token = serializers.SerializerMethodField()
@@ -1118,7 +1123,6 @@ class OAuth2AuthorizedTokenSerializer(BaseSerializer):
'expires', 'scope', 'application', 'expires', 'scope', 'application',
) )
read_only_fields = ('user', 'token', 'expires') read_only_fields = ('user', 'token', 'expires')
read_only_on_update_fields = ('application',)
def get_token(self, obj): def get_token(self, obj):
request = self.context.get('request', None) request = self.context.get('request', None)
@@ -1171,8 +1175,7 @@ class OAuth2PersonalTokenSerializer(BaseSerializer):
'*', '-name', 'description', 'user', 'token', 'refresh_token', '*', '-name', 'description', 'user', 'token', 'refresh_token',
'application', 'expires', 'scope', 'application', 'expires', 'scope',
) )
read_only_fields = ('user', 'token', 'expires') read_only_fields = ('user', 'token', 'expires', 'application')
read_only_on_update_fields = ('application',)
def get_modified(self, obj): def get_modified(self, obj):
if obj is None: if obj is None:

2
awx/api/views.py
View File

@@ -1587,7 +1587,7 @@ class OAuth2TokenDetail(RetrieveUpdateDestroyAPIView):
view_name = _("OAuth Token Detail") view_name = _("OAuth Token Detail")
model = OAuth2AccessToken model = OAuth2AccessToken
serializer_class = OAuth2TokenSerializer serializer_class = OAuth2TokenDetailSerializer
class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView): class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):