External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-28 21:25:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

mask the default value for survey_spec password fields

Browse Source
This commit is contained in:
Wayne Witzel III
2017-01-24 13:03:57 -05:00
parent 7c8896a96e
commit cf6c4fe7ac
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,10 @@ class SurveyJobTemplateMixin(models.Model):
# Overwrite with job template extra vars with survey default vars
if self.survey_enabled and 'spec' in self.survey_spec:
for survey_element in self.survey_spec.get("spec", []):
if 'default' in survey_element and survey_element['default']:
extra_vars[survey_element['variable']] = survey_element['default']
if survey_element.get('type') == 'password':
if 'default' in survey_element and survey_element['default'].startswith('$encrypted$'):
continue
extra_vars[survey_element['variable']] = survey_element['default']
# transform to dict
if 'extra_vars' in kwargs:
@@ -148,6 +150,7 @@ class SurveyJobTemplateMixin(models.Model):
if 'max' in survey_element and survey_element['max'] not in ["", None] and len(data[survey_element['variable']]) > int(survey_element['max']):
errors.append("'%s' value %s is too large (must be no more than %s)." %
(survey_element['variable'], data[survey_element['variable']], survey_element['max']))
elif survey_element['type'] == 'integer':
if survey_element['variable'] in data:
if type(data[survey_element['variable']]) != int: