Don't process /send requests for users who have hit their ratelimit (#…

…13134)
matrix-org · Jun 30, 2022 · 046a651 · 046a651
1 parent 8330fc9
commit 046a651
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/13134.misc b/changelog.d/13134.misc
@@ -0,0 +1 @@
+Apply ratelimiting earlier in processing of /send request.
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
@@ -903,6 +903,9 @@ async def create_and_send_nonmember_event(
             await self.clock.sleep(random.randint(1, 10))
             raise ShadowBanError()
 
+        if ratelimit:
+            await self.request_ratelimiter.ratelimit(requester, update=False)
+
         # We limit the number of concurrent event sends in a room so that we
         # don't fork the DAG too much. If we don't limit then we can end up in
         # a situation where event persistence can't keep up, causing