diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-08 14:36:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-08 14:36:09 +0100 |
| commit | 958c968d028c38586f6b7eed8ee9c24c15e8c6e6 (patch) | |
| tree | cb8de50d77634632410accd7db6039bf0348b7f2 /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #854 from matrix-org/erikj/federation_logging (diff) | |
| parent | Log user that is making /publicRooms calls (diff) | |
| download | synapse-958c968d028c38586f6b7eed8ee9c24c15e8c6e6.tar.xz | |
Merge pull request #856 from matrix-org/erikj/fed_pub_rooms
Enable auth on /publicRoom endpoints
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index db52a1fc39..604c2a565e 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -279,6 +279,13 @@ class PublicRoomListRestServlet(ClientV1RestServlet): @defer.inlineCallbacks 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() data = yield handler.get_aggregated_public_room_list() |