openstack/heat-dashboard
Code Issues Proposed changes

Merge "Enforces unicode decoding of data"

Browse Source
This commit is contained in:
Zuul 2019-09-02 11:12:19 +00:00 committed by Gerrit Code Review
commit de7f249adb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat_dashboard/content/stacks/forms.py
View File

@ -203,16 +203,16 @@ class TemplateForm(forms.SelfHandlingForm):
log_template_name = files[upload_str].name log_template_name = files[upload_str].name
LOG.info('got upload %s', log_template_name) LOG.info('got upload %s', log_template_name)
tpl = files[upload_str].read()
if tpl.startswith('{'):
try: try:
tpl = files[upload_str].read().decode('utf-8')
if tpl.startswith('{'):
json.loads(tpl) json.loads(tpl)
cleaned[data_str] = tpl
except Exception as e: except Exception as e:
msg = _('There was a problem parsing the' msg = _('There was a problem parsing the'
' %(prefix)s: %(error)s') ' %(prefix)s: %(error)s')
msg = msg % {'prefix': prefix, 'error': six.text_type(e)} msg = msg % {'prefix': prefix, 'error': six.text_type(e)}
raise forms.ValidationError(msg) raise forms.ValidationError(msg)
cleaned[data_str] = tpl
# URL handler # URL handler
elif url and (has_upload or data): elif url and (has_upload or data):

4
heat_dashboard/test/tests/content/test_stacks.py
View File

@ -918,7 +918,7 @@ class TemplateFormTests(test.TestCase):
} }
json_str = '{notvalidjson::::::json/////json' json_str = '{notvalidjson::::::json/////json'
files = {'template_upload': files = {'template_upload':
self.SimpleFile('template_name', json_str)} self.SimpleFile('template_name', json_str.encode('utf-8'))}
self.assertRaises( self.assertRaises(
exceptions.ValidationError, exceptions.ValidationError,
@ -937,7 +937,7 @@ class TemplateFormTests(test.TestCase):
json_str = '{"isvalid":"json"}' json_str = '{"isvalid":"json"}'
files = {'template_upload': files = {'template_upload':
self.SimpleFile('template_name', json_str)} self.SimpleFile('template_name', json_str.encode('utf-8'))}
t.clean_uploaded_files('template', 'template', precleaned, files) t.clean_uploaded_files('template', 'template', precleaned, files)
self.assertEqual( self.assertEqual(