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

Add server param to /publicRooms #1082

Merged
merged 2 commits into from
Sep 8, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 10 additions & 0 deletions synapse/handlers/room.py
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,16 @@ def fetch_all_remote_lists(self):
self.remote_list_request_cache.set((), deferred)
self.remote_list_cache = yield deferred

@defer.inlineCallbacks
def get_remote_public_room_list(self, server_name):
res = yield self.hs.get_replication_layer().get_public_rooms(
[server_name]
)

if server_name not in res:
raise SynapseError(404, "Server not found")
defer.returnValue(res[server_name])

@defer.inlineCallbacks
def get_aggregated_public_room_list(self):
"""
Expand Down
21 changes: 16 additions & 5 deletions synapse/rest/client/v1/room.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,26 @@ class PublicRoomListRestServlet(ClientV1RestServlet):

@defer.inlineCallbacks
def on_GET(self, request):
server = request.args.get("server", [None])[0]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use parse_string from synapse.http.servlet?


try:
yield self.auth.get_user_by_req(request)
except AuthError:
# This endpoint isn't authed, but its useful to know who's hitting
# it if they *do* supply an access token
pass
except AuthError as e:
# We allow people to not be authed if they're just looking at our
# room list, but require auth when we proxy the request.
# In both cases we call the auth function, as that has the side
# effect of logging who issued this request if an access token was
# provided.
if server:
raise e
else:
pass

handler = self.hs.get_room_list_handler()
data = yield handler.get_aggregated_public_room_list()
if server:
data = yield handler.get_remote_public_room_list(server)
else:
data = yield handler.get_aggregated_public_room_list()

defer.returnValue((200, data))

Expand Down