zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-21 07:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4915 from wwitzel3/issue-4636

Browse Source 
Mask the default value for password fields in survey_spec.
This commit is contained in:
Wayne Witzel III
2017-01-27 02:37:16 -05:00
committed by GitHub
parent 6df36ce038 df9bb829fc
commit 7807ee09f9
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/api/views.py
View File

@@ -2421,7 +2421,13 @@ class JobTemplateSurveySpec(GenericAPIView):
if not feature_enabled('surveys'):
raise LicenseForbids(_('Your license does not allow '
'adding surveys.'))
return Response(obj.survey_spec)
survey_spec = obj.survey_spec
for pos, field in enumerate(survey_spec.get('spec', [])):
if field.get('type') == 'password':
if 'default' in field and field['default']:
field['default'] = '$encrypted$'
return Response(survey_spec)
def post(self, request, *args, **kwargs):
obj = self.get_object()
@@ -2445,6 +2451,7 @@ class JobTemplateSurveySpec(GenericAPIView):
return Response(dict(error=_("'spec' must be a list of items.")), status=status.HTTP_400_BAD_REQUEST)
if len(new_spec["spec"]) < 1:
return Response(dict(error=_("'spec' doesn't contain any items.")), status=status.HTTP_400_BAD_REQUEST)
idx = 0
variable_set = set()
for survey_item in new_spec["spec"]:
@@ -2463,7 +2470,15 @@ class JobTemplateSurveySpec(GenericAPIView):
variable_set.add(survey_item['variable'])
if "required" not in survey_item:
return Response(dict(error=_("'required' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
if survey_item["type"] == "password":
if "default" in survey_item and survey_item["default"].startswith('$encrypted$'):
old_spec = obj.survey_spec
for old_item in old_spec['spec']:
if old_item['variable'] == survey_item['variable']:
survey_item['default'] = old_item['default']
idx += 1
obj.survey_spec = new_spec
obj.save(update_fields=['survey_spec'])
return Response()