diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-10 14:55:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 14:55:25 -0400 |
| commit | b86764662b6058dc53dd7cef923b806dc28f3a53 (patch) | |
| tree | 95aecaacde9a89fec3da0885c1d0d7c03f686028 /synapse/http/matrixfederationclient.py | |
| parent | Remove shared rooms info from upgrade/workers doc as it's still experimental ... (diff) | |
| download | synapse-b86764662b6058dc53dd7cef923b806dc28f3a53.tar.xz | |
Fix the exception that is raised when invalid JSON is encountered. (#8291)
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 775fad3be4..5eaf3151ce 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -54,6 +54,7 @@ from synapse.logging.opentracing import ( start_active_span, tags, ) +from synapse.util import json_decoder from synapse.util.async_helpers import timeout_deferred from synapse.util.metrics import Measure @@ -164,7 +165,9 @@ async def _handle_json_response( try: check_content_type_is_json(response.headers) - d = treq.json_content(response) + # Use the custom JSON decoder (partially re-implements treq.json_content). + d = treq.text_content(response, encoding="utf-8") + d.addCallback(json_decoder.decode) d = timeout_deferred(d, timeout=timeout_sec, reactor=reactor) body = await make_deferred_yieldable(d) |