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

add protection for job-compatible vars

Browse Source
This commit is contained in:
AlanCoding
2018-04-17 15:46:48 -04:00
parent 2db44cbf17
commit c397cacea5
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/utils/common.py
View File

@@ -630,8 +630,16 @@ def parse_yaml_or_json(vars_str, silent_failure=True):
vars_dict = yaml.safe_load(vars_str)
# Can be None if '---'
if vars_dict is None:
return {}
vars_dict = {}
validate_vars_type(vars_dict)
if not silent_failure:
# is valid YAML, check that it is compatible with JSON
try:
json.dumps(vars_dict)
except (ValueError, TypeError, AssertionError) as json_err2:
raise ParseError(_(
'Variables not compatible with JSON standard (error: {json_error})').format(
json_error=str(json_err2)))
except (yaml.YAMLError, TypeError, AttributeError, AssertionError) as yaml_err:
if silent_failure:
return {}