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

Return NOT_JSON if decode fails and defer set_timeline_upper_limit ca… #14262

Merged
merged 2 commits into from
Oct 24, 2022
Merged

Return NOT_JSON if decode fails and defer set_timeline_upper_limit ca… #14262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c0908
Return NOT_JSON if decode fails and defer set_timeline_upper_limit ca…
renegaderyu Oct 21, 2022
291e446
Reword changelog
DMRobertson Oct 24, 2022
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/14262.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Return M_NOT_JSON rather than M_UNKNOWN when decode fails.
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 4 additions & 4 deletions synapse/rest/client/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
elif filter_id.startswith("{"):
try:
filter_object = json_decoder.decode(filter_id)
set_timeline_upper_limit(
filter_object, self.hs.config.server.filter_timeline_limit
)
except Exception:
raise SynapseError(400, "Invalid filter JSON")
raise SynapseError(400, "Invalid filter JSON", errcode=Codes.NOT_JSON)
self.filtering.check_valid_filter(filter_object)
set_timeline_upper_limit(
filter_object, self.hs.config.server.filter_timeline_limit
)
filter_collection = FilterCollection(self.hs, filter_object)
else:
try:
Expand Down