Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix 500 on invalid utf-8 in request #2663

Merged
merged 2 commits into from
Nov 13, 2017
Merged

Fix 500 on invalid utf-8 in request #2663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90649e
Fix 500 on invalid utf-8 in request
richvdh Nov 10, 2017
8b33ac8
Merge branch 'develop' into rav/invalid_request_utf8
richvdh Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion synapse/http/servlet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ def parse_json_value_from_request(request):

try:
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)

return content
Expand Down