tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Throw sensible errors on not-json when allowing empty body

Browse source
This commit is contained in:
David Baker 2015-04-02 17:45:16 +01:00
parent 41cd778d66
commit 6b59650753
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/rest/client/v2_alpha/_base.py
View file

@ -44,7 +44,10 @@ def parse_request_allow_empty(request):
content = request.content.read() content = request.content.read()
if content is None or content == '': if content is None or content == '':
return None return None
return simplejson.loads(content) try:
return simplejson.loads(content)
except simplejson.JSONDecodeError:
raise SynapseError(400, "Content not JSON.")
def parse_json_dict_from_request(request): def parse_json_dict_from_request(request):