summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-19 10:45:24 +0100
committerErik Johnston <erik@matrix.org>2016-10-19 10:45:24 +0100
commit550308c7a1e8e6f7bf6ee27baf2d67796591657a (patch)
treea9bfd98a75656261773d51f033765092568d202e /synapse/handlers
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-550308c7a1e8e6f7bf6ee27baf2d67796591657a.tar.xz
Check whether to ratelimit sooner to avoid work
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 30ea9630f7..a94a514338 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -16,7 +16,7 @@
 from twisted.internet import defer
 
 from synapse.api.constants import EventTypes, Membership
-from synapse.api.errors import AuthError, Codes, SynapseError
+from synapse.api.errors import AuthError, Codes, SynapseError, LimitExceededError
 from synapse.crypto.event_signing import add_hashes_and_signatures
 from synapse.events.utils import serialize_event
 from synapse.events.validator import EventValidator
@@ -239,6 +239,18 @@ class MessageHandler(BaseHandler):
                 "Tried to send member event through non-member codepath"
             )
 
+        time_now = self.clock.time()
+        allowed, time_allowed = self.ratelimiter.send_message(
+            event.sender, time_now,
+            msg_rate_hz=self.hs.config.rc_messages_per_second,
+            burst_count=self.hs.config.rc_message_burst_count,
+            update=False,
+        )
+        if not allowed:
+            raise LimitExceededError(
+                retry_after_ms=int(1000 * (time_allowed - time_now)),
+            )
+
         user = UserID.from_string(event.sender)
 
         assert self.hs.is_mine(user), "User must be our own: %s" % (user,)