Skip to content

Commit

Permalink
Apply federation check for /publicRooms with filter list (matrix-org#…
Browse files Browse the repository at this point in the history
  • Loading branch information
anoadragon453 authored and phil-flex committed Jun 16, 2020
1 parent 63c56e2 commit 6c90e71
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/7367.bugfix
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
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

0 comments on commit 6c90e71

Please sign in to comment.