External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-29 08:59:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

validate against unencrypted values at spawn point

Browse Source
This commit is contained in:
AlanCoding
2017-12-15 10:47:23 -05:00
parent 74bf058d62
commit 1e1839915d
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/models/mixins.py
View File

@@ -253,7 +253,7 @@ class SurveyJobTemplateMixin(models.Model):
choice_list))
return errors
def _accept_or_ignore_variables(self, data, errors=None, _exclude_errors=()):
def _accept_or_ignore_variables(self, data, errors=None, _exclude_errors=(), extra_passwords=None):
survey_is_enabled = (self.survey_enabled and self.survey_spec)
extra_vars = data.copy()
if errors is None:
@@ -265,8 +265,13 @@ class SurveyJobTemplateMixin(models.Model):
# Check for data violation of survey rules
survey_errors = []
for survey_element in self.survey_spec.get("spec", []):
element_errors = self._survey_element_validation(survey_element, data)
key = survey_element.get('variable', None)
if extra_passwords and key in extra_passwords and data.get(key, None):
element_errors = self._survey_element_validation(survey_element, {
key: decrypt_value(get_encryption_key('value', pk=None), data[key])
})
else:
element_errors = self._survey_element_validation(survey_element, data)
if element_errors:
survey_errors += element_errors