char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improvement: try out multiple servers when joining remote rooms

next
Timo Kösters 2020-09-14 11:00:31 +02:00
parent 1f292c09f2
commit c5313b3e8f
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
5 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Cargo.lock generated
View File

@ -157,7 +157,7 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
"miniz_oxide 0.4.1",
"miniz_oxide 0.4.2",
"object",
"rustc-demangle",
]
@ -1054,11 +1054,12 @@ dependencies = [
[[package]]
name = "miniz_oxide"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [
"adler",
"autocfg",
]
[[package]]
@ -1634,7 +1635,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.0.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"ruma-api",
"ruma-appservice-api",
@ -1650,7 +1651,7 @@ dependencies = [
[[package]]
name = "ruma-api"
version = "0.17.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"http",
"percent-encoding",
@ -1665,7 +1666,7 @@ dependencies = [
[[package]]
name = "ruma-api-macros"
version = "0.17.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@ -1676,7 +1677,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.2.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"ruma-api",
"ruma-common",
@ -1689,7 +1690,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.10.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"assign",
"http",
@ -1708,7 +1709,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.2.0"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"js_int",
"ruma-api",
@ -1722,7 +1723,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.22.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"js_int",
"ruma-common",
@ -1737,7 +1738,7 @@ dependencies = [
[[package]]
name = "ruma-events-macros"
version = "0.22.0-alpha.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@ -1748,7 +1749,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.0.3"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"js_int",
"ruma-api",
@ -1763,7 +1764,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers"
version = "0.17.4"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"rand",
"ruma-identifiers-macros",
@ -1775,7 +1776,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-macros"
version = "0.17.4"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"proc-macro2",
"quote",
@ -1786,7 +1787,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.1.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"serde",
"strum",
@ -1795,7 +1796,7 @@ dependencies = [
[[package]]
name = "ruma-serde"
version = "0.2.3"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"form_urlencoded",
"itoa",
@ -1807,7 +1808,7 @@ dependencies = [
[[package]]
name = "ruma-signatures"
version = "0.6.0-dev.1"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#8d763abaecb13f4799a31ecf1e0da77d2bc956a6"
source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ee66e30cbd58aecbbfde1d7008d7d6457deef87b"
dependencies = [
"base64",
"ring",

4
src/client_server/alias.rs
View File

@ -63,7 +63,7 @@ pub async fn get_alias_helper(
if room_alias.server_name() != db.globals.server_name() {
let response = server_server::send_request(
&db,
room_alias.server_name().to_string(),
room_alias.server_name(),
federation::query::get_room_information::v1::Request { room_alias },
)
.await?;
@ -79,5 +79,5 @@ pub async fn get_alias_helper(
"Room with alias not found.",
))?;
Ok(get_alias::Response::new(room_id, vec![db.globals.server_name().to_string()]).into())
Ok(get_alias::Response::new(room_id, vec![db.globals.server_name().to_owned()]).into())
}

12
src/client_server/directory.rs
View File

@ -19,7 +19,7 @@ use ruma::{
room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
EventType,
},
Raw,
Raw, ServerName,
};
#[cfg(feature = "conduit_bin")]
@ -65,9 +65,9 @@ pub async fn get_public_rooms_route(
) -> ConduitResult<get_public_rooms::Response> {
let response = get_public_rooms_filtered_helper(
&db,
body.body.server.as_deref(),
body.body.limit,
body.body.since.as_deref(),
body.server.as_deref(),
body.limit,
body.since.as_deref(),
None, // This is not used
None, // This is not used
)
@ -119,7 +119,7 @@ pub async fn get_room_visibility_route(
pub async fn get_public_rooms_filtered_helper(
db: &Database,
server: Option<&str>,
server: Option<&ServerName>,
limit: Option<js_int::UInt>,
since: Option<&str>,
_filter: Option<IncomingFilter>,
@ -131,7 +131,7 @@ pub async fn get_public_rooms_filtered_helper(
{
let response = server_server::send_request(
&db,
other_server.to_owned(),
other_server,
federation::directory::get_public_rooms::v1::Request {
limit,
since: since.as_deref(),

36
src/client_server/membership.rs
View File

@ -19,7 +19,7 @@ use ruma::{
},
events::pdu::Pdu,
events::{room::member, EventType},
EventId, Raw, RoomId, RoomVersionId, UserId,
EventId, Raw, RoomId, RoomVersionId, ServerName, UserId,
};
use state_res::StateEvent;
use std::{
@ -41,6 +41,7 @@ pub async fn join_room_by_id_route(
&db,
body.sender_id.as_ref(),
&body.room_id,
&[body.room_id.server_name().to_owned()],
body.third_party_signed.as_ref(),
)
.await
@ -54,13 +55,12 @@ pub async fn join_room_by_id_or_alias_route(
db: State<'_, Database>,
body: Ruma<join_room_by_id_or_alias::Request<'_>>,
) -> ConduitResult<join_room_by_id_or_alias::Response> {
let room_id = match RoomId::try_from(body.room_id_or_alias.clone()) {
Ok(room_id) => room_id,
let (servers, room_id) = match RoomId::try_from(body.room_id_or_alias.clone()) {
Ok(room_id) => (vec![room_id.server_name().to_owned()], room_id),
Err(room_alias) => {
client_server::get_alias_helper(&db, &room_alias)
.await?
.0
.room_id
let response = client_server::get_alias_helper(&db, &room_alias).await?;
(response.0.servers, response.0.room_id)
}
};
@ -69,6 +69,7 @@ pub async fn join_room_by_id_or_alias_route(
&db,
body.sender_id.as_ref(),
&room_id,
&servers,
body.third_party_signed.as_ref(),
)
.await?
@ -415,22 +416,37 @@ async fn join_room_by_id_helper(
db: &Database,
sender_id: Option<&UserId>,
room_id: &RoomId,
servers: &[Box<ServerName>],
_third_party_signed: Option<&IncomingThirdPartySigned>,
) -> ConduitResult<join_room_by_id::Response> {
let sender_id = sender_id.expect("user is authenticated");
// Ask a remote server if we don't have this room
if !db.rooms.exists(&room_id)? && room_id.server_name() != db.globals.server_name() {
let mut make_join_response_and_server = Err(Error::BadServerResponse(
"No server available to assist in joining.",
));
for remote_server in servers {
let make_join_response = server_server::send_request(
&db,
room_id.server_name().to_string(),
remote_server,
federation::membership::create_join_event_template::v1::Request {
room_id,
user_id: sender_id,
ver: &[RoomVersionId::Version5, RoomVersionId::Version6],
},
)
.await?;
.await;
make_join_response_and_server = make_join_response.map(|r| (r, remote_server));
if make_join_response_and_server.is_ok() {
break;
}
}
let (make_join_response, remote_server) = make_join_response_and_server?;
let mut join_event_stub_value =
serde_json::from_str::<serde_json::Value>(make_join_response.event.json().get())
@ -475,7 +491,7 @@ async fn join_room_by_id_helper(
let send_join_response = server_server::send_request(
&db,
room_id.server_name().to_string(),
remote_server,
federation::membership::create_join_event::v2::Request {
room_id,
event_id: &event_id,

10
src/server_server.rs
View File

@ -13,7 +13,7 @@ use ruma::{
},
OutgoingRequest,
},
EventId,
EventId, ServerName,
};
use serde_json::json;
use std::{
@ -44,16 +44,16 @@ pub async fn request_well_known(db: &crate::Database, destination: &str) -> Opti
pub async fn send_request<T: OutgoingRequest>(
db: &crate::Database,
destination: String,
destination: &ServerName,
request: T,
) -> Result<T::IncomingResponse>
where
T: Debug,
{
let actual_destination = "https://".to_owned()
+ &request_well_known(db, &destination)
+ &request_well_known(db, &destination.as_str())
.await
.unwrap_or(destination.clone() + ":8448");
.unwrap_or(destination.as_str().to_owned() + ":8448");
let mut http_request = request
.try_into_http_request(&actual_destination, Some(""))
@ -82,7 +82,7 @@ where
"origin".to_owned(),
db.globals.server_name().as_str().into(),
);
request_map.insert("destination".to_owned(), destination.into());
request_map.insert("destination".to_owned(), destination.as_str().into());
let mut request_json = request_map.into();
ruma::signatures::sign_json(