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

allow password default reuse with empty default

Browse Source
This commit is contained in:
AlanCoding
2017-12-04 10:46:08 -05:00
parent b987b7daa0
commit d23d7c422d
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/views.py
View File

@@ -2941,9 +2941,15 @@ class JobTemplateSurveySpec(GenericAPIView):
question_position=str(idx), question_type=survey_item["type"])
), status=status.HTTP_400_BAD_REQUEST)
old_element = old_spec_dict.get(survey_item['variable'], {})
if (survey_item['variable'] not in old_spec_dict or 'default' not in old_element or
not old_element['default'].startswith('$encrypted$') or
old_element['default'] == '$encrypted$'):
encryptedish_default_exists = False
if 'default' in old_element:
old_default = old_element['default']
if isinstance(old_default, six.string_types):
if old_default.startswith('$encrypted$'):
encryptedish_default_exists = True
elif old_default == "": # unencrypted blank string is allowed as DB value as special case
encryptedish_default_exists = True
if not encryptedish_default_exists:
return Response(dict(error=_(
"$encrypted$ is a reserved keyword, may not be used for new default in position {question_position}."
).format(question_position=str(idx))), status=status.HTTP_400_BAD_REQUEST)