mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 16:00:07 +00:00
Merge pull request #1082 from matrix-org/erikj/remote_public_rooms
Add server param to /publicRooms
This commit is contained in:
commit
257025ac89
2 changed files with 27 additions and 6 deletions
|
@ -443,6 +443,16 @@ class RoomListHandler(BaseHandler):
|
||||||
self.remote_list_request_cache.set((), deferred)
|
self.remote_list_request_cache.set((), deferred)
|
||||||
self.remote_list_cache = yield 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
|
@defer.inlineCallbacks
|
||||||
def get_aggregated_public_room_list(self):
|
def get_aggregated_public_room_list(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -23,7 +23,7 @@ from synapse.api.constants import EventTypes, Membership
|
||||||
from synapse.api.filtering import Filter
|
from synapse.api.filtering import Filter
|
||||||
from synapse.types import UserID, RoomID, RoomAlias
|
from synapse.types import UserID, RoomID, RoomAlias
|
||||||
from synapse.events.utils import serialize_event
|
from synapse.events.utils import serialize_event
|
||||||
from synapse.http.servlet import parse_json_object_from_request
|
from synapse.http.servlet import parse_json_object_from_request, parse_string
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import urllib
|
import urllib
|
||||||
|
@ -295,15 +295,26 @@ class PublicRoomListRestServlet(ClientV1RestServlet):
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def on_GET(self, request):
|
def on_GET(self, request):
|
||||||
|
server = parse_string(request, "server", default=None)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
yield self.auth.get_user_by_req(request)
|
yield self.auth.get_user_by_req(request)
|
||||||
except AuthError:
|
except AuthError as e:
|
||||||
# This endpoint isn't authed, but its useful to know who's hitting
|
# We allow people to not be authed if they're just looking at our
|
||||||
# it if they *do* supply an access token
|
# room list, but require auth when we proxy the request.
|
||||||
pass
|
# 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()
|
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))
|
defer.returnValue((200, data))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue