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

Commit

Permalink
Faster Room Joins: prevent Synapse from answering federated join requ…
Browse files Browse the repository at this point in the history
…ests for a room which it has not fully joined yet. (#13416)
  • Loading branch information
reivilibre authored Aug 4, 2022
1 parent 41320a0 commit e9e6aac
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.d/13416.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster Room Joins: prevent Synapse from answering federated join requests for a room which it has not fully joined yet.
17 changes: 17 additions & 0 deletions synapse/federation/federation_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -843,8 +843,25 @@ async def _on_send_membership_event(
Codes.BAD_JSON,
)

# Note that get_room_version throws if the room does not exist here.
room_version = await self.store.get_room_version(room_id)

if await self.store.is_partial_state_room(room_id):
# If our server is still only partially joined, we can't give a complete
# response to /send_join, /send_knock or /send_leave.
# This is because we will not be able to provide the server list (for partial
# joins) or the full state (for full joins).
# Return a 404 as we would if we weren't in the room at all.
logger.info(
f"Rejecting /send_{membership_type} to %s because it's a partial state room",
room_id,
)
raise SynapseError(
404,
f"Unable to handle /send_{membership_type} right now; this server is not fully joined.",
errcode=Codes.NOT_FOUND,
)

if membership_type == Membership.KNOCK and not room_version.msc2403_knocking:
raise SynapseError(
403,
Expand Down
17 changes: 17 additions & 0 deletions synapse/handlers/federation.py
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,23 @@ async def on_make_join_request(
# (and return a 404 otherwise)
room_version = await self.store.get_room_version(room_id)

if await self.store.is_partial_state_room(room_id):
# If our server is still only partially joined, we can't give a complete
# response to /make_join, so return a 404 as we would if we weren't in the
# room at all.
# The main reason we can't respond properly is that we need to know about
# the auth events for the join event that we would return.
# We also should not bother entertaining the /make_join since we cannot
# handle the /send_join.
logger.info(
"Rejecting /make_join to %s because it's a partial state room", room_id
)
raise SynapseError(
404,
"Unable to handle /make_join right now; this server is not fully joined.",
errcode=Codes.NOT_FOUND,
)

# now check that we are *still* in the room
is_in_room = await self._event_auth_handler.check_host_in_room(
room_id, self.server_name
Expand Down

0 comments on commit e9e6aac

Please sign in to comment.