From f3b690ab832f727e0ffbc89f467b86cea225dbd0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 29 Apr 2020 15:55:18 +0100 Subject: [PATCH 1/3] Apply federation check for /publicRooms with filter list --- synapse/handlers/room_list.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py index 59c9906b3174..e75dabcd7710 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py @@ -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) From c06a6f4cda98a986dfb7a375096105d7265a354e Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 29 Apr 2020 16:00:42 +0100 Subject: [PATCH 2/3] Add changelog --- changelog.d/7367.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7367.bugfix diff --git a/changelog.d/7367.bugfix b/changelog.d/7367.bugfix new file mode 100644 index 000000000000..a31a6ff7d404 --- /dev/null +++ b/changelog.d/7367.bugfix @@ -0,0 +1 @@ +Prevent non-federating rooms from appearing in responses to `POST /publicRoom` when a filter was included. \ No newline at end of file From 63f74b60f78758acd965afe9ae15ae5dd9461e43 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Thu, 30 Apr 2020 10:54:00 +0100 Subject: [PATCH 3/3] Update changelog.d/7367.bugfix Co-Authored-By: Brendan Abolivier --- changelog.d/7367.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/7367.bugfix b/changelog.d/7367.bugfix index a31a6ff7d404..12171d4e1cb6 100644 --- a/changelog.d/7367.bugfix +++ b/changelog.d/7367.bugfix @@ -1 +1 @@ -Prevent non-federating rooms from appearing in responses to `POST /publicRoom` when a filter was included. \ No newline at end of file +Prevent non-federating rooms from appearing in responses to federated `POST /publicRoom` requests when a filter was included.