Share configuration for local and federation.

matrix-org · Dec 18, 2020 · d36c7b0 · d36c7b0
1 parent e05b4fd
commit d36c7b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -855,15 +855,6 @@ log_config: "CONFDIR/SERVERNAME.log.config"
 #  remote:
 #    per_second: 0.01
 #    burst_count: 3
-#
-#rc_key_requests:
-#  per_second: 0.1
-#  burst_count: 3
-#
-#rc_federation:
-#  room_key_request:
-#    per_second: 0.1
-#    burst_count: 3
 
 
 # Ratelimiting settings for incoming federation

diff --git a/synapse/config/ratelimiting.py b/synapse/config/ratelimiting.py
@@ -102,16 +102,16 @@ def read_config(self, config, **kwargs):
             defaults={"per_second": 0.01, "burst_count": 3},
         )
 
+        # Ratelimit cross-user key requests:
+        # * For locacl requests this is done by the sending devie.
+        # * For requests received over federation this is done by the origin.
+        #
+        # Note that this isn't exposed in the configuration as it is obscure.
         self.rc_key_requests = RateLimitConfig(
             config.get("rc_key_requests", {}),
             defaults={"per_second": 0.1, "burst_count": 3},
         )
 
-        self.rc_federation_room_key_request = RateLimitConfig(
-            config.get("rc_federation", {}).get("room_key_request", {}),
-            defaults={"per_second": 0.1, "burst_count": 3},
-        )
-
     def generate_config_section(self, **kwargs):
         return """\
         ## Ratelimiting ##
@@ -177,15 +177,6 @@ def generate_config_section(self, **kwargs):
         #  remote:
         #    per_second: 0.01
         #    burst_count: 3
-        #
-        #rc_key_requests:
-        #  per_second: 0.1
-        #  burst_count: 3
-        #
-        #rc_federation:
-        #  room_key_request:
-        #    per_second: 0.1
-        #    burst_count: 3
 
 
         # Ratelimiting settings for incoming federation

diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
@@ -867,8 +867,8 @@ def __init__(self, hs: "HomeServer"):
         # A rate limiter for incoming room key requests per origin.
         self._room_key_request_rate_limiter = Ratelimiter(
             clock=self.clock,
-            rate_hz=self.config.rc_federation_room_key_request.per_second,
-            burst_count=self.config.rc_federation_room_key_request.burst_count,
+            rate_hz=self.config.rc_key_requests.per_second,
+            burst_count=self.config.rc_key_requests.burst_count,
         )
 
     def register_edu_handler(