summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-09-18 10:49:29 +0100
committerGitHub <noreply@github.com>2020-09-18 10:49:29 +0100
commit14b5b48a2285a43f655030ec242b92d217c1994a (patch)
treeab752f82761527bf31873a96ccce48e25464a88e /synapse/server.py
parentblacklist MSC2753 sytests until it's implemented in synapse (#8285) (diff)
downloadsynapse-14b5b48a2285a43f655030ec242b92d217c1994a.tar.xz
Fix ratelimiting for federation `/send` requests. (#8342)
c.f. #8295 for rationale
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 9055b97ac3..5e3752c333 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -114,6 +114,7 @@ from synapse.streams.events import EventSources from synapse.types import DomainSpecificString from synapse.util import Clock from synapse.util.distributor import Distributor +from synapse.util.ratelimitutils import FederationRateLimiter from synapse.util.stringutils import random_string logger = logging.getLogger(__name__) @@ -642,6 +643,10 @@ class HomeServer(metaclass=abc.ABCMeta): def get_replication_streams(self) -> Dict[str, Stream]: return {stream.NAME: stream(self) for stream in STREAMS_MAP.values()} + @cache_in_self + def get_federation_ratelimiter(self) -> FederationRateLimiter: + return FederationRateLimiter(self.clock, config=self.config.rc_federation) + async def remove_pusher(self, app_id: str, push_key: str, user_id: str): return await self.get_pusherpool().remove_pusher(app_id, push_key, user_id)