|
@@ -379,6 +379,7 @@ class FederationHandler:
|
|
|
filtered_extremities = await filter_events_for_server(
|
|
|
self._storage_controllers,
|
|
|
self.server_name,
|
|
|
+ self.server_name,
|
|
|
events_to_check,
|
|
|
redact=False,
|
|
|
check_history_visibility_only=True,
|
|
@@ -1231,7 +1232,9 @@ class FederationHandler:
|
|
|
async def on_backfill_request(
|
|
|
self, origin: str, room_id: str, pdu_list: List[str], limit: int
|
|
|
) -> List[EventBase]:
|
|
|
- await self._event_auth_handler.assert_host_in_room(room_id, origin)
|
|
|
+ # We allow partially joined rooms since in this case we are filtering out
|
|
|
+ # non-local events in `filter_events_for_server`.
|
|
|
+ await self._event_auth_handler.assert_host_in_room(room_id, origin, True)
|
|
|
|
|
|
# Synapse asks for 100 events per backfill request. Do not allow more.
|
|
|
limit = min(limit, 100)
|
|
@@ -1252,7 +1255,7 @@ class FederationHandler:
|
|
|
)
|
|
|
|
|
|
events = await filter_events_for_server(
|
|
|
- self._storage_controllers, origin, events
|
|
|
+ self._storage_controllers, origin, self.server_name, events
|
|
|
)
|
|
|
|
|
|
return events
|
|
@@ -1283,7 +1286,7 @@ class FederationHandler:
|
|
|
await self._event_auth_handler.assert_host_in_room(event.room_id, origin)
|
|
|
|
|
|
events = await filter_events_for_server(
|
|
|
- self._storage_controllers, origin, [event]
|
|
|
+ self._storage_controllers, origin, self.server_name, [event]
|
|
|
)
|
|
|
event = events[0]
|
|
|
return event
|
|
@@ -1296,7 +1299,9 @@ class FederationHandler:
|
|
|
latest_events: List[str],
|
|
|
limit: int,
|
|
|
) -> List[EventBase]:
|
|
|
- await self._event_auth_handler.assert_host_in_room(room_id, origin)
|
|
|
+ # We allow partially joined rooms since in this case we are filtering out
|
|
|
+ # non-local events in `filter_events_for_server`.
|
|
|
+ await self._event_auth_handler.assert_host_in_room(room_id, origin, True)
|
|
|
|
|
|
# Only allow up to 20 events to be retrieved per request.
|
|
|
limit = min(limit, 20)
|
|
@@ -1309,7 +1314,7 @@ class FederationHandler:
|
|
|
)
|
|
|
|
|
|
missing_events = await filter_events_for_server(
|
|
|
- self._storage_controllers, origin, missing_events
|
|
|
+ self._storage_controllers, origin, self.server_name, missing_events
|
|
|
)
|
|
|
|
|
|
return missing_events
|