diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-04-30 11:38:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 11:38:07 +0100 |
| commit | 9d8ecc9e6c48b9dfc0b41326794b8e10fc6ad062 (patch) | |
| tree | 78d3da6d352a7a189d39f0208c9bbc6c4968006b | |
| parent | Add instance name to RDATA/POSITION commands (#7364) (diff) | |
| download | synapse-9d8ecc9e6c48b9dfc0b41326794b8e10fc6ad062.tar.xz | |
Apply federation check for /publicRooms with filter list (#7367)
| -rw-r--r-- | changelog.d/7367.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/room_list.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/7367.bugfix b/changelog.d/7367.bugfix new file mode 100644 index 0000000000..12171d4e1c --- /dev/null +++ b/changelog.d/7367.bugfix @@ -0,0 +1 @@ +Prevent non-federating rooms from appearing in responses to federated `POST /publicRoom` requests when a filter was included. diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py index 59c9906b31..e75dabcd77 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py @@ -90,7 +90,11 @@ class RoomListHandler(BaseHandler): 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) |