typing: check origin server of typing event against room's servers

This is also using the partial state approximation if needed so we do block here. Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
matrix-org · Sep 23, 2022 · 7347d8e · 7347d8e
1 parent 03c2bfb
commit 7347d8e
Show file tree

Hide file tree

Showing 3 changed files with 157 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/13830.bugfix b/changelog.d/13830.bugfix
@@ -0,0 +1 @@
+Faster room joins: fix typing EDU being stuck because the handler was waiting for the full state in a redundant check.
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
@@ -362,11 +362,13 @@ async def _recv_edu(self, origin: str, content: JsonDict) -> None:
             )
             return
 
-        domains = await self._storage_controllers.state.get_current_hosts_in_room(
+        # Let's check that the origin server is in the room before accepting the typing event.
+        # We don't want to block waiting on a partial state so take the approximation if needed.
+        domains = await self._storage_controllers.state.get_current_hosts_in_room_or_partial_state_approximation(
             room_id
         )
 
-        if self.server_name in domains:
+        if user.domain in domains:
             logger.info("Got typing update from %s: %r", user_id, content)
             now = self.clock.time_msec()
             self._member_typing_until[member] = now + FEDERATION_TIMEOUT
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Faster room joins: fix typing EDU being stuck because the handler was waiting for the full state in a redundant check.