Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Faster joins: use servers list approximation in assert_host_in_room (
Browse files Browse the repository at this point in the history
…#14515)


Signed-off-by: Mathieu Velten <[email protected]>
  • Loading branch information
Mathieu Velten authored Nov 24, 2022
1 parent f38d7d7 commit 3b4e150
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
1 change: 1 addition & 0 deletions changelog.d/14515.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster joins: use servers list approximation received during `send_join` (potentially updated with received membership events) in `assert_host_in_room`.
28 changes: 17 additions & 11 deletions synapse/handlers/event_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class EventAuthHandler:
def __init__(self, hs: "HomeServer"):
self._clock = hs.get_clock()
self._store = hs.get_datastores().main
self._state_storage_controller = hs.get_storage_controllers().state
self._server_name = hs.hostname

async def check_auth_rules_from_context(
Expand Down Expand Up @@ -179,17 +180,22 @@ async def assert_host_in_room(
this function may return an incorrect result as we are not able to fully
track server membership in a room without full state.
"""
if not allow_partial_state_rooms and await self._store.is_partial_state_room(
room_id
):
raise AuthError(
403,
"Unable to authorise you right now; room is partial-stated here.",
errcode=Codes.UNABLE_DUE_TO_PARTIAL_STATE,
)

if not await self.is_host_in_room(room_id, host):
raise AuthError(403, "Host not in room.")
if await self._store.is_partial_state_room(room_id):
if allow_partial_state_rooms:
current_hosts = await self._state_storage_controller.get_current_hosts_in_room_or_partial_state_approximation(
room_id
)
if host not in current_hosts:
raise AuthError(403, "Host not in room (partial-state approx).")
else:
raise AuthError(
403,
"Unable to authorise you right now; room is partial-stated here.",
errcode=Codes.UNABLE_DUE_TO_PARTIAL_STATE,
)
else:
if not await self.is_host_in_room(room_id, host):
raise AuthError(403, "Host not in room.")

async def check_restricted_join_rules(
self,
Expand Down

0 comments on commit 3b4e150

Please sign in to comment.