Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-25 21:59:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #856 from matrix-org/erikj/fed_pub_rooms

Browse Source 
Enable auth on /publicRoom endpoints
This commit is contained in:
Erik Johnston 2016-06-08 14:36:09 +01:00
commit 958c968d02
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/federation/transport/server.py
View File

@ -532,11 +532,6 @@ class PublicRoomList(BaseFederationServlet):
data = yield self.room_list_handler.get_local_public_room_list() data = yield self.room_list_handler.get_local_public_room_list()
defer.returnValue((200, data)) defer.returnValue((200, data))
# Avoid doing remote HS authorization checks which are done by default by
# BaseFederationServlet.
def _wrap(self, code):
return code
SERVLET_CLASSES = ( SERVLET_CLASSES = (
FederationSendServlet, FederationSendServlet,

7
synapse/rest/client/v1/room.py
View File

@ -279,6 +279,13 @@ class PublicRoomListRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_GET(self, request): def on_GET(self, request):
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
handler = self.hs.get_room_list_handler() handler = self.hs.get_room_list_handler()
data = yield handler.get_aggregated_public_room_list() data = yield handler.get_aggregated_public_room_list()