Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

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

Merged
merged 4 commits into from
Nov 11, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bf6e69
Return 502, not 500 when a remote resource uses invalid Content-Type
anoadragon453 Nov 4, 2020
64b1d36
Changelog
anoadragon453 Nov 4, 2020
02b703c
Remove SynapseError substitutions
anoadragon453 Nov 10, 2020
b601820
Update changelog
anoadragon453 Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8719.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 8 additions & 2 deletions synapse/http/matrixfederationclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,13 +1063,19 @@ def check_content_type_is_json(headers):
"""
c_type = headers.getRawHeaders(b"Content-Type")
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
val, options = cgi.parse_header(c_type)
if val != "application/json":
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,
)

Expand Down