OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Better error message when a remote resource uses invalid Content-Type (#8719)

pull/8754/head
Andrew Morgan 2020-11-11 14:22:40 +00:00 committed by GitHub
parent 4c7587ef99
commit eedaf90c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8719.misc Normal file
View File

@ -0,0 +1 @@
Improve the error message returned when a remote server incorrectly sets the `Content-Type` header in response to a JSON request.

10
synapse/http/matrixfederationclient.py
View File

@ -1063,13 +1063,19 @@ def check_content_type_is_json(headers):
""" """
c_type = headers.getRawHeaders(b"Content-Type") c_type = headers.getRawHeaders(b"Content-Type")
if c_type is None: if c_type is None:
raise RequestSendFailed(RuntimeError("No Content-Type header"), can_retry=False) raise RequestSendFailed(
RuntimeError("No Content-Type header received from remote server"),
can_retry=False,
)
c_type = c_type[0].decode("ascii") # only the first header c_type = c_type[0].decode("ascii") # only the first header
val, options = cgi.parse_header(c_type) val, options = cgi.parse_header(c_type)
if val != "application/json": if val != "application/json":
raise RequestSendFailed( raise RequestSendFailed(
RuntimeError("Content-Type not application/json: was '%s'" % c_type), RuntimeError(
"Remote server sent Content-Type header of '%s', not 'application/json'"
% c_type,
),
can_retry=False, can_retry=False,
) )