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

Add error codes for malformed/bad JSON in /login #608

Merged
merged 2 commits into from
Feb 26, 2016
Merged

Add error codes for malformed/bad JSON in /login #608

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a537747
Add error codes for malformed/bad JSON in /login
Feb 26, 2016
87acd8f
Fix to appease the PEP8 dragon
Feb 26, 2016
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
6 changes: 4 additions & 2 deletions synapse/rest/client/v1/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,12 @@ def _parse_json(request):
try:
content = json.loads(request.content.read())
if type(content) != dict:
raise SynapseError(400, "Content must be a JSON object.")
raise SynapseError(
400, "Content must be a JSON object.", errcode=Codes.BAD_JSON
)
return content
except ValueError:
raise SynapseError(400, "Content not JSON.")
raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)


def register_servlets(hs, http_server):
Expand Down