studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement MSC3706 two-step join.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-12-29 06:13:50 +00:00
parent 59481ad28d
commit b33e73672b
1 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/service/membership/join.rs
View File

@@ -2,6 +2,7 @@ use std::{
borrow::Borrow,
collections::{HashMap, HashSet},
iter::once,
mem::take,
sync::Arc,
};
@@ -175,11 +176,10 @@ pub async fn join_remote(
)
.await?;
info!("Asking {remote_server} for send_join in room {room_id}");
let send_join_request = federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(),
event_id: event_id.clone(),
omit_members: false,
omit_members: true,
pdu: self
.services
.federation
@@ -196,23 +196,60 @@ pub async fn join_remote(
.lock(room_id)
.await;
let send_join_response = match self
info!("Asking {remote_server} for fast_join in room {room_id}");
let mut response = match self
.services
.federation
.execute(&remote_server, send_join_request)
.await
.inspect_err(|e| error!("send_join failed: {e}"))
{
| Ok(response) => response,
| Err(e) => {
error!("send_join failed: {e}");
return Err(e);
},
| Err(e) => return Err(e),
| Ok(response) => response.room_state,
};
info!("send_join finished");
info!(
fast_join = response.members_omitted,
auth_chain = response.auth_chain.len(),
state = response.state.len(),
servers = response
.servers_in_room
.as_ref()
.map(Vec::len)
.unwrap_or(0),
"send_join finished"
);
if response.members_omitted {
use federation::event::get_room_state::v1::{Request, Response};
info!("Asking {remote_server} for state in room {room_id}");
match self
.services
.federation
.execute(&remote_server, Request {
room_id: room_id.to_owned(),
event_id: event_id.clone(),
})
.await
.inspect_err(|e| error!("state failed: {e}"))
{
| Err(e) => return Err(e),
| Ok(Response { mut auth_chain, mut pdus }) => {
response.auth_chain = take(&mut auth_chain);
response.state = take(&mut pdus);
},
}
info!(
auth_chain = response.auth_chain.len(),
state = response.state.len(),
"state finished"
);
}
if join_authorized_via_users_server.is_some() {
if let Some(signed_raw) = &send_join_response.room_state.event {
if let Some(signed_raw) = &response.event {
debug_info!(
"There is a signed event with join_authorized_via_users_server. This room is \
probably using restricted joins. Adding signature to our event"
@@ -275,9 +312,8 @@ pub async fn join_remote(
from_incoming_federation(room_id, &event_id, &mut join_event, &room_version_rules)?;
info!("Acquiring server signing keys for response events");
let resp_events = &send_join_response.room_state;
let resp_state = &resp_events.state;
let resp_auth = &resp_events.auth_chain;
let resp_state = &response.state;
let resp_auth = &response.auth_chain;
self.services
.server_keys
.acquire_events_pubkeys(resp_auth.iter().chain(resp_state.iter()))
@@ -285,8 +321,7 @@ pub async fn join_remote(
info!("Going through send_join response room_state");
let cork = self.services.db.cork_and_flush();
let state = send_join_response
.room_state
let state = response
.state
.iter()
.stream()
@@ -328,8 +363,7 @@ pub async fn join_remote(
info!("Going through send_join response auth_chain");
let cork = self.services.db.cork_and_flush();
send_join_response
.room_state
response
.auth_chain
.iter()
.stream()
@@ -592,7 +626,7 @@ pub async fn join_local(
let send_join_request = federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(),
event_id: event_id.clone(),
omit_members: false,
omit_members: true,
pdu: self
.services
.federation