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

Faster Room Joins: fix /make_knock blocking indefinitely when the room in question is a partial-stated room. #13583

Merged
merged 4 commits into from
Aug 24, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/13583.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster Room Joins: fix `/make_knock` blocking indefinitely when the room in question is a partial-stated room.
10 changes: 10 additions & 0 deletions synapse/federation/federation_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,16 @@ async def on_make_knock_request(
The partial knock event.
"""
origin_host, _ = parse_server_name(origin)

if self.store.is_partial_state_room(room_id):
# Before we do anything: check if the room is partial-stated.
# Note that checking the ACL (below) requires full state, for example.
reivilibre marked this conversation as resolved.
Show resolved Hide resolved
raise SynapseError(
404,
"Unable to handle /make_knock right now; this server is not fully joined.",
errcode=Codes.NOT_FOUND,
)

await self.check_server_matches_acl(origin_host, room_id)

room_version = await self.store.get_room_version(room_id)
Expand Down