From 7d324612ec92a9818860d0d0e1c4cff358fd6e5f Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Mon, 18 Aug 2014 13:17:35 +0100 Subject: [PATCH 1/4] Precent lack of presence visiblity from causing room /members/list to fail --- synapse/rest/room.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 799dd58b2d..035209a19d 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -350,10 +350,14 @@ class RoomMemberListRestServlet(RestServlet): for event in members["chunk"]: target_user = self.hs.parse_userid(event["target_user_id"]) - presence_state = yield self.handlers.presence_handler.get_state( - target_user=target_user, auth_user=user - ) - event["content"].update(presence_state) + # Presence is an optional cache; don't fail if we can't fetch it + try: + presence_state = yield self.handlers.presence_handler.get_state( + target_user=target_user, auth_user=user + ) + event["content"].update(presence_state) + except: + pass defer.returnValue((200, members)) From faf25e3a839934cb143afaefabc162a8c1baab11 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Mon, 18 Aug 2014 13:41:43 +0100 Subject: [PATCH 2/4] Allow room presence visibility between users who share a room --- synapse/handlers/presence.py | 12 ++++----- tests/handlers/test_presence.py | 45 +++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index f0d7b34682..e8cb83eddb 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -155,7 +155,10 @@ class PresenceHandler(BaseHandler): if allowed_by_subscription: defer.returnValue(True) - # TODO(paul): Check same channel + rm_handler = self.homeserver.get_handlers().room_member_handler + for room_id in (yield rm_handler.get_rooms_for_user(observer_user)): + if observed_user in (yield rm_handler.get_room_members(room_id)): + defer.returnValue(True) defer.returnValue(False) @@ -166,16 +169,11 @@ class PresenceHandler(BaseHandler): observed_user=target_user ) - if visible or True: # XXX: FIXME: Bodge to unbreak matrix.org. breaks UTs. + if visible: state = yield self.store.get_presence_state( target_user.localpart ) else: - # FIXME: *Surely* we shouldn't be 404ing the whole request, whatever - # it is, just because presence info isn't visible?! - # This causes client/api/v1/rooms/!cURbafjkfsMDVwdRDQ%3Amatrix.org/members/list - # to 404 currently - raise SynapseError(404, "Presence information not visible") else: # TODO(paul): Have remote server send us permissions set diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 61c2547af4..86bd8bb3f2 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -80,6 +80,14 @@ class PresenceStateTestCase(unittest.TestCase): return defer.succeed(allow) self.datastore.is_presence_visible = is_presence_visible + # Mock the RoomMemberHandler + room_member_handler = Mock(spec=[ + "get_rooms_for_user", + "get_room_members", + ]) + hs.handlers.room_member_handler = room_member_handler + logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler) + # Some local users to test with self.u_apple = hs.parse_userid("@apple:test") self.u_banana = hs.parse_userid("@banana:test") @@ -87,11 +95,21 @@ class PresenceStateTestCase(unittest.TestCase): self.handler = hs.get_handlers().presence_handler - hs.handlers.room_member_handler = Mock(spec=[ - "get_rooms_for_user", - ]) - hs.handlers.room_member_handler.get_rooms_for_user = ( - lambda u: defer.succeed([])) + self.room_members = [] + + def get_rooms_for_user(user): + if user in self.room_members: + return defer.succeed(["a-room"]) + else: + return defer.succeed([]) + room_member_handler.get_rooms_for_user = get_rooms_for_user + + def get_room_members(room_id): + if room_id == "a-room": + return defer.succeed(self.room_members) + else: + return defer.succeed([]) + room_member_handler.get_room_members = get_room_members self.mock_start = Mock() self.mock_stop = Mock() @@ -131,6 +149,21 @@ class PresenceStateTestCase(unittest.TestCase): ) mocked_get.assert_called_with("apple") + @defer.inlineCallbacks + def test_get_same_room_state(self): + mocked_get = self.datastore.get_presence_state + mocked_get.return_value = defer.succeed( + {"state": ONLINE, "status_msg": "Online"} + ) + + self.room_members = [self.u_apple, self.u_clementine] + + state = yield self.handler.get_state( + target_user=self.u_apple, auth_user=self.u_clementine + ) + + self.assertEquals({"state": ONLINE, "status_msg": "Online"}, state) + @defer.inlineCallbacks def test_get_disallowed_state(self): mocked_get = self.datastore.get_presence_state @@ -138,6 +171,8 @@ class PresenceStateTestCase(unittest.TestCase): {"state": ONLINE, "status_msg": "Online"} ) + self.room_members = [] + yield self.assertFailure( self.handler.get_state( target_user=self.u_apple, auth_user=self.u_clementine From c12f55aa3ba35e05f479e9d08b8d7ff7ec209e6e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 18 Aug 2014 14:25:20 +0100 Subject: [PATCH 3/4] Increase /events timeout to 30 secs. We don't need it so low anymore to get around request suppression when changing rooms, since there is just a single event stream now. --- webclient/components/matrix/event-stream-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js index 9f678e8454..c94cf0fe72 100644 --- a/webclient/components/matrix/event-stream-service.js +++ b/webclient/components/matrix/event-stream-service.js @@ -26,7 +26,7 @@ angular.module('eventStreamService', []) .factory('eventStreamService', ['$q', '$timeout', 'matrixService', 'eventHandlerService', function($q, $timeout, matrixService, eventHandlerService) { var END = "END"; var START = "START"; - var TIMEOUT_MS = 5000; + var TIMEOUT_MS = 30000; var ERR_TIMEOUT_MS = 5000; var settings = { From b37ced8f63f64ab4fc1cff248fefddb5ebb6c957 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 18 Aug 2014 14:30:07 +0100 Subject: [PATCH 4/4] Update the default longpoll timeout time. --- synapse/rest/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/rest/events.py b/synapse/rest/events.py index dc811b813a..ca2f6978e5 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -24,7 +24,7 @@ from synapse.rest.base import RestServlet, client_path_pattern class EventStreamRestServlet(RestServlet): PATTERN = client_path_pattern("/events$") - DEFAULT_LONGPOLL_TIME_MS = 5000 + DEFAULT_LONGPOLL_TIME_MS = 30000 @defer.inlineCallbacks def on_GET(self, request):