External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 16:47:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3252 from jangsutsr/2955_update_system_job_start_access

Browse Source 
Update system job start access
This commit is contained in:
Aaron Tan
2016-08-22 12:35:48 -04:00
committed by GitHub
parent 25fa05da81 1365df3d77
commit 0991e213cc
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/views.py
View File

@@ -2245,8 +2245,6 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
if 'credential' not in request.data and 'credential_id' in request.data: if 'credential' not in request.data and 'credential_id' in request.data:
request.data['credential'] = request.data['credential_id'] request.data['credential'] = request.data['credential_id']
@@ -2625,14 +2623,13 @@ class SystemJobTemplateLaunch(GenericAPIView):
model = SystemJobTemplate model = SystemJobTemplate
serializer_class = EmptySerializer serializer_class = EmptySerializer
is_job_start = True
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
return Response({}) return Response({})
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
new_job = obj.create_unified_job(**request.data) new_job = obj.create_unified_job(**request.data)
new_job.signal_start(**request.data) new_job.signal_start(**request.data)
@@ -2739,8 +2736,6 @@ class JobStart(GenericAPIView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
if obj.can_start: if obj.can_start:
result = obj.signal_start(**request.data) result = obj.signal_start(**request.data)
if not result: if not result:
@@ -2778,8 +2773,6 @@ class JobRelaunch(RetrieveAPIView, GenericAPIView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
# Note: is_valid() may modify request.data # Note: is_valid() may modify request.data
# It will remove any key/value pair who's key is not in the 'passwords_needed_to_start' list # It will remove any key/value pair who's key is not in the 'passwords_needed_to_start' list
@@ -3225,8 +3218,6 @@ class AdHocCommandRelaunch(GenericAPIView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
# Re-validate ad hoc command against serializer to check if module is # Re-validate ad hoc command against serializer to check if module is
# still allowed. # still allowed.

16
awx/main/tests/unit/api/decorator_paginated.py
View File

@@ -40,7 +40,9 @@ class PaginatedDecoratorTests(TestCase):
# Ensure the response looks like what it should. # Ensure the response looks like what it should.
r = json.loads(response.rendered_content) r = json.loads(response.rendered_content)
self.assertEqual(r['count'], 26) self.assertEqual(r['count'], 26)
self.assertEqual(r['next'], '/dummy/?page=2&page_size=5') self.assertIn(r['next'],
(u'/dummy/?page=2&page_size=5',
u'/dummy/?page_size=5&page=2'))
self.assertEqual(r['previous'], None) self.assertEqual(r['previous'], None)
self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e']) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e'])
@@ -55,8 +57,12 @@ class PaginatedDecoratorTests(TestCase):
# Ensure the response looks like what it should. # Ensure the response looks like what it should.
r = json.loads(response.rendered_content) r = json.loads(response.rendered_content)
self.assertEqual(r['count'], 26) self.assertEqual(r['count'], 26)
self.assertEqual(r['next'], '/dummy/?page=4&page_size=5') self.assertIn(r['next'],
self.assertEqual(r['previous'], '/dummy/?page=2&page_size=5') (u'/dummy/?page=4&page_size=5',
u'/dummy/?page_size=5&page=4'))
self.assertIn(r['previous'],
(u'/dummy/?page=2&page_size=5',
u'/dummy/?page_size=5&page=2'))
self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e']) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e'])
def test_last_page(self): def test_last_page(self):
@@ -71,5 +77,7 @@ class PaginatedDecoratorTests(TestCase):
r = json.loads(response.rendered_content) r = json.loads(response.rendered_content)
self.assertEqual(r['count'], 26) self.assertEqual(r['count'], 26)
self.assertEqual(r['next'], None) self.assertEqual(r['next'], None)
self.assertEqual(r['previous'], '/dummy/?page=5&page_size=5') self.assertIn(r['previous'],
(u'/dummy/?page=5&page_size=5',
u'/dummy/?page_size=5&page=5'))
self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e']) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e'])