From 67a406a7540f21aae2fde325c66422cffa27fbfa Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 19 Dec 2014 17:36:33 +0000 Subject: [PATCH 1/3] Rate limit display names and avatar urls per request rather than per event. --- synapse/handlers/profile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 33a2c167e..3f11e2dcf 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -194,6 +194,8 @@ class ProfileHandler(BaseHandler): if not self.hs.is_mine(user): return + self.ratelimit(user.to_string()) + joins = yield self.store.get_rooms_for_user_where_membership_is( user.to_string(), [Membership.JOIN], @@ -214,5 +216,5 @@ class ProfileHandler(BaseHandler): "room_id": j.room_id, "state_key": j.state_key, "content": content, - "sender": j.state_key, - }) + "sender": j.state_key + }, ratelimit=False) From 2a5b53bc4a2c2ece46d40921707880d28164b876 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 19 Dec 2014 17:39:29 +0000 Subject: [PATCH 2/3] more changelogs --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 23bdac6a8..813ad364e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ Changes in synapse 0.6.0 (2014-12-16) ===================================== * Add new API for media upload and download that supports thumbnailing. + * Replicate media uploads over multiple homeservers so media is always served + to clients from their local homeserver. This obsoletes the + --content-addr parameter and confusion over accessing content directly + from remote homeservers. + * Implement exponential backoff when retrying federation requests when + sending to remote homeservers which are offline. * Implement typing notifications. * Fix bugs where we sent events with invalid signatures due to bugs where we incorrectly persisted events. From 4640239d3480bcc5c37454d45d12a821a405c541 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 19 Dec 2014 17:49:39 +0000 Subject: [PATCH 3/3] Mock ratelimiter to make tests pass. --- tests/handlers/test_presencelike.py | 11 ++++++++--- tests/handlers/test_profile.py | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index 532ecf0f2..0584e4c8b 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -19,7 +19,7 @@ presence and profiles; namely, the displayname and avatar_url.""" from tests import unittest from twisted.internet import defer -from mock import Mock, call, ANY +from mock import Mock, call, ANY, NonCallableMock from ..utils import MockClock, MockKey @@ -75,8 +75,13 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): resource_for_federation=Mock(), http_client=None, replication_layer=MockReplication(), - config=self.mock_config, - ) + ratelimiter=NonCallableMock(spec_set=[ + "send_message", + ]), + config=self.mock_config + ) + self.ratelimiter = hs.get_ratelimiter() + self.ratelimiter.send_message.return_value = (True, 0) hs.handlers = PresenceAndProfileHandlers(hs) self.datastore = hs.get_datastore() diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py index 1660e7e92..25b172aa5 100644 --- a/tests/handlers/test_profile.py +++ b/tests/handlers/test_profile.py @@ -17,7 +17,7 @@ from tests import unittest from twisted.internet import defer -from mock import Mock +from mock import Mock, NonCallableMock from synapse.api.errors import AuthError from synapse.server import HomeServer @@ -59,7 +59,14 @@ class ProfileTestCase(unittest.TestCase): resource_for_federation=Mock(), replication_layer=self.mock_federation, config=self.mock_config, + ratelimiter=NonCallableMock(spec_set=[ + "send_message", + ]) ) + + self.ratelimiter = hs.get_ratelimiter() + self.ratelimiter.send_message.return_value = (True, 0) + hs.handlers = ProfileHandlers(hs) self.store = hs.get_datastore()