External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1429 from AlanCoding/invalid_dragon

Browse Source 
prevent server error with CT unicode keys
This commit is contained in:
Alan Rominger
2018-04-19 13:51:58 -04:00
committed by GitHub
parent a7ecc306e1 f78037c0f3
commit 3798decafc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/fields.py
View File

@@ -405,7 +405,7 @@ class JSONSchemaField(JSONBField):
error.message = re.sub(r'\bu(\'|")', r'\1', error.message) error.message = re.sub(r'\bu(\'|")', r'\1', error.message)
if error.validator == 'pattern' and 'error' in error.schema: if error.validator == 'pattern' and 'error' in error.schema:
error.message = error.schema['error'].format(instance=error.instance) error.message = six.text_type(error.schema['error']).format(instance=error.instance)
elif error.validator == 'type': elif error.validator == 'type':
expected_type = error.validator_value expected_type = error.validator_value
if expected_type == 'object': if expected_type == 'object':
@@ -551,7 +551,7 @@ class CredentialInputField(JSONSchemaField):
format_checker=self.format_checker format_checker=self.format_checker
).iter_errors(decrypted_values): ).iter_errors(decrypted_values):
if error.validator == 'pattern' and 'error' in error.schema: if error.validator == 'pattern' and 'error' in error.schema:
error.message = error.schema['error'].format(instance=error.instance) error.message = six.text_type(error.schema['error']).format(instance=error.instance)
if error.validator == 'dependencies': if error.validator == 'dependencies':
# replace the default error messaging w/ a better i18n string # replace the default error messaging w/ a better i18n string
# I wish there was a better way to determine the parameters of # I wish there was a better way to determine the parameters of