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

Make sure we check arguments passed to signal start before allowing it

Browse Source 
to proceed.
This commit is contained in:
Matthew Jones
2014-03-13 14:43:47 -04:00
parent 20285e18e5
commit e6209d4d4f
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/inventory.py
View File

@@ -765,6 +765,13 @@ class InventoryUpdate(CommonTask):
return 50 return 50
def signal_start(self, **kwargs): def signal_start(self, **kwargs):
if not self.can_start:
return False
needed = self._get_passwords_needed_to_start()
opts = dict([(field, kwargs.get(field, '')) for field in needed])
if not all(opts.values()):
return False
json_args = json.dumps(kwargs) json_args = json.dumps(kwargs)
self.start_args = json_args self.start_args = json_args
self.save() self.save()

7
awx/main/models/jobs.py
View File

@@ -385,6 +385,13 @@ class Job(CommonTask):
return dependencies return dependencies
def signal_start(self, **kwargs): def signal_start(self, **kwargs):
if not self.can_start:
return False
needed = self._get_passwords_needed_to_start()
opts = dict([(field, kwargs.get(field, '')) for field in needed])
if not all(opts.values()):
return False
json_args = json.dumps(kwargs) json_args = json.dumps(kwargs)
self.start_args = json_args self.start_args = json_args
self.save() self.save()

7
awx/main/models/projects.py
View File

@@ -377,6 +377,13 @@ class ProjectUpdate(CommonTask):
return 20 return 20
def signal_start(self, **kwargs): def signal_start(self, **kwargs):
if not self.can_start:
return False
needed = self._get_passwords_needed_to_start()
opts = dict([(field, kwargs.get(field, '')) for field in needed])
if not all(opts.values()):
return False
json_args = json.dumps(kwargs) json_args = json.dumps(kwargs)
self.start_args = json_args self.start_args = json_args
self.save() self.save()

1
awx/main/tests/tasks.py
View File

@@ -648,7 +648,6 @@ class RunJobTest(BaseCeleryTest):
self.assertFalse(job.passwords_needed_to_start) self.assertFalse(job.passwords_needed_to_start)
self.build_args_callback = self._cancel_job_callback self.build_args_callback = self._cancel_job_callback
self.assertTrue(job.signal_start()) self.assertTrue(job.signal_start())
self.assertEqual(job.status, 'waiting')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.check_job_result(job, 'canceled') self.check_job_result(job, 'canceled')
self.assertEqual(job.cancel_flag, True) self.assertEqual(job.cancel_flag, True)