diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-19 07:26:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 07:26:03 -0400 |
| commit | eebf52be060876ff14bbcbbc86b64ff9965b3622 (patch) | |
| tree | a5c2e61430ff05dbd04e954a234b697acd6b9698 /synapse/http/servlet.py | |
| parent | Convert runWithConnection to async. (#8121) (diff) | |
| download | synapse-eebf52be060876ff14bbcbbc86b64ff9965b3622.tar.xz | |
Be stricter about JSON that is accepted by Synapse (#8106)
Diffstat (limited to 'synapse/http/servlet.py')
| -rw-r--r-- | synapse/http/servlet.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index a34e5ead88..53acba56cb 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -17,9 +17,8 @@ import logging -from canonicaljson import json - from synapse.api.errors import Codes, SynapseError +from synapse.util import json_decoder logger = logging.getLogger(__name__) @@ -215,7 +214,7 @@ def parse_json_value_from_request(request, allow_empty_body=False): return None try: - content = json.loads(content_bytes.decode("utf-8")) + content = json_decoder.decode(content_bytes.decode("utf-8")) except Exception as e: logger.warning("Unable to parse JSON: %s", e) raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON) |