Throw sensible errors on not-json when allowing empty body

2015-04-02 17:45:16 +01:00 · 2015-04-02 17:45:16 +01:00 · 6b59650753
parent 41cd778d66
commit 6b59650753
1 changed files with 4 additions and 1 deletions
--- a/synapse/rest/client/v2_alpha/_base.py
+++ b/synapse/rest/client/v2_alpha/_base.py
@ -44,7 +44,10 @@ def parse_request_allow_empty(request):
    content = request.content.read()
    if content is None or content == '':
        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):