Accords-Library-Archive
/
gallery.accords-library.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server/api: fix decoding JSON

This commit is contained in:
rr- 2016-04-10 15:59:10 +02:00
parent 4faf42ee19
commit 00da04b4d4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/szurubooru/middleware/json_translator.py
View File

@ -32,7 +32,7 @@ class JsonTranslator(object):
request.context.files[key] = form.getvalue(key) request.context.files[key] = form.getvalue(key)
body = form.getvalue('metadata') body = form.getvalue('metadata')
else: else:
body = request.stream.read().decode('utf-8') body = request.stream.read()
if not body: if not body:
raise falcon.HTTPBadRequest( raise falcon.HTTPBadRequest(
@ -40,6 +40,9 @@ class JsonTranslator(object):
'A valid JSON document is required.') 'A valid JSON document is required.')
try: try:
if isinstance(body, bytes):
body = body.decode('utf-8')
request.context.request = json.loads(body) request.context.request = json.loads(body)
except (ValueError, UnicodeDecodeError): except (ValueError, UnicodeDecodeError):
raise falcon.HTTPError( raise falcon.HTTPError(