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

Apply federation check for /publicRooms with filter list #7367

Merged
merged 3 commits into from
Apr 30, 2020
Merged

Apply federation check for /publicRooms with filter list #7367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3b690a
Apply federation check for /publicRooms with filter list
anoadragon453 Apr 29, 2020
c06a6f4
Add changelog
anoadragon453 Apr 29, 2020
63f74b6
Update changelog.d/7367.bugfix
anoadragon453 Apr 30, 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/7367.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prevent non-federating rooms from appearing in responses to federated `POST /publicRoom` requests when a filter was included.
6 changes: 5 additions & 1 deletion synapse/handlers/room_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@ def get_local_public_room_list(
logger.info("Bypassing cache as search request.")

return self._get_public_room_list(
limit, since_token, search_filter, network_tuple=network_tuple
limit,
since_token,
search_filter,
network_tuple=network_tuple,
from_federation=from_federation,
)

key = (limit, since_token, network_tuple)
Expand Down