Skip to content

Provide same servers list in s2s alias results as c2s. #18970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Provide same servers list in s2s alias results as c2s. #18970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions synapse/handlers/directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,16 +323,7 @@ async def on_directory_query(self, args: JsonDict) -> JsonDict:
if not self.hs.is_mine(room_alias):
raise SynapseError(400, "Room Alias is not hosted on this homeserver")

result = await self.get_association_from_room_alias(room_alias)

if result is not None:
return {"room_id": result.room_id, "servers": result.servers}
else:
raise SynapseError(
404,
"Room alias %r not found" % (room_alias.to_string(),),
Codes.NOT_FOUND,
)
return await self.get_association(room_alias)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afraid I'm not following how this improves anything, is there any chance you can sketch an example?

To put my confusion into words:

get_association appears to just call get_association_from_room_alias if the alias is managed by this server anyway.
And if the alias is not owned by this server, we make a federation request to the server that does.

But why would someone be sending us an SS API query for an alias that we don't own?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the timely response 🙏🏻. To clarify, our high-level goal here is only to populate the response with extra servers. There is no intent to change the resolution process or answer queries on behalf of other servers.

I sympathize with your confusion as I just revisited get_association() myself just now. The branch entered if the alias is owned by the server to call get_association_from_room_alias() does not return early. This allows extra_servers to be populated further down in get_association() and that's what will achieve the goal here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, yup, not sure how I didn't see that. Yeah this looks sensible to me


async def _update_canonical_alias(
self, requester: Requester, user_id: str, room_id: str, room_alias: RoomAlias
Expand Down
Loading