Limit the maximum number events requested when backfilling events.

matrix-org · Feb 6, 2020 · 9f16a31 · 9f16a31
1 parent bce5571
commit 9f16a31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelog.d/6864.misc b/changelog.d/6864.misc
@@ -0,0 +1,2 @@
+Limit the number of events that can be requested by the backfill federation API to 100.
+
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -1789,6 +1789,9 @@ def on_backfill_request(self, origin, room_id, pdu_list, limit):
         if not in_room:
             raise AuthError(403, "Host not in room.")
 
+        # Synapse asks for 100 events per backfill request. Do not allow more.
+        limit = min(limit, 100)
+
         events = yield self.store.get_backfill_events(room_id, pdu_list, limit)
 
         events = yield filter_events_for_server(self.storage, origin, events)
@@ -2169,6 +2172,7 @@ async def on_get_missing_events(
         if not in_room:
             raise AuthError(403, "Host not in room.")
 
+        # Only allow up to 20 events to be retrieved per request.
         limit = min(limit, 20)
 
         missing_events = await self.store.get_missing_events(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Limit the number of events that can be requested by the backfill federation API to 100.