Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2663 from matrix-org/rav/invalid_request_utf8 

Fix 500 on invalid utf-8 in request
This commit is contained in:
Richard van der Hoff 2017-11-13 18:35:24 +00:00 committed by GitHub
parent ab335edb02 8b33ac8f6c
commit 781c15a6a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/http/servlet.py
View File

@ -167,7 +167,8 @@ def parse_json_value_from_request(request):
try: try:
content = simplejson.loads(content_bytes) content = simplejson.loads(content_bytes)
except simplejson.JSONDecodeError: except Exception as e:
logger.warn("Unable to parse JSON: %s", e)
raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON) raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)
return content return content