diff --git a/Cargo.lock b/Cargo.lock index 70d7f4b4..293bcff7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1968,7 +1968,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.4.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "assign", "js_int", @@ -1988,8 +1988,8 @@ dependencies = [ [[package]] name = "ruma-api" -version = "0.18.3" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +version = "0.18.5" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "bytes", "http", @@ -2004,8 +2004,8 @@ dependencies = [ [[package]] name = "ruma-api-macros" -version = "0.18.3" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +version = "0.18.5" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2016,7 +2016,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.4.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "ruma-api", "ruma-common", @@ -2029,8 +2029,8 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.12.2" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +version = "0.12.3" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "assign", "bytes", @@ -2050,7 +2050,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.6.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "indexmap", "js_int", @@ -2064,8 +2064,8 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.24.5" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +version = "0.24.6" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "indoc", "js_int", @@ -2080,8 +2080,8 @@ dependencies = [ [[package]] name = "ruma-events-macros" -version = "0.24.5" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +version = "0.24.6" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2092,7 +2092,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.3.1" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "js_int", "ruma-api", @@ -2107,9 +2107,10 @@ dependencies = [ [[package]] name = "ruma-identifiers" version = "0.20.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "paste", + "percent-encoding", "rand 0.8.4", "ruma-identifiers-macros", "ruma-identifiers-validation", @@ -2121,7 +2122,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-macros" version = "0.20.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "quote", "ruma-identifiers-validation", @@ -2131,12 +2132,15 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.5.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" +dependencies = [ + "thiserror", +] [[package]] name = "ruma-identity-service-api" version = "0.3.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "js_int", "ruma-api", @@ -2149,7 +2153,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.3.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "js_int", "ruma-api", @@ -2164,7 +2168,7 @@ dependencies = [ [[package]] name = "ruma-serde" version = "0.5.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "bytes", "form_urlencoded", @@ -2178,7 +2182,7 @@ dependencies = [ [[package]] name = "ruma-serde-macros" version = "0.5.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2189,7 +2193,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.9.0" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "base64 0.13.0", "ed25519-dalek", @@ -2206,7 +2210,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.4.1" -source = "git+https://github.com/ruma/ruma?rev=a6a1224652912a957b09f136ec5da2686be6e0e2#a6a1224652912a957b09f136ec5da2686be6e0e2" +source = "git+https://github.com/ruma/ruma?rev=44cfd0adbc83303c19aef590ad0d71647e19f197#44cfd0adbc83303c19aef590ad0d71647e19f197" dependencies = [ "itertools 0.10.1", "js_int", diff --git a/Cargo.toml b/Cargo.toml index 593a1fd3..0f246733 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle request # Used for matrix spec type definitions and helpers #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } -ruma = { git = "https://github.com/ruma/ruma", rev = "a6a1224652912a957b09f136ec5da2686be6e0e2", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } +ruma = { git = "https://github.com/ruma/ruma", rev = "44cfd0adbc83303c19aef590ad0d71647e19f197", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } diff --git a/rust-toolchain b/rust-toolchain index d96ae405..74df8b16 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.52 +1.53 diff --git a/src/client_server/account.rs b/src/client_server/account.rs index fb338422..4b3ad0d4 100644 --- a/src/client_server/account.rs +++ b/src/client_server/account.rs @@ -15,19 +15,28 @@ use ruma::{ ThirdPartyIdRemovalStatus, }, contact::get_contacts, - uiaa::{AuthFlow, UiaaInfo}, + uiaa::{AuthFlow, AuthType, UiaaInfo}, }, }, events::{ room::{ - canonical_alias, guest_access, history_visibility, join_rules, member, message, name, - topic, + canonical_alias::RoomCanonicalAliasEventContent, + create::RoomCreateEventContent, + guest_access::{GuestAccess, RoomGuestAccessEventContent}, + history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, + join_rules::{JoinRule, RoomJoinRulesEventContent}, + member::{MembershipState, RoomMemberEventContent}, + message::RoomMessageEventContent, + name::RoomNameEventContent, + power_levels::RoomPowerLevelsEventContent, + topic::RoomTopicEventContent, }, EventType, }, identifiers::RoomName, push, RoomAliasId, RoomId, RoomVersionId, UserId, }; +use serde_json::value::to_raw_value; use tracing::info; use register::RegistrationKind; @@ -147,7 +156,7 @@ pub async fn register_route( // UIAA let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.dummy".to_owned()], + stages: vec![AuthType::Dummy], }], completed: Vec::new(), params: Default::default(), @@ -270,7 +279,7 @@ pub async fn register_route( ); let state_lock = mutex_state.lock().await; - let mut content = ruma::events::room::create::CreateEventContent::new(conduit_user.clone()); + let mut content = RoomCreateEventContent::new(conduit_user.clone()); content.federate = true; content.predecessor = None; content.room_version = RoomVersionId::Version6; @@ -279,7 +288,7 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomCreate, - content: serde_json::to_value(content).expect("event is valid, we just created it"), + content: to_raw_value(&content).expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -294,8 +303,8 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Join, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Join, displayname: None, avatar_url: None, is_direct: None, @@ -322,12 +331,10 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomPowerLevels, - content: serde_json::to_value( - ruma::events::room::power_levels::PowerLevelsEventContent { - users, - ..Default::default() - }, - ) + content: to_raw_value(&RoomPowerLevelsEventContent { + users, + ..Default::default() + }) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), @@ -343,10 +350,8 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomJoinRules, - content: serde_json::to_value(join_rules::JoinRulesEventContent::new( - join_rules::JoinRule::Invite, - )) - .expect("event is valid, we just created it"), + content: to_raw_value(&RoomJoinRulesEventContent::new(JoinRule::Invite)) + .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -361,11 +366,9 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomHistoryVisibility, - content: serde_json::to_value( - history_visibility::HistoryVisibilityEventContent::new( - history_visibility::HistoryVisibility::Shared, - ), - ) + content: to_raw_value(&RoomHistoryVisibilityEventContent::new( + HistoryVisibility::Shared, + )) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), @@ -381,10 +384,8 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomGuestAccess, - content: serde_json::to_value(guest_access::GuestAccessEventContent::new( - guest_access::GuestAccess::Forbidden, - )) - .expect("event is valid, we just created it"), + content: to_raw_value(&RoomGuestAccessEventContent::new(GuestAccess::Forbidden)) + .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -402,7 +403,7 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomName, - content: serde_json::to_value(name::NameEventContent::new(Some(room_name))) + content: to_raw_value(&RoomNameEventContent::new(Some(room_name))) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), @@ -417,7 +418,7 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomTopic, - content: serde_json::to_value(topic::TopicEventContent { + content: to_raw_value(&RoomTopicEventContent { topic: format!("Manage {}", db.globals.server_name()), }) .expect("event is valid, we just created it"), @@ -439,7 +440,7 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomCanonicalAlias, - content: serde_json::to_value(canonical_alias::CanonicalAliasEventContent { + content: to_raw_value(&RoomCanonicalAliasEventContent { alias: Some(alias.clone()), alt_aliases: Vec::new(), }) @@ -460,8 +461,8 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Invite, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Invite, displayname: None, avatar_url: None, is_direct: None, @@ -482,8 +483,8 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Join, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Join, displayname: Some(displayname), avatar_url: None, is_direct: None, @@ -506,7 +507,7 @@ pub async fn register_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMessage, - content: serde_json::to_value(message::MessageEventContent::text_html( + content: to_raw_value(&RoomMessageEventContent::text_html( "## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`".to_owned(), "

Thank you for trying out Conduit!

\n

Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.

\n

Helpful links:

\n
\n

Website: https://conduit.rs
Git and Documentation: https://gitlab.com/famedly/conduit
Report issues: https://gitlab.com/famedly/conduit/-/issues

\n
\n

Here are some rooms you can join (by typing the command):

\n

Conduit room (Ask questions and get notified on updates):
/join #conduit:fachschaften.org

\n

Conduit lounge (Off-topic, only Conduit users are allowed to join)
/join #conduit-lounge:conduit.rs

\n".to_owned(), )) @@ -562,7 +563,7 @@ pub async fn change_password_route( let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.password".to_owned()], + stages: vec![AuthType::Password], }], completed: Vec::new(), params: Default::default(), @@ -654,7 +655,7 @@ pub async fn deactivate_route( let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.password".to_owned()], + stages: vec![AuthType::Password], }], completed: Vec::new(), params: Default::default(), @@ -698,8 +699,8 @@ pub async fn deactivate_route( for room_id in all_rooms { let room_id = room_id?; - let event = member::MemberEventContent { - membership: member::MembershipState::Leave, + let event = RoomMemberEventContent { + membership: MembershipState::Leave, displayname: None, avatar_url: None, is_direct: None, @@ -721,7 +722,7 @@ pub async fn deactivate_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event).expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(sender_user.to_string()), redacts: None, diff --git a/src/client_server/config.rs b/src/client_server/config.rs index bd897bab..0c668ff1 100644 --- a/src/client_server/config.rs +++ b/src/client_server/config.rs @@ -30,7 +30,7 @@ pub async fn set_global_account_data_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let data = serde_json::from_str::(body.data.get()) + let data: serde_json::Value = serde_json::from_str(body.data.get()) .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?; let event_type = body.event_type.to_string(); @@ -68,7 +68,7 @@ pub async fn set_room_account_data_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let data = serde_json::from_str::(body.data.get()) + let data: serde_json::Value = serde_json::from_str(body.data.get()) .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?; let event_type = body.event_type.to_string(); @@ -103,9 +103,9 @@ pub async fn get_global_account_data_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let event = db + let event: Box = db .account_data - .get::>(None, sender_user, body.event_type.clone().into())? + .get(None, sender_user, body.event_type.clone().into())? .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?; let account_data = serde_json::from_str::(event.get()) @@ -132,9 +132,9 @@ pub async fn get_room_account_data_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let event = db + let event: Box = db .account_data - .get::>( + .get( Some(&body.room_id), sender_user, body.event_type.clone().into(), diff --git a/src/client_server/context.rs b/src/client_server/context.rs index b2346f5e..97fc4fd8 100644 --- a/src/client_server/context.rs +++ b/src/client_server/context.rs @@ -48,7 +48,7 @@ pub async fn get_context_route( ))? .to_room_event(); - let events_before = db + let events_before: Vec<_> = db .rooms .pdus_until(sender_user, &body.room_id, base_token)? .take( @@ -58,19 +58,19 @@ pub async fn get_context_route( / 2, ) .filter_map(|r| r.ok()) // Remove buggy events - .collect::>(); + .collect(); let start_token = events_before .last() .and_then(|(pdu_id, _)| db.rooms.pdu_count(pdu_id).ok()) .map(|count| count.to_string()); - let events_before = events_before + let events_before: Vec<_> = events_before .into_iter() .map(|(_, pdu)| pdu.to_room_event()) - .collect::>(); + .collect(); - let events_after = db + let events_after: Vec<_> = db .rooms .pdus_after(sender_user, &body.room_id, base_token)? .take( @@ -80,17 +80,17 @@ pub async fn get_context_route( / 2, ) .filter_map(|r| r.ok()) // Remove buggy events - .collect::>(); + .collect(); let end_token = events_after .last() .and_then(|(pdu_id, _)| db.rooms.pdu_count(pdu_id).ok()) .map(|count| count.to_string()); - let events_after = events_after + let events_after: Vec<_> = events_after .into_iter() .map(|(_, pdu)| pdu.to_room_event()) - .collect::>(); + .collect(); let mut resp = get_context::Response::new(); resp.start = start_token; diff --git a/src/client_server/device.rs b/src/client_server/device.rs index 100b591f..03a3004b 100644 --- a/src/client_server/device.rs +++ b/src/client_server/device.rs @@ -3,7 +3,7 @@ use ruma::api::client::{ error::ErrorKind, r0::{ device::{self, delete_device, delete_devices, get_device, get_devices, update_device}, - uiaa::{AuthFlow, UiaaInfo}, + uiaa::{AuthFlow, AuthType, UiaaInfo}, }, }; @@ -25,11 +25,11 @@ pub async fn get_devices_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let devices = db + let devices: Vec = db .users .all_devices_metadata(sender_user) .filter_map(|r| r.ok()) // Filter out buggy devices - .collect::>(); + .collect(); Ok(get_devices::Response { devices }.into()) } @@ -109,7 +109,7 @@ pub async fn delete_device_route( // UIAA let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.password".to_owned()], + stages: vec![AuthType::Password], }], completed: Vec::new(), params: Default::default(), @@ -172,7 +172,7 @@ pub async fn delete_devices_route( // UIAA let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.password".to_owned()], + stages: vec![AuthType::Password], }], completed: Vec::new(), params: Default::default(), diff --git a/src/client_server/directory.rs b/src/client_server/directory.rs index 0065e51a..490f7524 100644 --- a/src/client_server/directory.rs +++ b/src/client_server/directory.rs @@ -17,10 +17,16 @@ use ruma::{ }, directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork}, events::{ - room::{avatar, canonical_alias, guest_access, history_visibility, name, topic}, + room::{ + avatar::RoomAvatarEventContent, + canonical_alias::RoomCanonicalAliasEventContent, + guest_access::{GuestAccess, RoomGuestAccessEventContent}, + history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, + name::RoomNameEventContent, + topic::RoomTopicEventContent, + }, EventType, }, - serde::Raw, ServerName, UInt, }; use tracing::{info, warn}; @@ -217,167 +223,139 @@ pub(crate) async fn get_public_rooms_filtered_helper( } } - let mut all_rooms = - db.rooms - .public_rooms() - .map(|room_id| { - let room_id = room_id?; + let mut all_rooms: Vec<_> = db + .rooms + .public_rooms() + .map(|room_id| { + let room_id = room_id?; - let chunk = PublicRoomsChunk { - aliases: Vec::new(), - canonical_alias: db - .rooms - .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")? - .map_or(Ok::<_, Error>(None), |s| { - Ok(serde_json::from_value::< - Raw, - >(s.content.clone()) - .expect("from_value::> can never fail") - .deserialize() + let chunk = PublicRoomsChunk { + aliases: Vec::new(), + canonical_alias: db + .rooms + .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")? + .map_or(Ok(None), |s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomCanonicalAliasEventContent| c.alias) .map_err(|_| { Error::bad_database("Invalid canonical alias event in database.") - })? - .alias) - })?, - name: db - .rooms - .room_state_get(&room_id, &EventType::RoomName, "")? - .map_or(Ok::<_, Error>(None), |s| { - Ok(serde_json::from_value::>( - s.content.clone(), - ) - .expect("from_value::> can never fail") - .deserialize() + }) + })?, + name: db + .rooms + .room_state_get(&room_id, &EventType::RoomName, "")? + .map_or(Ok(None), |s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomNameEventContent| c.name) .map_err(|_| { Error::bad_database("Invalid room name event in database.") - })? - .name) - })?, - num_joined_members: db - .rooms - .room_joined_count(&room_id)? - .unwrap_or_else(|| { - warn!("Room {} has no member count", room_id); - 0 - }) - .try_into() - .expect("user count should not be that big"), - topic: db - .rooms - .room_state_get(&room_id, &EventType::RoomTopic, "")? - .map_or(Ok::<_, Error>(None), |s| { - Ok(Some( - serde_json::from_value::>( - s.content.clone(), - ) - .expect("from_value::> can never fail") - .deserialize() - .map_err(|_| { - Error::bad_database("Invalid room topic event in database.") - })? - .topic, - )) - })?, - world_readable: db - .rooms - .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")? - .map_or(Ok::<_, Error>(false), |s| { - Ok(serde_json::from_value::< - Raw, - >(s.content.clone()) - .expect("from_value::> can never fail") - .deserialize() + }) + })?, + num_joined_members: db + .rooms + .room_joined_count(&room_id)? + .unwrap_or_else(|| { + warn!("Room {} has no member count", room_id); + 0 + }) + .try_into() + .expect("user count should not be that big"), + topic: db + .rooms + .room_state_get(&room_id, &EventType::RoomTopic, "")? + .map_or(Ok(None), |s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomTopicEventContent| Some(c.topic)) + .map_err(|_| { + Error::bad_database("Invalid room topic event in database.") + }) + })?, + world_readable: db + .rooms + .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")? + .map_or(Ok(false), |s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomHistoryVisibilityEventContent| { + c.history_visibility == HistoryVisibility::WorldReadable + }) .map_err(|_| { Error::bad_database( "Invalid room history visibility event in database.", ) - })? - .history_visibility - == history_visibility::HistoryVisibility::WorldReadable) - })?, - guest_can_join: db - .rooms - .room_state_get(&room_id, &EventType::RoomGuestAccess, "")? - .map_or(Ok::<_, Error>(false), |s| { - Ok( - serde_json::from_value::>( - s.content.clone(), - ) - .expect("from_value::> can never fail") - .deserialize() + }) + })?, + guest_can_join: db + .rooms + .room_state_get(&room_id, &EventType::RoomGuestAccess, "")? + .map_or(Ok(false), |s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomGuestAccessEventContent| { + c.guest_access == GuestAccess::CanJoin + }) .map_err(|_| { Error::bad_database("Invalid room guest access event in database.") - })? - .guest_access - == guest_access::GuestAccess::CanJoin, - ) - })?, - avatar_url: db - .rooms - .room_state_get(&room_id, &EventType::RoomAvatar, "")? - .map(|s| { - Ok::<_, Error>( - serde_json::from_value::>( - s.content.clone(), - ) - .expect("from_value::> can never fail") - .deserialize() - .map_err(|_| { - Error::bad_database("Invalid room avatar event in database.") - })? - .url, - ) - }) - .transpose()? - // url is now an Option so we must flatten - .flatten(), - room_id, - }; - Ok(chunk) - }) - .filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms - .filter(|chunk| { - if let Some(query) = filter - .generic_search_term - .as_ref() - .map(|q| q.to_lowercase()) - { - if let Some(name) = &chunk.name { - if name.as_str().to_lowercase().contains(&query) { - return true; - } + }) + })?, + avatar_url: db + .rooms + .room_state_get(&room_id, &EventType::RoomAvatar, "")? + .map(|s| { + serde_json::from_str(s.content.get()) + .map(|c: RoomAvatarEventContent| c.url) + .map_err(|_| { + Error::bad_database("Invalid room avatar event in database.") + }) + }) + .transpose()? + // url is now an Option so we must flatten + .flatten(), + room_id, + }; + Ok(chunk) + }) + .filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms + .filter(|chunk| { + if let Some(query) = filter + .generic_search_term + .as_ref() + .map(|q| q.to_lowercase()) + { + if let Some(name) = &chunk.name { + if name.as_str().to_lowercase().contains(&query) { + return true; } - - if let Some(topic) = &chunk.topic { - if topic.to_lowercase().contains(&query) { - return true; - } - } - - if let Some(canonical_alias) = &chunk.canonical_alias { - if canonical_alias.as_str().to_lowercase().contains(&query) { - return true; - } - } - - false - } else { - // No search term - true } - }) - // We need to collect all, so we can sort by member count - .collect::>(); + + if let Some(topic) = &chunk.topic { + if topic.to_lowercase().contains(&query) { + return true; + } + } + + if let Some(canonical_alias) = &chunk.canonical_alias { + if canonical_alias.as_str().to_lowercase().contains(&query) { + return true; + } + } + + false + } else { + // No search term + true + } + }) + // We need to collect all, so we can sort by member count + .collect(); all_rooms.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members)); let total_room_count_estimate = (all_rooms.len() as u32).into(); - let chunk = all_rooms + let chunk: Vec<_> = all_rooms .into_iter() .skip(num_since as usize) .take(limit as usize) - .collect::>(); + .collect(); let prev_batch = if num_since == 0 { None diff --git a/src/client_server/keys.rs b/src/client_server/keys.rs index a74c4097..a44f5e9c 100644 --- a/src/client_server/keys.rs +++ b/src/client_server/keys.rs @@ -10,7 +10,7 @@ use ruma::{ claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures, upload_signing_keys, }, - uiaa::{AuthFlow, UiaaInfo}, + uiaa::{AuthFlow, AuthType, UiaaInfo}, }, }, federation, @@ -148,7 +148,7 @@ pub async fn upload_signing_keys_route( // UIAA let mut uiaainfo = UiaaInfo { flows: vec![AuthFlow { - stages: vec!["m.login.password".to_owned()], + stages: vec![AuthType::Password], }], completed: Vec::new(), params: Default::default(), @@ -395,7 +395,7 @@ pub(crate) async fn get_keys_helper bool>( let mut failures = BTreeMap::new(); - let mut futures = get_over_federation + let mut futures: FuturesUnordered<_> = get_over_federation .into_iter() .map(|(server, vec)| async move { let mut device_keys_input_fed = BTreeMap::new(); @@ -415,7 +415,7 @@ pub(crate) async fn get_keys_helper bool>( .await, ) }) - .collect::>(); + .collect(); while let Some((server, response)) = futures.next().await { match response { diff --git a/src/client_server/membership.rs b/src/client_server/membership.rs index 146af791..732f6162 100644 --- a/src/client_server/membership.rs +++ b/src/client_server/membership.rs @@ -1,10 +1,9 @@ use crate::{ client_server, database::DatabaseGuard, - pdu::{PduBuilder, PduEvent}, + pdu::{EventHash, PduBuilder, PduEvent}, server_server, utils, ConduitResult, Database, Error, Result, Ruma, }; -use member::{MemberEventContent, MembershipState}; use ruma::{ api::{ client::{ @@ -18,14 +17,17 @@ use ruma::{ federation::{self, membership::create_invite}, }, events::{ - pdu::Pdu, - room::{create::CreateEventContent, member}, + room::{ + create::RoomCreateEventContent, + member::{MembershipState, RoomMemberEventContent}, + }, EventType, }, - serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue, Raw}, + serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue}, state_res::{self, RoomVersion}, uint, EventId, RoomId, RoomVersionId, ServerName, UserId, }; +use serde_json::value::{to_raw_value, RawValue as RawJsonValue}; use std::{ collections::{hash_map::Entry, BTreeMap, HashMap, HashSet}, convert::{TryFrom, TryInto}, @@ -54,19 +56,17 @@ pub async fn join_room_by_id_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let mut servers = db + let mut servers: HashSet<_> = db .rooms .invite_state(sender_user, &body.room_id)? .unwrap_or_default() .iter() - .filter_map(|event| { - serde_json::from_str::(&event.json().to_string()).ok() - }) - .filter_map(|event| event.get("sender").cloned()) + .filter_map(|event| serde_json::from_str(event.json().get()).ok()) + .filter_map(|event: serde_json::Value| event.get("sender").cloned()) .filter_map(|sender| sender.as_str().map(|s| s.to_owned())) .filter_map(|sender| UserId::try_from(sender).ok()) .map(|user| user.server_name().to_owned()) - .collect::>(); + .collect(); servers.insert(body.room_id.server_name().to_owned()); @@ -103,19 +103,17 @@ pub async fn join_room_by_id_or_alias_route( let (servers, room_id) = match RoomId::try_from(body.room_id_or_alias.clone()) { Ok(room_id) => { - let mut servers = db + let mut servers: HashSet<_> = db .rooms .invite_state(sender_user, &room_id)? .unwrap_or_default() .iter() - .filter_map(|event| { - serde_json::from_str::(&event.json().to_string()).ok() - }) - .filter_map(|event| event.get("sender").cloned()) + .filter_map(|event| serde_json::from_str(event.json().get()).ok()) + .filter_map(|event: serde_json::Value| event.get("sender").cloned()) .filter_map(|sender| sender.as_str().map(|s| s.to_owned())) .filter_map(|sender| UserId::try_from(sender).ok()) .map(|user| user.server_name().to_owned()) - .collect::>(); + .collect(); servers.insert(room_id.server_name().to_owned()); (servers, room_id) @@ -204,7 +202,7 @@ pub async fn kick_user_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let mut event = serde_json::from_value::>( + let mut event: RoomMemberEventContent = serde_json::from_str( db.rooms .room_state_get( &body.room_id, @@ -216,13 +214,11 @@ pub async fn kick_user_route( "Cannot kick member that's not in the room.", ))? .content - .clone(), + .get(), ) - .expect("Raw::from_value always works") - .deserialize() .map_err(|_| Error::bad_database("Invalid member event in database."))?; - event.membership = ruma::events::room::member::MembershipState::Leave; + event.membership = MembershipState::Leave; // TODO: reason let mutex_state = Arc::clone( @@ -238,7 +234,7 @@ pub async fn kick_user_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event).expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(body.user_id.to_string()), redacts: None, @@ -280,8 +276,8 @@ pub async fn ban_user_route( &body.user_id.to_string(), )? .map_or( - Ok::<_, Error>(member::MemberEventContent { - membership: member::MembershipState::Ban, + Ok(RoomMemberEventContent { + membership: MembershipState::Ban, displayname: db.users.displayname(&body.user_id)?, avatar_url: db.users.avatar_url(&body.user_id)?, is_direct: None, @@ -290,14 +286,12 @@ pub async fn ban_user_route( reason: None, }), |event| { - let mut event = serde_json::from_value::>( - event.content.clone(), - ) - .expect("Raw::from_value always works") - .deserialize() - .map_err(|_| Error::bad_database("Invalid member event in database."))?; - event.membership = ruma::events::room::member::MembershipState::Ban; - Ok(event) + serde_json::from_str(event.content.get()) + .map(|event: RoomMemberEventContent| RoomMemberEventContent { + membership: MembershipState::Ban, + ..event + }) + .map_err(|_| Error::bad_database("Invalid member event in database.")) }, )?; @@ -314,7 +308,7 @@ pub async fn ban_user_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event).expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(body.user_id.to_string()), redacts: None, @@ -346,7 +340,7 @@ pub async fn unban_user_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let mut event = serde_json::from_value::>( + let mut event: RoomMemberEventContent = serde_json::from_str( db.rooms .room_state_get( &body.room_id, @@ -358,13 +352,11 @@ pub async fn unban_user_route( "Cannot unban a user who is not banned.", ))? .content - .clone(), + .get(), ) - .expect("from_value::> can never fail") - .deserialize() .map_err(|_| Error::bad_database("Invalid member event in database."))?; - event.membership = ruma::events::room::member::MembershipState::Leave; + event.membership = MembershipState::Leave; let mutex_state = Arc::clone( db.globals @@ -379,7 +371,7 @@ pub async fn unban_user_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event).expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(body.user_id.to_string()), redacts: None, @@ -583,11 +575,10 @@ async fn join_room_by_id_helper( _ => return Err(Error::BadServerResponse("Room version is not supported")), }; - let mut join_event_stub = - serde_json::from_str::(make_join_response.event.json().get()) - .map_err(|_| { - Error::BadServerResponse("Invalid make_join event json received from server.") - })?; + let mut join_event_stub: CanonicalJsonObject = + serde_json::from_str(make_join_response.event.get()).map_err(|_| { + Error::BadServerResponse("Invalid make_join event json received from server.") + })?; // TODO: Is origin needed? join_event_stub.insert( @@ -604,8 +595,8 @@ async fn join_room_by_id_helper( ); join_event_stub.insert( "content".to_owned(), - to_canonical_value(member::MemberEventContent { - membership: member::MembershipState::Join, + to_canonical_value(RoomMemberEventContent { + membership: MembershipState::Join, displayname: db.users.displayname(sender_user)?, avatar_url: db.users.avatar_url(sender_user)?, is_direct: None, @@ -653,7 +644,7 @@ async fn join_room_by_id_helper( federation::membership::create_join_event::v2::Request { room_id, event_id: &event_id, - pdu: PduEvent::convert_to_outgoing_federation_event(join_event.clone()), + pdu: &PduEvent::convert_to_outgoing_federation_event(join_event.clone()), }, ) .await?; @@ -723,7 +714,7 @@ async fn join_room_by_id_helper( state .into_iter() .map(|(k, id)| db.rooms.compress_state_event(k, &id, &db.globals)) - .collect::>>()?, + .collect::>()?, db, )?; @@ -756,8 +747,8 @@ async fn join_room_by_id_helper( // where events in the current room state do not exist db.rooms.set_room_state(room_id, statehashid)?; } else { - let event = member::MemberEventContent { - membership: member::MembershipState::Join, + let event = RoomMemberEventContent { + membership: MembershipState::Join, displayname: db.users.displayname(sender_user)?, avatar_url: db.users.avatar_url(sender_user)?, is_direct: None, @@ -769,7 +760,7 @@ async fn join_room_by_id_helper( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event).expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(sender_user.to_string()), redacts: None, @@ -789,12 +780,12 @@ async fn join_room_by_id_helper( } fn validate_and_add_event_id( - pdu: &Raw, + pdu: &RawJsonValue, room_version: &RoomVersionId, pub_key_map: &RwLock>>, db: &Database, ) -> Result<(EventId, CanonicalJsonObject)> { - let mut value = serde_json::from_str::(pdu.json().get()).map_err(|e| { + let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| { error!("Invalid PDU in server response: {:?}: {:?}", pdu, e); Error::BadServerResponse("Invalid PDU in server response") })?; @@ -870,27 +861,24 @@ pub(crate) async fn invite_helper<'a>( ); let state_lock = mutex_state.lock().await; - let prev_events = db + let prev_events: Vec<_> = db .rooms .get_pdu_leaves(room_id)? .into_iter() .take(20) - .collect::>(); + .collect(); let create_event = db .rooms .room_state_get(room_id, &EventType::RoomCreate, "")?; - let create_event_content = create_event + let create_event_content: Option = create_event .as_ref() .map(|create_event| { - serde_json::from_value::>(create_event.content.clone()) - .expect("Raw::from_value always works.") - .deserialize() - .map_err(|e| { - warn!("Invalid create event: {}", e); - Error::bad_database("Invalid create event in db.") - }) + serde_json::from_str(create_event.content.get()).map_err(|e| { + warn!("Invalid create event: {}", e); + Error::bad_database("Invalid create event in db.") + }) }) .transpose()?; @@ -910,7 +898,7 @@ pub(crate) async fn invite_helper<'a>( let room_version = RoomVersion::new(&room_version_id).expect("room version is supported"); - let content = serde_json::to_value(MemberEventContent { + let content = to_raw_value(&RoomMemberEventContent { avatar_url: None, displayname: None, is_direct: Some(is_direct), @@ -946,7 +934,7 @@ pub(crate) async fn invite_helper<'a>( unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone()); unsigned.insert( "prev_sender".to_owned(), - serde_json::to_value(&prev_pdu.sender).expect("UserId::to_value always works"), + serde_json::from_str(prev_pdu.sender.as_str()).expect("UserId is valid string"), ); } @@ -967,11 +955,15 @@ pub(crate) async fn invite_helper<'a>( .map(|(_, pdu)| pdu.event_id.clone()) .collect(), redacts: None, - unsigned, - hashes: ruma::events::pdu::EventHash { + unsigned: if unsigned.is_empty() { + None + } else { + Some(to_raw_value(&unsigned).expect("to_raw_value always works")) + }, + hashes: EventHash { sha256: "aaa".to_owned(), }, - signatures: BTreeMap::new(), + signatures: None, }; let auth_check = state_res::auth_check( @@ -1035,11 +1027,11 @@ pub(crate) async fn invite_helper<'a>( &db.globals, user_id.server_name(), create_invite::v2::Request { - room_id: room_id.clone(), - event_id: expected_event_id.clone(), - room_version: room_version_id, - event: PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()), - invite_room_state, + room_id, + event_id: &expected_event_id, + room_version: &room_version_id, + event: &PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()), + invite_room_state: &invite_room_state, }, ) .await?; @@ -1062,7 +1054,7 @@ pub(crate) async fn invite_helper<'a>( warn!("Server {} changed invite event, that's not allowed in the spec: ours: {:?}, theirs: {:?}", user_id.server_name(), pdu_json, value); } - let origin = serde_json::from_value::>( + let origin: Box = serde_json::from_value( serde_json::to_value(value.get("origin").ok_or(Error::BadRequest( ErrorKind::InvalidParam, "Event needs an origin field.", @@ -1116,8 +1108,8 @@ pub(crate) async fn invite_helper<'a>( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Invite, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Invite, displayname: db.users.displayname(user_id)?, avatar_url: db.users.avatar_url(user_id)?, is_direct: Some(is_direct), diff --git a/src/client_server/message.rs b/src/client_server/message.rs index 25964cc2..abbbe8ea 100644 --- a/src/client_server/message.rs +++ b/src/client_server/message.rs @@ -140,14 +140,11 @@ pub async fn get_message_events_route( let to = body.to.as_ref().map(|t| t.parse()); // Use limit or else 10 - let limit = body - .limit - .try_into() - .map_or(Ok::<_, Error>(10_usize), |l: u32| Ok(l as usize))?; + let limit = body.limit.try_into().map_or(10_usize, |l: u32| l as usize); match body.dir { get_message_events::Direction::Forward => { - let events_after = db + let events_after: Vec<_> = db .rooms .pdus_after(sender_user, &body.room_id, from)? .take(limit) @@ -159,14 +156,14 @@ pub async fn get_message_events_route( .ok() }) .take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to` - .collect::>(); + .collect(); let end_token = events_after.last().map(|(count, _)| count.to_string()); - let events_after = events_after + let events_after: Vec<_> = events_after .into_iter() .map(|(_, pdu)| pdu.to_room_event()) - .collect::>(); + .collect(); let mut resp = get_message_events::Response::new(); resp.start = Some(body.from.to_owned()); @@ -177,7 +174,7 @@ pub async fn get_message_events_route( Ok(resp.into()) } get_message_events::Direction::Backward => { - let events_before = db + let events_before: Vec<_> = db .rooms .pdus_until(sender_user, &body.room_id, from)? .take(limit) @@ -189,14 +186,14 @@ pub async fn get_message_events_route( .ok() }) .take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to` - .collect::>(); + .collect(); let start_token = events_before.last().map(|(count, _)| count.to_string()); - let events_before = events_before + let events_before: Vec<_> = events_before .into_iter() .map(|(_, pdu)| pdu.to_room_event()) - .collect::>(); + .collect(); let mut resp = get_message_events::Response::new(); resp.start = Some(body.from.to_owned()); diff --git a/src/client_server/profile.rs b/src/client_server/profile.rs index ab7fb024..29b1ae87 100644 --- a/src/client_server/profile.rs +++ b/src/client_server/profile.rs @@ -9,9 +9,9 @@ use ruma::{ }, federation::{self, query::get_profile_information::v1::ProfileField}, }, - events::EventType, - serde::Raw, + events::{room::member::RoomMemberEventContent, EventType}, }; +use serde_json::value::to_raw_value; use std::{convert::TryInto, sync::Arc}; #[cfg(feature = "conduit_bin")] @@ -45,9 +45,9 @@ pub async fn set_displayname_route( Ok::<_, Error>(( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(ruma::events::room::member::MemberEventContent { + content: to_raw_value(&RoomMemberEventContent { displayname: body.displayname.clone(), - ..serde_json::from_value::>( + ..serde_json::from_str( db.rooms .room_state_get( &room_id, @@ -61,10 +61,8 @@ pub async fn set_displayname_route( ) })? .content - .clone(), + .get(), ) - .expect("from_value::> can never fail") - .deserialize() .map_err(|_| Error::bad_database("Database contains invalid PDU."))? }) .expect("event is valid, we just created it"), @@ -190,9 +188,9 @@ pub async fn set_avatar_url_route( Ok::<_, Error>(( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(ruma::events::room::member::MemberEventContent { + content: to_raw_value(&RoomMemberEventContent { avatar_url: body.avatar_url.clone(), - ..serde_json::from_value::>( + ..serde_json::from_str( db.rooms .room_state_get( &room_id, @@ -206,10 +204,8 @@ pub async fn set_avatar_url_route( ) })? .content - .clone(), + .get(), ) - .expect("from_value::> can never fail") - .deserialize() .map_err(|_| Error::bad_database("Database contains invalid PDU."))? }) .expect("event is valid, we just created it"), diff --git a/src/client_server/push.rs b/src/client_server/push.rs index 98555d09..64f27f1c 100644 --- a/src/client_server/push.rs +++ b/src/client_server/push.rs @@ -8,7 +8,7 @@ use ruma::{ set_pushrule_enabled, RuleKind, }, }, - events::{push_rules, EventType}, + events::{push_rules::PushRulesEvent, EventType}, push::{ConditionalPushRuleInit, PatternedPushRuleInit, SimplePushRuleInit}, }; @@ -29,9 +29,9 @@ pub async fn get_pushrules_all_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let event = db + let event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -57,9 +57,9 @@ pub async fn get_pushrule_route( ) -> ConduitResult { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); - let event = db + let event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -122,9 +122,9 @@ pub async fn set_pushrule_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -222,9 +222,9 @@ pub async fn get_pushrule_actions_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -284,9 +284,9 @@ pub async fn set_pushrule_actions_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -356,9 +356,9 @@ pub async fn get_pushrule_enabled_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -420,9 +420,9 @@ pub async fn set_pushrule_enabled_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", @@ -497,9 +497,9 @@ pub async fn delete_pushrule_route( )); } - let mut event = db + let mut event: PushRulesEvent = db .account_data - .get::(None, sender_user, EventType::PushRules)? + .get(None, sender_user, EventType::PushRules)? .ok_or(Error::BadRequest( ErrorKind::NotFound, "PushRules event not found.", diff --git a/src/client_server/redact.rs b/src/client_server/redact.rs index 4b5219b2..7435c5c5 100644 --- a/src/client_server/redact.rs +++ b/src/client_server/redact.rs @@ -3,11 +3,12 @@ use std::sync::Arc; use crate::{database::DatabaseGuard, pdu::PduBuilder, ConduitResult, Ruma}; use ruma::{ api::client::r0::redact::redact_event, - events::{room::redaction, EventType}, + events::{room::redaction::RoomRedactionEventContent, EventType}, }; #[cfg(feature = "conduit_bin")] use rocket::put; +use serde_json::value::to_raw_value; /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}` /// @@ -38,7 +39,7 @@ pub async fn redact_event_route( let event_id = db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomRedaction, - content: serde_json::to_value(redaction::RedactionEventContent { + content: to_raw_value(&RoomRedactionEventContent { reason: body.reason.clone(), }) .expect("event is valid, we just created it"), diff --git a/src/client_server/room.rs b/src/client_server/room.rs index f6c3a50e..2d1fe237 100644 --- a/src/client_server/room.rs +++ b/src/client_server/room.rs @@ -8,12 +8,24 @@ use ruma::{ r0::room::{self, aliases, create_room, get_room_event, upgrade_room}, }, events::{ - room::{guest_access, history_visibility, join_rules, member, name, topic}, + room::{ + canonical_alias::RoomCanonicalAliasEventContent, + create::RoomCreateEventContent, + guest_access::{GuestAccess, RoomGuestAccessEventContent}, + history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, + join_rules::{JoinRule, RoomJoinRulesEventContent}, + member::{MembershipState, RoomMemberEventContent}, + name::RoomNameEventContent, + power_levels::RoomPowerLevelsEventContent, + tombstone::RoomTombstoneEventContent, + topic::RoomTopicEventContent, + }, EventType, }, - serde::Raw, + serde::JsonObject, RoomAliasId, RoomId, RoomVersionId, }; +use serde_json::value::to_raw_value; use std::{cmp::max, collections::BTreeMap, convert::TryFrom, sync::Arc}; use tracing::{info, warn}; @@ -90,7 +102,7 @@ pub async fn create_room_route( } })?; - let mut content = ruma::events::room::create::CreateEventContent::new(sender_user.clone()); + let mut content = RoomCreateEventContent::new(sender_user.clone()); content.federate = body.creation_content.federate; content.predecessor = body.creation_content.predecessor.clone(); content.room_version = match body.room_version.clone() { @@ -111,7 +123,7 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomCreate, - content: serde_json::to_value(content).expect("event is valid, we just created it"), + content: to_raw_value(&content).expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -126,8 +138,8 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Join, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Join, displayname: db.users.displayname(sender_user)?, avatar_url: db.users.avatar_url(sender_user)?, is_direct: Some(body.is_direct), @@ -167,20 +179,17 @@ pub async fn create_room_route( } } - let mut power_levels_content = - serde_json::to_value(ruma::events::room::power_levels::PowerLevelsEventContent { - users, - ..Default::default() - }) - .expect("event is valid, we just created it"); + let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent { + users, + ..Default::default() + }) + .expect("event is valid, we just created it"); if let Some(power_level_content_override) = &body.power_level_content_override { - let json = serde_json::from_str::>( - power_level_content_override.json().get(), - ) - .map_err(|_| { - Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override.") - })?; + let json: JsonObject = serde_json::from_str(power_level_content_override.json().get()) + .map_err(|_| { + Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override.") + })?; for (key, value) in json { power_levels_content[key] = value; @@ -190,7 +199,8 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomPowerLevels, - content: power_levels_content, + content: to_raw_value(&power_levels_content) + .expect("to_raw_value always works on serde_json::Value"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -206,12 +216,10 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomCanonicalAlias, - content: serde_json::to_value( - ruma::events::room::canonical_alias::CanonicalAliasEventContent { - alias: Some(room_alias_id.clone()), - alt_aliases: vec![], - }, - ) + content: to_raw_value(&RoomCanonicalAliasEventContent { + alias: Some(room_alias_id.clone()), + alt_aliases: vec![], + }) .expect("We checked that alias earlier, it must be fine"), unsigned: None, state_key: Some("".to_owned()), @@ -230,17 +238,12 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomJoinRules, - content: match preset { - create_room::RoomPreset::PublicChat => serde_json::to_value( - join_rules::JoinRulesEventContent::new(join_rules::JoinRule::Public), - ) - .expect("event is valid, we just created it"), + content: to_raw_value(&RoomJoinRulesEventContent::new(match preset { + create_room::RoomPreset::PublicChat => JoinRule::Public, // according to spec "invite" is the default - _ => serde_json::to_value(join_rules::JoinRulesEventContent::new( - join_rules::JoinRule::Invite, - )) - .expect("event is valid, we just created it"), - }, + _ => JoinRule::Invite, + })) + .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -255,8 +258,8 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomHistoryVisibility, - content: serde_json::to_value(history_visibility::HistoryVisibilityEventContent::new( - history_visibility::HistoryVisibility::Shared, + content: to_raw_value(&RoomHistoryVisibilityEventContent::new( + HistoryVisibility::Shared, )) .expect("event is valid, we just created it"), unsigned: None, @@ -273,18 +276,11 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomGuestAccess, - content: match preset { - create_room::RoomPreset::PublicChat => { - serde_json::to_value(guest_access::GuestAccessEventContent::new( - guest_access::GuestAccess::Forbidden, - )) - .expect("event is valid, we just created it") - } - _ => serde_json::to_value(guest_access::GuestAccessEventContent::new( - guest_access::GuestAccess::CanJoin, - )) - .expect("event is valid, we just created it"), - }, + content: to_raw_value(&RoomGuestAccessEventContent::new(match preset { + create_room::RoomPreset::PublicChat => GuestAccess::Forbidden, + _ => GuestAccess::CanJoin, + })) + .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), redacts: None, @@ -316,7 +312,7 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomName, - content: serde_json::to_value(name::NameEventContent::new(Some(name.clone()))) + content: to_raw_value(&RoomNameEventContent::new(Some(name.clone()))) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), @@ -333,7 +329,7 @@ pub async fn create_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomTopic, - content: serde_json::to_value(topic::TopicEventContent { + content: to_raw_value(&RoomTopicEventContent { topic: topic.clone(), }) .expect("event is valid, we just created it"), @@ -487,8 +483,8 @@ pub async fn upgrade_room_route( let tombstone_event_id = db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomTombstone, - content: serde_json::to_value(ruma::events::room::tombstone::TombstoneEventContent { - body: "This room has been replaced".to_string(), + content: to_raw_value(&RoomTombstoneEventContent { + body: "This room has been replaced".to_owned(), replacement_room: replacement_room.clone(), }) .expect("event is valid, we just created it"), @@ -515,15 +511,13 @@ pub async fn upgrade_room_route( let state_lock = mutex_state.lock().await; // Get the old room federations status - let federate = serde_json::from_value::>( + let federate = serde_json::from_str::( db.rooms .room_state_get(&body.room_id, &EventType::RoomCreate, "")? .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))? .content - .clone(), + .get(), ) - .expect("Raw::from_value always works") - .deserialize() .map_err(|_| Error::bad_database("Invalid room event in database."))? .federate; @@ -534,8 +528,7 @@ pub async fn upgrade_room_route( )); // Send a m.room.create event containing a predecessor field and the applicable room_version - let mut create_event_content = - ruma::events::room::create::CreateEventContent::new(sender_user.clone()); + let mut create_event_content = RoomCreateEventContent::new(sender_user.clone()); create_event_content.federate = federate; create_event_content.room_version = body.new_version.clone(); create_event_content.predecessor = predecessor; @@ -543,7 +536,7 @@ pub async fn upgrade_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomCreate, - content: serde_json::to_value(create_event_content) + content: to_raw_value(&create_event_content) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), @@ -559,8 +552,8 @@ pub async fn upgrade_room_route( db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(member::MemberEventContent { - membership: member::MembershipState::Join, + content: to_raw_value(&RoomMemberEventContent { + membership: MembershipState::Join, displayname: db.users.displayname(sender_user)?, avatar_url: db.users.avatar_url(sender_user)?, is_direct: None, @@ -621,17 +614,14 @@ pub async fn upgrade_room_route( } // Get the old room power levels - let mut power_levels_event_content = - serde_json::from_value::>( - db.rooms - .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")? - .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))? - .content - .clone(), - ) - .expect("database contains invalid PDU") - .deserialize() - .map_err(|_| Error::bad_database("Invalid room event in database."))?; + let mut power_levels_event_content: RoomPowerLevelsEventContent = serde_json::from_str( + db.rooms + .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")? + .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))? + .content + .get(), + ) + .map_err(|_| Error::bad_database("Invalid room event in database."))?; // Setting events_default and invite to the greater of 50 and users_default + 1 let new_level = max( @@ -645,7 +635,7 @@ pub async fn upgrade_room_route( let _ = db.rooms.build_and_append_pdu( PduBuilder { event_type: EventType::RoomPowerLevels, - content: serde_json::to_value(power_levels_event_content) + content: to_raw_value(&power_levels_event_content) .expect("event is valid, we just created it"), unsigned: None, state_key: Some("".to_owned()), diff --git a/src/client_server/search.rs b/src/client_server/search.rs index 9ff1a1bd..59c9480a 100644 --- a/src/client_server/search.rs +++ b/src/client_server/search.rs @@ -74,7 +74,7 @@ pub async fn search_events_route( } } - let results = results + let results: Vec<_> = results .iter() .map(|result| { Ok::<_, Error>(SearchResult { @@ -95,7 +95,7 @@ pub async fn search_events_route( .filter_map(|r| r.ok()) .skip(skip) .take(limit) - .collect::>(); + .collect(); let next_batch = if results.len() < limit as usize { None @@ -114,7 +114,7 @@ pub async fn search_events_route( .search_term .split_terminator(|c: char| !c.is_alphanumeric()) .map(str::to_lowercase) - .collect::>(), + .collect(), }, }) .into()) diff --git a/src/client_server/session.rs b/src/client_server/session.rs index b42689d2..61e5519a 100644 --- a/src/client_server/session.rs +++ b/src/client_server/session.rs @@ -60,10 +60,10 @@ pub async fn login_route( // Validate login method // TODO: Other login methods let user_id = match &body.login_info { - login::IncomingLoginInfo::Password { + login::IncomingLoginInfo::Password(login::IncomingPassword { identifier, password, - } => { + }) => { let username = if let IncomingUserIdentifier::MatrixId(matrix_id) = identifier { matrix_id } else { @@ -97,7 +97,7 @@ pub async fn login_route( user_id } - login::IncomingLoginInfo::Token { token } => { + login::IncomingLoginInfo::Token(login::IncomingToken { token }) => { if let Some(jwt_decoding_key) = db.globals.jwt_decoding_key() { let token = jsonwebtoken::decode::( token, @@ -116,6 +116,12 @@ pub async fn login_route( )); } } + _ => { + return Err(Error::BadRequest( + ErrorKind::Unknown, + "Unsupported login type.", + )); + } }; // Generate new device id if the user didn't specify one diff --git a/src/client_server/state.rs b/src/client_server/state.rs index 7618dcc4..307bccab 100644 --- a/src/client_server/state.rs +++ b/src/client_server/state.rs @@ -10,8 +10,8 @@ use ruma::{ }, events::{ room::{ - canonical_alias::CanonicalAliasEventContent, - history_visibility::{HistoryVisibility, HistoryVisibilityEventContent}, + canonical_alias::RoomCanonicalAliasEventContent, + history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, }, AnyStateEventContent, EventType, }, @@ -120,13 +120,13 @@ pub async fn get_state_events_route( db.rooms .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")? .map(|event| { - serde_json::from_value::(event.content.clone()) + serde_json::from_str(event.content.get()) + .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility) .map_err(|_| { Error::bad_database( "Invalid room history visibility event in database.", ) }) - .map(|e| e.history_visibility) }), Some(Ok(HistoryVisibility::WorldReadable)) ) @@ -172,13 +172,13 @@ pub async fn get_state_events_for_key_route( db.rooms .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")? .map(|event| { - serde_json::from_value::(event.content.clone()) + serde_json::from_str(event.content.get()) + .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility) .map_err(|_| { Error::bad_database( "Invalid room history visibility event in database.", ) }) - .map(|e| e.history_visibility) }), Some(Ok(HistoryVisibility::WorldReadable)) ) @@ -198,7 +198,7 @@ pub async fn get_state_events_for_key_route( ))?; Ok(get_state_events_for_key::Response { - content: serde_json::from_value(event.content.clone()) + content: serde_json::from_str(event.content.get()) .map_err(|_| Error::bad_database("Invalid event content in database"))?, } .into()) @@ -228,13 +228,13 @@ pub async fn get_state_events_for_empty_key_route( db.rooms .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")? .map(|event| { - serde_json::from_value::(event.content.clone()) + serde_json::from_str(event.content.get()) + .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility) .map_err(|_| { Error::bad_database( "Invalid room history visibility event in database.", ) }) - .map(|e| e.history_visibility) }), Some(Ok(HistoryVisibility::WorldReadable)) ) @@ -254,7 +254,7 @@ pub async fn get_state_events_for_empty_key_route( ))?; Ok(get_state_events_for_key::Response { - content: serde_json::from_value(event.content.clone()) + content: serde_json::from_str(event.content.get()) .map_err(|_| Error::bad_database("Invalid event content in database"))?, } .into()) @@ -273,7 +273,7 @@ async fn send_state_event_for_key_helper( // TODO: Review this check, error if event is unparsable, use event type, allow alias if it // previously existed if let Ok(canonical_alias) = - serde_json::from_str::(json.json().get()) + serde_json::from_str::(json.json().get()) { let mut aliases = canonical_alias.alt_aliases.clone(); diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs index 2d5ad27d..e4c12c40 100644 --- a/src/client_server/sync.rs +++ b/src/client_server/sync.rs @@ -1,7 +1,10 @@ use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Result, Ruma, RumaResponse}; use ruma::{ api::client::r0::{sync::sync_events, uiaa::UiaaResponse}, - events::{room::member::MembershipState, AnySyncEphemeralRoomEvent, EventType}, + events::{ + room::member::{MembershipState, RoomMemberEventContent}, + AnySyncEphemeralRoomEvent, EventType, + }, serde::Raw, DeviceId, RoomId, UserId, }; @@ -57,7 +60,7 @@ use rocket::{get, tokio}; pub async fn sync_events_route( db: DatabaseGuard, body: Ruma>, -) -> std::result::Result, RumaResponse> { +) -> Result, RumaResponse> { let sender_user = body.sender_user.as_ref().expect("user is authenticated"); let sender_device = body.sender_device.as_ref().expect("user is authenticated"); @@ -179,7 +182,7 @@ async fn sync_helper( full_state: bool, timeout: Option, // bool = caching allowed -) -> std::result::Result<(sync_events::Response, bool), Error> { +) -> Result<(sync_events::Response, bool), Error> { // TODO: match body.set_presence { db.rooms.edus.ping_presence(&sender_user)?; @@ -241,13 +244,13 @@ async fn sync_helper( }); // Take the last 10 events for the timeline - let timeline_pdus = non_timeline_pdus + let timeline_pdus: Vec<_> = non_timeline_pdus .by_ref() .take(10) .collect::>() .into_iter() .rev() - .collect::>(); + .collect(); let send_notification_counts = !timeline_pdus.is_empty() || db @@ -287,10 +290,10 @@ async fn sync_helper( .filter_map(|pdu| pdu.ok()) // Ignore all broken pdus .filter(|(_, pdu)| pdu.kind == EventType::RoomMember) .map(|(_, pdu)| { - let content = serde_json::from_value::< - ruma::events::room::member::MemberEventContent, - >(pdu.content.clone()) - .map_err(|_| Error::bad_database("Invalid member event in database."))?; + let content: RoomMemberEventContent = + serde_json::from_str(pdu.content.get()).map_err(|_| { + Error::bad_database("Invalid member event in database.") + })?; if let Some(state_key) = &pdu.state_key { let user_id = UserId::try_from(state_key.clone()).map_err(|_| { @@ -343,11 +346,11 @@ async fn sync_helper( let (joined_member_count, invited_member_count, heroes) = calculate_counts()?; let current_state_ids = db.rooms.state_full_ids(current_shortstatehash)?; - let state_events = current_state_ids + let state_events: Vec<_> = current_state_ids .iter() .map(|(_, id)| db.rooms.get_pdu(id)) .filter_map(|r| r.ok().flatten()) - .collect::>(); + .collect(); ( heroes, @@ -363,7 +366,7 @@ async fn sync_helper( // Incremental /sync let since_shortstatehash = since_shortstatehash.unwrap(); - let since_sender_member = db + let since_sender_member: Option = db .rooms .state_get( since_shortstatehash, @@ -371,13 +374,9 @@ async fn sync_helper( sender_user.as_str(), )? .and_then(|pdu| { - serde_json::from_value::>( - pdu.content.clone(), - ) - .expect("Raw::from_value always works") - .deserialize() - .map_err(|_| Error::bad_database("Invalid PDU in database.")) - .ok() + serde_json::from_str(pdu.content.get()) + .map_err(|_| Error::bad_database("Invalid PDU in database.")) + .ok() }); let joined_since_last_sync = since_sender_member @@ -432,11 +431,9 @@ async fn sync_helper( continue; } - let new_membership = serde_json::from_value::< - Raw, - >(state_event.content.clone()) - .expect("Raw::from_value always works") - .deserialize() + let new_membership = serde_json::from_str::( + state_event.content.get(), + ) .map_err(|_| Error::bad_database("Invalid PDU in database."))? .membership; @@ -525,18 +522,18 @@ async fn sync_helper( Ok(Some(db.rooms.pdu_count(pdu_id)?.to_string())) })?; - let room_events = timeline_pdus + let room_events: Vec<_> = timeline_pdus .iter() .map(|(_, pdu)| pdu.to_sync_room_event()) - .collect::>(); + .collect(); - let mut edus = db + let mut edus: Vec<_> = db .rooms .edus .readreceipts_since(&room_id, since) .filter_map(|r| r.ok()) // Filter out buggy events .map(|(_, _, v)| v) - .collect::>(); + .collect(); if db.rooms.edus.last_typing_update(&room_id, &db.globals)? > since { edus.push( @@ -565,7 +562,7 @@ async fn sync_helper( .map_err(|_| Error::bad_database("Invalid account event in database.")) .ok() }) - .collect::>(), + .collect(), }, summary: sync_events::RoomSummary { heroes, @@ -630,7 +627,7 @@ async fn sync_helper( } let mut left_rooms = BTreeMap::new(); - let all_left_rooms = db.rooms.rooms_left(&sender_user).collect::>(); + let all_left_rooms: Vec<_> = db.rooms.rooms_left(&sender_user).collect(); for result in all_left_rooms { let (room_id, left_state_events) = result?; @@ -670,7 +667,7 @@ async fn sync_helper( } let mut invited_rooms = BTreeMap::new(); - let all_invited_rooms = db.rooms.rooms_invited(&sender_user).collect::>(); + let all_invited_rooms: Vec<_> = db.rooms.rooms_invited(&sender_user).collect(); for result in all_invited_rooms { let (room_id, invite_state_events) = result?; @@ -739,7 +736,7 @@ async fn sync_helper( presence: sync_events::Presence { events: presence_updates .into_iter() - .map(|(_, v)| Raw::from(v)) + .map(|(_, v)| Raw::new(&v).expect("PresenceEvent always serializes successfully")) .collect(), }, account_data: sync_events::GlobalAccountData { @@ -752,7 +749,7 @@ async fn sync_helper( .map_err(|_| Error::bad_database("Invalid account event in database.")) .ok() }) - .collect::>(), + .collect(), }, device_lists: sync_events::DeviceLists { changed: device_list_updates.into_iter().collect(), diff --git a/src/client_server/tag.rs b/src/client_server/tag.rs index 1eb508c7..42bad4cf 100644 --- a/src/client_server/tag.rs +++ b/src/client_server/tag.rs @@ -1,7 +1,10 @@ use crate::{database::DatabaseGuard, ConduitResult, Ruma}; use ruma::{ api::client::r0::tag::{create_tag, delete_tag, get_tags}, - events::EventType, + events::{ + tag::{TagEvent, TagEventContent}, + EventType, + }, }; use std::collections::BTreeMap; @@ -26,9 +29,9 @@ pub async fn update_tag_route( let mut tags_event = db .account_data - .get::(Some(&body.room_id), sender_user, EventType::Tag)? - .unwrap_or_else(|| ruma::events::tag::TagEvent { - content: ruma::events::tag::TagEventContent { + .get(Some(&body.room_id), sender_user, EventType::Tag)? + .unwrap_or_else(|| TagEvent { + content: TagEventContent { tags: BTreeMap::new(), }, }); @@ -68,9 +71,9 @@ pub async fn delete_tag_route( let mut tags_event = db .account_data - .get::(Some(&body.room_id), sender_user, EventType::Tag)? - .unwrap_or_else(|| ruma::events::tag::TagEvent { - content: ruma::events::tag::TagEventContent { + .get(Some(&body.room_id), sender_user, EventType::Tag)? + .unwrap_or_else(|| TagEvent { + content: TagEventContent { tags: BTreeMap::new(), }, }); @@ -108,9 +111,9 @@ pub async fn get_tags_route( Ok(get_tags::Response { tags: db .account_data - .get::(Some(&body.room_id), sender_user, EventType::Tag)? - .unwrap_or_else(|| ruma::events::tag::TagEvent { - content: ruma::events::tag::TagEventContent { + .get(Some(&body.room_id), sender_user, EventType::Tag)? + .unwrap_or_else(|| TagEvent { + content: TagEventContent { tags: BTreeMap::new(), }, }) diff --git a/src/database.rs b/src/database.rs index 8a589299..8cf4f640 100644 --- a/src/database.rs +++ b/src/database.rs @@ -501,13 +501,13 @@ impl Database { if let Some(parent_stateinfo) = states_parents.last() { let statediffnew = current_state .difference(&parent_stateinfo.1) - .cloned() + .copied() .collect::>(); let statediffremoved = parent_stateinfo .1 .difference(¤t_state) - .cloned() + .copied() .collect::>(); (statediffnew, statediffremoved) @@ -701,7 +701,7 @@ impl Database { println!("Deleting starts"); - let batch2 = db + let batch2: Vec<_> = db .rooms .tokenids .iter() @@ -713,7 +713,7 @@ impl Database { None } }) - .collect::>(); + .collect(); for key in batch2 { println!("del"); diff --git a/src/database/abstraction.rs b/src/database/abstraction.rs index 5b941fbe..11bbc3b1 100644 --- a/src/database/abstraction.rs +++ b/src/database/abstraction.rs @@ -22,7 +22,7 @@ pub trait Tree: Send + Sync { fn get(&self, key: &[u8]) -> Result>>; fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>; - fn insert_batch<'a>(&self, iter: &mut dyn Iterator, Vec)>) -> Result<()>; + fn insert_batch(&self, iter: &mut dyn Iterator, Vec)>) -> Result<()>; fn remove(&self, key: &[u8]) -> Result<()>; @@ -35,7 +35,7 @@ pub trait Tree: Send + Sync { ) -> Box, Vec)> + 'a>; fn increment(&self, key: &[u8]) -> Result>; - fn increment_batch<'a>(&self, iter: &mut dyn Iterator>) -> Result<()>; + fn increment_batch(&self, iter: &mut dyn Iterator>) -> Result<()>; fn scan_prefix<'a>( &'a self, diff --git a/src/database/admin.rs b/src/database/admin.rs index 424e6746..8d8559a5 100644 --- a/src/database/admin.rs +++ b/src/database/admin.rs @@ -6,16 +6,17 @@ use std::{ use crate::{pdu::PduBuilder, Database}; use rocket::futures::{channel::mpsc, stream::StreamExt}; use ruma::{ - events::{room::message, EventType}, + events::{room::message::RoomMessageEventContent, EventType}, UserId, }; +use serde_json::value::to_raw_value; use tokio::sync::{MutexGuard, RwLock, RwLockReadGuard}; use tracing::warn; pub enum AdminCommand { RegisterAppservice(serde_yaml::Value), ListAppservices, - SendMessage(message::MessageEventContent), + SendMessage(RoomMessageEventContent), } #[derive(Clone)] @@ -58,7 +59,7 @@ impl Admin { drop(guard); - let send_message = |message: message::MessageEventContent, + let send_message = |message: RoomMessageEventContent, guard: RwLockReadGuard<'_, Database>, mutex_lock: &MutexGuard<'_, ()>| { guard @@ -66,7 +67,7 @@ impl Admin { .build_and_append_pdu( PduBuilder { event_type: EventType::RoomMessage, - content: serde_json::to_value(message) + content: to_raw_value(&message) .expect("event is valid, we just created it"), unsigned: None, state_key: None, @@ -106,9 +107,9 @@ impl Admin { count, appservices.into_iter().filter_map(|r| r.ok()).collect::>().join(", ") ); - send_message(message::MessageEventContent::text_plain(output), guard, &state_lock); + send_message(RoomMessageEventContent::text_plain(output), guard, &state_lock); } else { - send_message(message::MessageEventContent::text_plain("Failed to get appservices."), guard, &state_lock); + send_message(RoomMessageEventContent::text_plain("Failed to get appservices."), guard, &state_lock); } } AdminCommand::SendMessage(message) => { diff --git a/src/database/globals.rs b/src/database/globals.rs index c2ef1c36..f1cbbd92 100644 --- a/src/database/globals.rs +++ b/src/database/globals.rs @@ -57,8 +57,7 @@ pub struct RotationHandler(broadcast::Sender<()>, broadcast::Receiver<()>); impl RotationHandler { pub fn new() -> Self { - let (s, r) = broadcast::channel::<()>(1); - + let (s, r) = broadcast::channel(1); Self(s, r) } @@ -278,8 +277,8 @@ impl Globals { let signingkeys = self .server_signingkeys .get(origin.as_bytes())? - .and_then(|bytes| serde_json::from_slice::(&bytes).ok()) - .map(|keys| { + .and_then(|bytes| serde_json::from_slice(&bytes).ok()) + .map(|keys: ServerSigningKeys| { let mut tree = keys.verify_keys; tree.extend( keys.old_verify_keys diff --git a/src/database/key_backups.rs b/src/database/key_backups.rs index 27d8030d..98ea0111 100644 --- a/src/database/key_backups.rs +++ b/src/database/key_backups.rs @@ -81,7 +81,7 @@ impl KeyBackups { )?; self.backupid_etag .insert(&key, &globals.next_count()?.to_be_bytes())?; - Ok(version.to_string()) + Ok(version.to_owned()) } pub fn get_latest_backup_version(&self, user_id: &UserId) -> Result> { @@ -94,15 +94,15 @@ impl KeyBackups { .iter_from(&last_possible_key, true) .take_while(move |(k, _)| k.starts_with(&prefix)) .next() - .map_or(Ok(None), |(key, _)| { + .map(|(key, _)| { utils::string_from_bytes( key.rsplit(|&b| b == 0xff) .next() .expect("rsplit always returns an element"), ) .map_err(|_| Error::bad_database("backupid_algorithm key is invalid.")) - .map(Some) }) + .transpose() } pub fn get_latest_backup(&self, user_id: &UserId) -> Result> { @@ -115,7 +115,7 @@ impl KeyBackups { .iter_from(&last_possible_key, true) .take_while(move |(k, _)| k.starts_with(&prefix)) .next() - .map_or(Ok(None), |(key, value)| { + .map(|(key, value)| { let version = utils::string_from_bytes( key.rsplit(|&b| b == 0xff) .next() @@ -123,13 +123,14 @@ impl KeyBackups { ) .map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))?; - Ok(Some(( + Ok(( version, serde_json::from_slice(&value).map_err(|_| { Error::bad_database("Algorithm in backupid_algorithm is invalid.") })?, - ))) + )) }) + .transpose() } pub fn get_backup(&self, user_id: &UserId, version: &str) -> Result> { diff --git a/src/database/proxy.rs b/src/database/proxy.rs index 78e9d2bf..fb0387c9 100644 --- a/src/database/proxy.rs +++ b/src/database/proxy.rs @@ -125,7 +125,7 @@ impl WildCardedDomain { } impl std::str::FromStr for WildCardedDomain { type Err = std::convert::Infallible; - fn from_str(s: &str) -> std::result::Result { + fn from_str(s: &str) -> Result { // maybe do some domain validation? Ok(if s.starts_with("*.") { WildCardedDomain::WildCarded(s[1..].to_owned()) @@ -136,8 +136,8 @@ impl std::str::FromStr for WildCardedDomain { }) } } -impl<'de> serde::de::Deserialize<'de> for WildCardedDomain { - fn deserialize(deserializer: D) -> std::result::Result +impl<'de> Deserialize<'de> for WildCardedDomain { + fn deserialize(deserializer: D) -> Result where D: serde::de::Deserializer<'de>, { diff --git a/src/database/pusher.rs b/src/database/pusher.rs index b19f3392..f53f137b 100644 --- a/src/database/pusher.rs +++ b/src/database/pusher.rs @@ -9,8 +9,10 @@ use ruma::{ }, IncomingResponse, OutgoingRequest, SendAccessToken, }, - events::{room::power_levels::PowerLevelsEventContent, AnySyncRoomEvent, EventType}, - identifiers::RoomName, + events::{ + room::{name::RoomNameEventContent, power_levels::RoomPowerLevelsEventContent}, + AnySyncRoomEvent, EventType, + }, push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak}, serde::Raw, uint, RoomId, UInt, UserId, @@ -177,11 +179,11 @@ pub async fn send_push_notice( let mut notify = None; let mut tweaks = Vec::new(); - let power_levels: PowerLevelsEventContent = db + let power_levels: RoomPowerLevelsEventContent = db .rooms .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")? .map(|ev| { - serde_json::from_value(ev.content.clone()) + serde_json::from_str(ev.content.get()) .map_err(|_| Error::bad_database("invalid m.room.power_levels event")) }) .transpose()? @@ -226,7 +228,7 @@ pub async fn send_push_notice( pub fn get_actions<'a>( user: &UserId, ruleset: &'a Ruleset, - power_levels: &PowerLevelsEventContent, + power_levels: &RoomPowerLevelsEventContent, pdu: &Raw, room_id: &RoomId, db: &Database, @@ -318,16 +320,18 @@ async fn send_notice( let user_name = db.users.displayname(&event.sender)?; notifi.sender_display_name = user_name.as_deref(); - let room_name = db - .rooms - .room_state_get(&event.room_id, &EventType::RoomName, "")? - .map(|pdu| match pdu.content.get("name") { - Some(serde_json::Value::String(s)) => { - Some(Box::::try_from(&**s).expect("room name is valid")) - } - _ => None, - }) - .flatten(); + + let room_name = if let Some(room_name_pdu) = + db.rooms + .room_state_get(&event.room_id, &EventType::RoomName, "")? + { + serde_json::from_str::(room_name_pdu.content.get()) + .map_err(|_| Error::bad_database("Invalid room name event in database."))? + .name + } else { + None + }; + notifi.room_name = room_name.as_deref(); send_request( diff --git a/src/database/rooms.rs b/src/database/rooms.rs index ec03e3ac..c5b795bd 100644 --- a/src/database/rooms.rs +++ b/src/database/rooms.rs @@ -1,9 +1,11 @@ mod edus; pub use edus::RoomEdus; -use member::MembershipState; -use crate::{pdu::PduBuilder, server_server, utils, Database, Error, PduEvent, Result}; +use crate::{ + pdu::{EventHash, PduBuilder}, + server_server, utils, Database, Error, PduEvent, Result, +}; use lru_cache::LruCache; use regex::Regex; use ring::digest; @@ -11,18 +13,27 @@ use rocket::http::RawStr; use ruma::{ api::{client::error::ErrorKind, federation}, events::{ - ignored_user_list, push_rules, + direct::DirectEvent, + ignored_user_list::IgnoredUserListEvent, + push_rules::PushRulesEvent, room::{ - create::CreateEventContent, member, message, power_levels::PowerLevelsEventContent, + create::RoomCreateEventContent, + member::{MembershipState, RoomMemberEventContent}, + message::RoomMessageEventContent, + power_levels::RoomPowerLevelsEventContent, }, + tag::TagEvent, AnyStrippedStateEvent, AnySyncStateEvent, EventType, }, - push::{self, Action, Tweak}, + push::{Action, Ruleset, Tweak}, serde::{CanonicalJsonObject, CanonicalJsonValue, Raw}, state_res::{self, RoomVersion, StateMap}, uint, EventId, RoomAliasId, RoomId, RoomVersionId, ServerName, UserId, }; +use serde::Deserialize; +use serde_json::value::to_raw_value; use std::{ + borrow::Cow, collections::{BTreeMap, HashMap, HashSet}, convert::{TryFrom, TryInto}, mem::size_of, @@ -42,7 +53,7 @@ pub type StateHashId = Vec; pub type CompressedStateEvent = [u8; 2 * size_of::()]; pub struct Rooms { - pub edus: edus::RoomEdus, + pub edus: RoomEdus, pub(super) pduid_pdu: Arc, // PduId = ShortRoomId + Count pub(super) eventid_pduid: Arc, pub(super) roomid_pduleaves: Arc, @@ -210,16 +221,16 @@ impl Rooms { self.eventid_shorteventid .get(event_id.as_bytes())? .map_or(Ok(None), |shorteventid| { - self.shorteventid_shortstatehash.get(&shorteventid)?.map_or( - Ok::<_, Error>(None), - |bytes| { - Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| { + self.shorteventid_shortstatehash + .get(&shorteventid)? + .map(|bytes| { + utils::u64_from_bytes(&bytes).map_err(|_| { Error::bad_database( "Invalid shortstatehash bytes in shorteventid_shortstatehash", ) - })?)) - }, - ) + }) + }) + .transpose() }) } @@ -243,7 +254,7 @@ impl Rooms { kind: &EventType, sender: &UserId, state_key: Option<&str>, - content: &serde_json::Value, + content: &serde_json::value::RawValue, ) -> Result>> { let shortstatehash = if let Some(current_shortstatehash) = self.current_shortstatehash(room_id)? { @@ -252,7 +263,8 @@ impl Rooms { return Ok(HashMap::new()); }; - let auth_events = state_res::auth_types_for_event(kind, sender, state_key, content); + let auth_events = state_res::auth_types_for_event(kind, sender, state_key, content) + .expect("content is a valid JSON object"); let mut sauthevents = auth_events .into_iter() @@ -360,16 +372,16 @@ impl Rooms { let (statediffnew, statediffremoved) = if let Some(parent_stateinfo) = states_parents.last() { - let statediffnew = new_state_ids_compressed + let statediffnew: HashSet<_> = new_state_ids_compressed .difference(&parent_stateinfo.1) - .cloned() - .collect::>(); + .copied() + .collect(); - let statediffremoved = parent_stateinfo + let statediffremoved: HashSet<_> = parent_stateinfo .1 .difference(&new_state_ids_compressed) - .cloned() - .collect::>(); + .copied() + .collect(); (statediffnew, statediffremoved) } else { @@ -391,37 +403,43 @@ impl Rooms { .ok() .map(|(_, id)| id) }) { - if let Some(pdu) = self.get_pdu_json(&event_id)? { - if pdu.get("type").and_then(|val| val.as_str()) == Some("m.room.member") { - if let Ok(pdu) = serde_json::from_value::( - serde_json::to_value(&pdu).expect("CanonicalJsonObj is a valid JsonValue"), - ) { - if let Some(membership) = - pdu.content.get("membership").and_then(|membership| { - serde_json::from_value::( - membership.clone(), - ) - .ok() - }) - { - if let Some(state_key) = pdu - .state_key - .and_then(|state_key| UserId::try_from(state_key).ok()) - { - self.update_membership( - room_id, - &state_key, - membership, - &pdu.sender, - None, - db, - false, - )?; - } - } - } - } + let pdu = match self.get_pdu_json(&event_id)? { + Some(pdu) => pdu, + None => continue, + }; + + if pdu.get("type").and_then(|val| val.as_str()) != Some("m.room.member") { + continue; } + + let pdu: PduEvent = match serde_json::from_str( + &serde_json::to_string(&pdu).expect("CanonicalJsonObj can be serialized to JSON"), + ) { + Ok(pdu) => pdu, + Err(_) => continue, + }; + + #[derive(Deserialize)] + struct ExtractMembership { + membership: MembershipState, + } + + let membership = match serde_json::from_str::(pdu.content.get()) { + Ok(e) => e.membership, + Err(_) => continue, + }; + + let state_key = match pdu.state_key { + Some(k) => k, + None => continue, + }; + + let user_id = match UserId::try_from(state_key) { + Ok(id) => id, + Err(_) => continue, + }; + + self.update_membership(room_id, &user_id, membership, &pdu.sender, None, db, false)?; } self.update_joined_count(room_id, db)?; @@ -483,7 +501,7 @@ impl Rooms { if parent != 0_u64 { let mut response = self.load_shortstatehash_info(parent)?; let mut state = response.last().unwrap().1.clone(); - state.extend(added.iter().cloned()); + state.extend(added.iter().copied()); for r in &removed { state.remove(r); } @@ -965,7 +983,8 @@ impl Rooms { pub fn get_pdu_count(&self, event_id: &EventId) -> Result> { self.eventid_pduid .get(event_id.as_bytes())? - .map_or(Ok(None), |pdu_id| self.pdu_count(&pdu_id).map(Some)) + .map(|pdu_id| self.pdu_count(&pdu_id)) + .transpose() } #[tracing::instrument(skip(self))] @@ -993,7 +1012,7 @@ impl Rooms { pub fn get_pdu_json(&self, event_id: &EventId) -> Result> { self.eventid_pduid .get(event_id.as_bytes())? - .map_or_else::, _, _>( + .map_or_else( || self.eventid_outlierpdu.get(event_id.as_bytes()), |pduid| { Ok(Some(self.pduid_pdu.get(&pduid)?.ok_or_else(|| { @@ -1026,14 +1045,12 @@ impl Rooms { ) -> Result> { self.eventid_pduid .get(event_id.as_bytes())? - .map_or_else::, _, _>( - || Ok(None), - |pduid| { - Ok(Some(self.pduid_pdu.get(&pduid)?.ok_or_else(|| { - Error::bad_database("Invalid pduid in eventid_pduid.") - })?)) - }, - )? + .map(|pduid| { + self.pduid_pdu + .get(&pduid)? + .ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid.")) + }) + .transpose()? .map(|pdu| { serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")) }) @@ -1043,9 +1060,7 @@ impl Rooms { /// Returns the pdu's id. #[tracing::instrument(skip(self))] pub fn get_pdu_id(&self, event_id: &EventId) -> Result>> { - self.eventid_pduid - .get(event_id.as_bytes())? - .map_or(Ok(None), |pdu_id| Ok(Some(pdu_id))) + self.eventid_pduid.get(event_id.as_bytes()) } /// Returns the pdu. @@ -1055,14 +1070,12 @@ impl Rooms { pub fn get_non_outlier_pdu(&self, event_id: &EventId) -> Result> { self.eventid_pduid .get(event_id.as_bytes())? - .map_or_else::, _, _>( - || Ok(None), - |pduid| { - Ok(Some(self.pduid_pdu.get(&pduid)?.ok_or_else(|| { - Error::bad_database("Invalid pduid in eventid_pduid.") - })?)) - }, - )? + .map(|pduid| { + self.pduid_pdu + .get(&pduid)? + .ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid.")) + }) + .transpose()? .map(|pdu| { serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")) }) @@ -1081,11 +1094,8 @@ impl Rooms { if let Some(pdu) = self .eventid_pduid .get(event_id.as_bytes())? - .map_or_else::, _, _>( - || { - let r = self.eventid_outlierpdu.get(event_id.as_bytes()); - r - }, + .map_or_else( + || self.eventid_outlierpdu.get(event_id.as_bytes()), |pduid| { Ok(Some(self.pduid_pdu.get(&pduid)?.ok_or_else(|| { Error::bad_database("Invalid pduid in eventid_pduid.") @@ -1325,11 +1335,11 @@ impl Rooms { drop(insert_lock); // See if the event matches any known pushers - let power_levels: PowerLevelsEventContent = db + let power_levels: RoomPowerLevelsEventContent = db .rooms .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")? .map(|ev| { - serde_json::from_value(ev.content.clone()) + serde_json::from_str(ev.content.get()) .map_err(|_| Error::bad_database("invalid m.room.power_levels event")) }) .transpose()? @@ -1348,9 +1358,9 @@ impl Rooms { let rules_for_user = db .account_data - .get::(None, user, EventType::PushRules)? - .map(|ev| ev.content.global) - .unwrap_or_else(|| push::Ruleset::server_default(user)); + .get(None, user, EventType::PushRules)? + .map(|ev: PushRulesEvent| ev.content.global) + .unwrap_or_else(|| Ruleset::server_default(user)); let mut highlight = false; let mut notify = false; @@ -1404,30 +1414,21 @@ impl Rooms { } EventType::RoomMember => { if let Some(state_key) = &pdu.state_key { + #[derive(Deserialize)] + struct ExtractMembership { + membership: MembershipState, + } + // if the state_key fails let target_user_id = UserId::try_from(state_key.clone()) .expect("This state_key was previously validated"); - let membership = serde_json::from_value::( - pdu.content - .get("membership") - .ok_or(Error::BadRequest( - ErrorKind::InvalidParam, - "Invalid member event content", - ))? - .clone(), - ) - .map_err(|_| { - Error::BadRequest( - ErrorKind::InvalidParam, - "Invalid membership state content.", - ) - })?; + let content = serde_json::from_str::(pdu.content.get()) + .map_err(|_| Error::bad_database("Invalid content in pdu."))?; - let invite_state = match membership { - member::MembershipState::Invite => { + let invite_state = match content.membership { + MembershipState::Invite => { let state = self.calculate_invite_state(pdu)?; - Some(state) } _ => None, @@ -1438,7 +1439,7 @@ impl Rooms { self.update_membership( &pdu.room_id, &target_user_id, - membership, + content.membership, &pdu.sender, invite_state, db, @@ -1447,7 +1448,16 @@ impl Rooms { } } EventType::RoomMessage => { - if let Some(body) = pdu.content.get("body").and_then(|b| b.as_str()) { + #[derive(Deserialize)] + struct ExtractBody<'a> { + #[serde(borrow)] + body: Option>, + } + + let content = serde_json::from_str::>(pdu.content.get()) + .map_err(|_| Error::bad_database("Invalid content in pdu."))?; + + if let Some(body) = content.body { let mut batch = body .split_terminator(|c: char| !c.is_alphanumeric()) .filter(|s| !s.is_empty()) @@ -1475,11 +1485,11 @@ impl Rooms { { let mut lines = body.lines(); let command_line = lines.next().expect("each string has at least one line"); - let body = lines.collect::>(); + let body: Vec<_> = lines.collect(); let mut parts = command_line.split_whitespace().skip(1); if let Some(command) = parts.next() { - let args = parts.collect::>(); + let args: Vec<_> = parts.collect(); match command { "register_appservice" => { @@ -1498,18 +1508,16 @@ impl Rooms { } Err(e) => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( - format!( - "Could not parse appservice config: {}", - e - ), - ), + RoomMessageEventContent::text_plain(format!( + "Could not parse appservice config: {}", + e + )), )); } } } else { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( "Expected code block in command body.", ), )); @@ -1542,12 +1550,10 @@ impl Rooms { .count(); let elapsed = start.elapsed(); db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( - format!( - "Loaded auth chain with length {} in {:?}", - count, elapsed - ), - ), + RoomMessageEventContent::text_plain(format!( + "Loaded auth chain with length {} in {:?}", + count, elapsed + )), )); } } @@ -1580,14 +1586,17 @@ impl Rooms { ) { Ok(pdu) => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( - format!("EventId: {:?}\n{:#?}", event_id, pdu), + RoomMessageEventContent::text_plain( + format!( + "EventId: {:?}\n{:#?}", + event_id, pdu + ), ), )); } Err(e) => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( format!("EventId: {:?}\nCould not parse event: {}", event_id, e), ), )); @@ -1596,18 +1605,16 @@ impl Rooms { } Err(e) => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( - format!( - "Invalid json in command body: {}", - e - ), - ), + RoomMessageEventContent::text_plain(format!( + "Invalid json in command body: {}", + e + )), )); } } } else { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( "Expected code block in command body.", ), )); @@ -1629,7 +1636,7 @@ impl Rooms { serde_json::to_string_pretty(&json) .expect("canonical json is valid json"); db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_html( + RoomMessageEventContent::text_html( format!("{}\n```json\n{}\n```", if outlier { "PDU is outlier" @@ -1643,7 +1650,7 @@ impl Rooms { } None => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( "PDU not found.", ), )); @@ -1651,14 +1658,14 @@ impl Rooms { } } else { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( "Event ID could not be parsed.", ), )); } } else { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain( + RoomMessageEventContent::text_plain( "Usage: get_pdu ", ), )); @@ -1666,7 +1673,7 @@ impl Rooms { } _ => { db.admin.send(AdminCommand::SendMessage( - message::MessageEventContent::text_plain(format!( + RoomMessageEventContent::text_plain(format!( "Unrecognized command: {}", command )), @@ -1759,16 +1766,16 @@ impl Rooms { let (statediffnew, statediffremoved) = if let Some(parent_stateinfo) = states_parents.last() { - let statediffnew = state_ids_compressed + let statediffnew: HashSet<_> = state_ids_compressed .difference(&parent_stateinfo.1) - .cloned() - .collect::>(); + .copied() + .collect(); - let statediffremoved = parent_stateinfo + let statediffremoved: HashSet<_> = parent_stateinfo .1 .difference(&state_ids_compressed) - .cloned() - .collect::>(); + .copied() + .collect(); (statediffnew, statediffremoved) } else { @@ -1958,16 +1965,13 @@ impl Rooms { let create_event = self.room_state_get(room_id, &EventType::RoomCreate, "")?; - let create_event_content = create_event + let create_event_content: Option = create_event .as_ref() .map(|create_event| { - serde_json::from_value::>(create_event.content.clone()) - .expect("Raw::from_value always works.") - .deserialize() - .map_err(|e| { - warn!("Invalid create event: {}", e); - Error::bad_database("Invalid create event in db.") - }) + serde_json::from_str(create_event.content.get()).map_err(|e| { + warn!("Invalid create event: {}", e); + Error::bad_database("Invalid create event in db.") + }) }) .transpose()?; @@ -2000,7 +2004,10 @@ impl Rooms { let mut unsigned = unsigned.unwrap_or_default(); if let Some(state_key) = &state_key { if let Some(prev_pdu) = self.room_state_get(room_id, &event_type, state_key)? { - unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone()); + unsigned.insert( + "prev_content".to_owned(), + serde_json::from_str(prev_pdu.content.get()).expect("string is valid json"), + ); unsigned.insert( "prev_sender".to_owned(), serde_json::to_value(&prev_pdu.sender).expect("UserId::to_value always works"), @@ -2025,11 +2032,15 @@ impl Rooms { .map(|(_, pdu)| pdu.event_id.clone()) .collect(), redacts, - unsigned, - hashes: ruma::events::pdu::EventHash { + unsigned: if unsigned.is_empty() { + None + } else { + Some(to_raw_value(&unsigned).expect("to_raw_value always works")) + }, + hashes: EventHash { sha256: "aaa".to_owned(), }, - signatures: BTreeMap::new(), + signatures: None, }; let auth_check = state_res::auth_check( @@ -2205,7 +2216,7 @@ impl Rooms { let mut pdu = serde_json::from_slice::(&v) .map_err(|_| Error::bad_database("PDU in db is invalid."))?; if pdu.sender != user_id { - pdu.unsigned.remove("transaction_id"); + pdu.remove_transaction_id()?; } Ok((pdu_id, pdu)) })) @@ -2242,7 +2253,7 @@ impl Rooms { let mut pdu = serde_json::from_slice::(&v) .map_err(|_| Error::bad_database("PDU in db is invalid."))?; if pdu.sender != user_id { - pdu.unsigned.remove("transaction_id"); + pdu.remove_transaction_id()?; } Ok((pdu_id, pdu)) })) @@ -2279,7 +2290,7 @@ impl Rooms { let mut pdu = serde_json::from_slice::(&v) .map_err(|_| Error::bad_database("PDU in db is invalid."))?; if pdu.sender != user_id { - pdu.unsigned.remove("transaction_id"); + pdu.remove_transaction_id()?; } Ok((pdu_id, pdu)) })) @@ -2309,7 +2320,7 @@ impl Rooms { &self, room_id: &RoomId, user_id: &UserId, - membership: member::MembershipState, + membership: MembershipState, sender: &UserId, last_state: Option>>, db: &Database, @@ -2338,7 +2349,7 @@ impl Rooms { roomuser_id.extend_from_slice(user_id.as_bytes()); match &membership { - member::MembershipState::Join => { + MembershipState::Join => { // Check if the user never joined this room if !self.once_joined(user_id, room_id)? { // Add the user ID to the join list then @@ -2347,23 +2358,16 @@ impl Rooms { // Check if the room has a predecessor if let Some(predecessor) = self .room_state_get(room_id, &EventType::RoomCreate, "")? - .and_then(|create| { - serde_json::from_value::< - Raw, - >(create.content.clone()) - .expect("Raw::from_value always works") - .deserialize() - .ok() - }) - .and_then(|content| content.predecessor) + .and_then(|create| serde_json::from_str(create.content.get()).ok()) + .and_then(|content: RoomCreateEventContent| content.predecessor) { // Copy user settings from predecessor to the current room: // - Push rules // // TODO: finish this once push rules are implemented. // - // let mut push_rules_event_content = account_data - // .get::( + // let mut push_rules_event_content: PushRulesEvent = account_data + // .get( // None, // user_id, // EventType::PushRules, @@ -2383,13 +2387,11 @@ impl Rooms { // .ok(); // Copy old tags to new room - if let Some(tag_event) = - db.account_data.get::( - Some(&predecessor.room_id), - user_id, - EventType::Tag, - )? - { + if let Some(tag_event) = db.account_data.get::( + Some(&predecessor.room_id), + user_id, + EventType::Tag, + )? { db.account_data .update( Some(room_id), @@ -2403,11 +2405,8 @@ impl Rooms { // Copy direct chat flag if let Some(mut direct_event) = - db.account_data.get::( - None, - user_id, - EventType::Direct, - )? + db.account_data + .get::(None, user_id, EventType::Direct)? { let mut room_ids_updated = false; @@ -2442,11 +2441,11 @@ impl Rooms { self.userroomid_leftstate.remove(&userroom_id)?; self.roomuserid_leftcount.remove(&roomuser_id)?; } - member::MembershipState::Invite => { + MembershipState::Invite => { // We want to know if the sender is ignored by the receiver let is_ignored = db .account_data - .get::( + .get::( None, // Ignored users are in global account data user_id, // Receiver EventType::IgnoredUserList, @@ -2475,7 +2474,7 @@ impl Rooms { self.userroomid_leftstate.remove(&userroom_id)?; self.roomuserid_leftcount.remove(&roomuser_id)?; } - member::MembershipState::Leave | member::MembershipState::Ban => { + MembershipState::Leave | MembershipState::Ban => { if update_joined_count && self .room_members(room_id) @@ -2700,26 +2699,23 @@ impl Rooms { ); let state_lock = mutex_state.lock().await; - let mut event = serde_json::from_value::>( + let mut event: RoomMemberEventContent = serde_json::from_str( self.room_state_get(room_id, &EventType::RoomMember, &user_id.to_string())? .ok_or(Error::BadRequest( ErrorKind::BadState, "Cannot leave a room you are not a member of.", ))? .content - .clone(), + .get(), ) - .expect("from_value::> can never fail") - .deserialize() .map_err(|_| Error::bad_database("Invalid member event in database."))?; - event.membership = member::MembershipState::Leave; + event.membership = MembershipState::Leave; self.build_and_append_pdu( PduBuilder { event_type: EventType::RoomMember, - content: serde_json::to_value(event) - .expect("event is valid, we just created it"), + content: to_raw_value(&event).expect("event is valid, we just created it"), unsigned: None, state_key: Some(user_id.to_string()), redacts: None, @@ -2753,16 +2749,14 @@ impl Rooms { "User is not invited.", ))?; - let servers = invite_state + let servers: HashSet<_> = invite_state .iter() - .filter_map(|event| { - serde_json::from_str::(&event.json().to_string()).ok() - }) - .filter_map(|event| event.get("sender").cloned()) + .filter_map(|event| serde_json::from_str(event.json().get()).ok()) + .filter_map(|event: serde_json::Value| event.get("sender").cloned()) .filter_map(|sender| sender.as_str().map(|s| s.to_owned())) .filter_map(|sender| UserId::try_from(sender).ok()) .map(|user| user.server_name().to_owned()) - .collect::>(); + .collect(); for remote_server in servers { let make_leave_response = db @@ -2793,10 +2787,9 @@ impl Rooms { }; let mut leave_event_stub = - serde_json::from_str::(make_leave_response.event.json().get()) - .map_err(|_| { - Error::BadServerResponse("Invalid make_leave event json received from server.") - })?; + serde_json::from_str::(make_leave_response.event.get()).map_err( + |_| Error::BadServerResponse("Invalid make_leave event json received from server."), + )?; // TODO: Is origin needed? leave_event_stub.insert( @@ -2847,7 +2840,7 @@ impl Rooms { federation::membership::create_leave_event::v2::Request { room_id, event_id: &event_id, - pdu: PduEvent::convert_to_outgoing_federation_event(leave_event.clone()), + pdu: &PduEvent::convert_to_outgoing_federation_event(leave_event.clone()), }, ) .await?; @@ -2912,14 +2905,13 @@ impl Rooms { pub fn id_from_alias(&self, alias: &RoomAliasId) -> Result> { self.alias_roomid .get(alias.alias().as_bytes())? - .map_or(Ok(None), |bytes| { - Ok(Some( - RoomId::try_from(utils::string_from_bytes(&bytes).map_err(|_| { - Error::bad_database("Room ID in alias_roomid is invalid unicode.") - })?) - .map_err(|_| Error::bad_database("Room ID in alias_roomid is invalid."))?, - )) + .map(|bytes| { + RoomId::try_from(utils::string_from_bytes(&bytes).map_err(|_| { + Error::bad_database("Room ID in alias_roomid is invalid unicode.") + })?) + .map_err(|_| Error::bad_database("Room ID in alias_roomid is invalid.")) }) + .transpose() } #[tracing::instrument(skip(self))] @@ -2979,11 +2971,11 @@ impl Rooms { .to_vec(); let prefix_clone = prefix.clone(); - let words = search_string + let words: Vec<_> = search_string .split_terminator(|c: char| !c.is_alphanumeric()) .filter(|s| !s.is_empty()) .map(str::to_lowercase) - .collect::>(); + .collect(); let iterators = words.clone().into_iter().map(move |word| { let mut prefix2 = prefix.clone(); @@ -2996,12 +2988,7 @@ impl Rooms { self.tokenids .iter_from(&last_possible_id, true) // Newest pdus first .take_while(move |(k, _)| k.starts_with(&prefix2)) - .map(|(key, _)| { - let pdu_id = key[key.len() - size_of::()..].to_vec(); - - Ok::<_, Error>(pdu_id) - }) - .filter_map(|r| r.ok()) + .map(|(key, _)| key[key.len() - size_of::()..].to_vec()) }); Ok(( @@ -3233,11 +3220,11 @@ impl Rooms { self.roomuserid_leftcount .get(&key)? - .map_or(Ok(None), |bytes| { - Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| { - Error::bad_database("Invalid leftcount in db.") - })?)) + .map(|bytes| { + utils::u64_from_bytes(&bytes) + .map_err(|_| Error::bad_database("Invalid leftcount in db.")) }) + .transpose() } /// Returns an iterator over all rooms this user joined. diff --git a/src/database/rooms/edus.rs b/src/database/rooms/edus.rs index e0639ffd..9a27e437 100644 --- a/src/database/rooms/edus.rs +++ b/src/database/rooms/edus.rs @@ -162,11 +162,12 @@ impl RoomEdus { Ok(self .roomuserid_lastprivatereadupdate .get(&key)? - .map_or(Ok::<_, Error>(None), |bytes| { - Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| { + .map(|bytes| { + utils::u64_from_bytes(&bytes).map_err(|_| { Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid.") - })?)) - })? + }) + }) + .transpose()? .unwrap_or(0)) } @@ -286,11 +287,12 @@ impl RoomEdus { Ok(self .roomid_lasttypingupdate .get(room_id.as_bytes())? - .map_or(Ok::<_, Error>(None), |bytes| { - Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| { + .map(|bytes| { + utils::u64_from_bytes(&bytes).map_err(|_| { Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.") - })?)) - })? + }) + }) + .transpose()? .unwrap_or(0)) } @@ -331,7 +333,7 @@ impl RoomEdus { &self, user_id: &UserId, room_id: &RoomId, - presence: ruma::events::presence::PresenceEvent, + presence: PresenceEvent, globals: &super::super::globals::Globals, ) -> Result<()> { // TODO: Remove old entry? Or maybe just wipe completely from time to time? @@ -399,7 +401,7 @@ impl RoomEdus { self.presenceid_presence .get(&presence_id)? .map(|value| { - let mut presence = serde_json::from_slice::(&value) + let mut presence: PresenceEvent = serde_json::from_slice(&value) .map_err(|_| Error::bad_database("Invalid presence event in db."))?; let current_timestamp: UInt = utils::millis_since_unix_epoch() .try_into() @@ -521,7 +523,7 @@ impl RoomEdus { ) .map_err(|_| Error::bad_database("Invalid UserId in presenceid_presence."))?; - let mut presence = serde_json::from_slice::(&value) + let mut presence: PresenceEvent = serde_json::from_slice(&value) .map_err(|_| Error::bad_database("Invalid presence event in db."))?; let current_timestamp: UInt = utils::millis_since_unix_epoch() diff --git a/src/database/sending.rs b/src/database/sending.rs index 70ff1b6d..bf0cc2c1 100644 --- a/src/database/sending.rs +++ b/src/database/sending.rs @@ -27,7 +27,7 @@ use ruma::{ OutgoingRequest, }, device_id, - events::{push_rules, AnySyncEphemeralRoomEvent, EventType}, + events::{push_rules::PushRulesEvent, AnySyncEphemeralRoomEvent, EventType}, push, receipt::ReceiptType, uint, MilliSecondsSinceUnixEpoch, ServerName, UInt, UserId, @@ -165,13 +165,13 @@ impl Sending { } // Find events that have been added since starting the last request - let new_events = guard.sending.servernameevent_data + let new_events: Vec<_> = guard.sending.servernameevent_data .scan_prefix(prefix.clone()) .filter_map(|(k, v)| { Self::parse_servercurrentevent(&k, v).ok().map(|ev| (ev, k)) }) .take(30) - .collect::>(); + .collect::<>(); // TODO: find edus @@ -344,8 +344,8 @@ impl Sending { continue; } - let event = - serde_json::from_str::(read_receipt.json().get()) + let event: AnySyncEphemeralRoomEvent = + serde_json::from_str(read_receipt.json().get()) .map_err(|_| Error::bad_database("Invalid edu event in read_receipts."))?; let federation_event = match event { AnySyncEphemeralRoomEvent::Receipt(r) => { @@ -398,7 +398,7 @@ impl Sending { let edu = Edu::DeviceListUpdate(DeviceListUpdateContent { user_id, device_id: device_id!("dummy"), - device_display_name: "Dummy".to_owned(), + device_display_name: Some("Dummy".to_owned()), stream_id: uint!(1), prev_id: Vec::new(), deleted: None, @@ -485,7 +485,7 @@ impl Sending { kind: OutgoingKind, events: Vec, db: Arc>, - ) -> std::result::Result { + ) -> Result { let db = db.read().await; match &kind { @@ -573,8 +573,14 @@ impl Sending { for pdu in pdus { // Redacted events are not notification targets (we don't send push for them) - if pdu.unsigned.get("redacted_because").is_some() { - continue; + if let Some(unsigned) = &pdu.unsigned { + if let Ok(unsigned) = + serde_json::from_str::(unsigned.get()) + { + if unsigned.get("redacted_because").is_some() { + continue; + } + } } let userid = @@ -606,9 +612,9 @@ impl Sending { let rules_for_user = db .account_data - .get::(None, &userid, EventType::PushRules) + .get(None, &userid, EventType::PushRules) .unwrap_or_default() - .map(|ev| ev.content.global) + .map(|ev: PushRulesEvent| ev.content.global) .unwrap_or_else(|| push::Ruleset::server_default(&userid)); let unread: UInt = db diff --git a/src/database/uiaa.rs b/src/database/uiaa.rs index 60b9bd31..1c0fb566 100644 --- a/src/database/uiaa.rs +++ b/src/database/uiaa.rs @@ -5,7 +5,8 @@ use ruma::{ api::client::{ error::ErrorKind, r0::uiaa::{ - IncomingAuthData, IncomingPassword, IncomingUserIdentifier::MatrixId, UiaaInfo, + AuthType, IncomingAuthData, IncomingPassword, IncomingUserIdentifier::MatrixId, + UiaaInfo, }, }, signatures::CanonicalJsonValue, @@ -99,10 +100,10 @@ impl Uiaa { } // Password was correct! Let's add it to `completed` - uiaainfo.completed.push("m.login.password".to_owned()); + uiaainfo.completed.push(AuthType::Password); } IncomingAuthData::Dummy(_) => { - uiaainfo.completed.push("m.login.dummy".to_owned()); + uiaainfo.completed.push(AuthType::Dummy); } k => error!("type not supported: {:?}", k), } @@ -174,16 +175,14 @@ impl Uiaa { self.userdevicesessionid_uiaarequest .get(&userdevicesessionid)? - .map_or(Ok(None), |bytes| { - Ok::<_, Error>(Some( - serde_json::from_str::( - &utils::string_from_bytes(&bytes).map_err(|_| { - Error::bad_database("Invalid uiaa request bytes in db.") - })?, - ) - .map_err(|_| Error::bad_database("Invalid uiaa request in db."))?, - )) + .map(|bytes| { + serde_json::from_str::( + &utils::string_from_bytes(&bytes) + .map_err(|_| Error::bad_database("Invalid uiaa request bytes in db."))?, + ) + .map_err(|_| Error::bad_database("Invalid uiaa request in db.")) }) + .transpose() } fn update_uiaa_session( @@ -224,7 +223,7 @@ impl Uiaa { userdevicesessionid.push(0xff); userdevicesessionid.extend_from_slice(session.as_bytes()); - let uiaainfo = serde_json::from_slice::( + serde_json::from_slice( &self .userdevicesessionid_uiaainfo .get(&userdevicesessionid)? @@ -233,8 +232,6 @@ impl Uiaa { "UIAA session does not exist.", ))?, ) - .map_err(|_| Error::bad_database("UiaaInfo in userdeviceid_uiaainfo is invalid."))?; - - Ok(uiaainfo) + .map_err(|_| Error::bad_database("UiaaInfo in userdeviceid_uiaainfo is invalid.")) } } diff --git a/src/database/users.rs b/src/database/users.rs index ee064903..d0da0714 100644 --- a/src/database/users.rs +++ b/src/database/users.rs @@ -620,10 +620,11 @@ impl Users { key.push(0xff); key.extend_from_slice(key_id.as_bytes()); - let mut cross_signing_key = - serde_json::from_slice::(&self.keyid_key.get(&key)?.ok_or( - Error::BadRequest(ErrorKind::InvalidParam, "Tried to sign nonexistent key."), - )?) + let mut cross_signing_key: serde_json::Value = + serde_json::from_slice(&self.keyid_key.get(&key)?.ok_or(Error::BadRequest( + ErrorKind::InvalidParam, + "Tried to sign nonexistent key.", + ))?) .map_err(|_| Error::bad_database("key in keyid_key is invalid."))?; let signatures = cross_signing_key diff --git a/src/error.rs b/src/error.rs index 1ecef3aa..7faddc91 100644 --- a/src/error.rs +++ b/src/error.rs @@ -20,7 +20,7 @@ use { tracing::error, }; -pub type Result = std::result::Result; +pub type Result = std::result::Result; #[derive(Error, Debug)] pub enum Error { diff --git a/src/lib.rs b/src/lib.rs index fbffb7e3..82b8f340 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,9 @@ +#![warn( + rust_2018_idioms, + unused_qualifications, + clippy::cloned_instead_of_copied, + clippy::str_to_string +)] #![allow(clippy::suspicious_else_formatting)] #![deny(clippy::dbg_macro)] diff --git a/src/main.rs b/src/main.rs index 06409eeb..84dfb1fc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,9 @@ -#![warn(rust_2018_idioms)] +#![warn( + rust_2018_idioms, + unused_qualifications, + clippy::cloned_instead_of_copied, + clippy::str_to_string +)] #![allow(clippy::suspicious_else_formatting)] #![deny(clippy::dbg_macro)] diff --git a/src/pdu.rs b/src/pdu.rs index 8623b1a0..0f99f43b 100644 --- a/src/pdu.rs +++ b/src/pdu.rs @@ -1,19 +1,28 @@ use crate::Error; use ruma::{ events::{ - pdu::EventHash, room::member::MemberEventContent, AnyEphemeralRoomEvent, - AnyInitialStateEvent, AnyRoomEvent, AnyStateEvent, AnyStrippedStateEvent, AnySyncRoomEvent, - AnySyncStateEvent, EventType, StateEvent, + room::member::RoomMemberEventContent, AnyEphemeralRoomEvent, AnyInitialStateEvent, + AnyRoomEvent, AnyStateEvent, AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, + EventType, StateEvent, }, serde::{CanonicalJsonObject, CanonicalJsonValue, Raw}, - state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, ServerName, - ServerSigningKeyId, UInt, UserId, + state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UInt, UserId, }; use serde::{Deserialize, Serialize}; -use serde_json::json; +use serde_json::{ + json, + value::{to_raw_value, RawValue as RawJsonValue}, +}; use std::{cmp::Ordering, collections::BTreeMap, convert::TryFrom}; use tracing::warn; +/// Content hashes of a PDU. +#[derive(Clone, Debug, Deserialize, Serialize)] +pub struct EventHash { + /// The SHA-256 hash. + pub sha256: String, +} + #[derive(Clone, Deserialize, Serialize, Debug)] pub struct PduEvent { pub event_id: EventId, @@ -22,7 +31,7 @@ pub struct PduEvent { pub origin_server_ts: UInt, #[serde(rename = "type")] pub kind: EventType, - pub content: serde_json::Value, + pub content: Box, #[serde(skip_serializing_if = "Option::is_none")] pub state_key: Option, pub prev_events: Vec, @@ -30,16 +39,17 @@ pub struct PduEvent { pub auth_events: Vec, #[serde(skip_serializing_if = "Option::is_none")] pub redacts: Option, - #[serde(default, skip_serializing_if = "BTreeMap::is_empty")] - pub unsigned: BTreeMap, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub unsigned: Option>, pub hashes: EventHash, - pub signatures: BTreeMap, BTreeMap>, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub signatures: Option>, // BTreeMap, BTreeMap> } impl PduEvent { #[tracing::instrument(skip(self))] pub fn redact(&mut self, reason: &PduEvent) -> crate::Result<()> { - self.unsigned.clear(); + self.unsigned = None; let allowed: &[&str] = match self.kind { EventType::RoomMember => &["membership"], @@ -59,10 +69,9 @@ impl PduEvent { _ => &[], }; - let old_content = self - .content - .as_object_mut() - .ok_or_else(|| Error::bad_database("PDU in db has invalid content."))?; + let mut old_content: BTreeMap = + serde_json::from_str(self.content.get()) + .map_err(|_| Error::bad_database("PDU in db has invalid content."))?; let mut new_content = serde_json::Map::new(); @@ -72,12 +81,23 @@ impl PduEvent { } } - self.unsigned.insert( - "redacted_because".to_owned(), - serde_json::to_value(reason).expect("to_value(PduEvent) always works"), - ); + self.unsigned = Some(to_raw_value(&json!({ + "redacted_because": serde_json::to_value(reason).expect("to_value(PduEvent) always works") + })).expect("to string always works")); - self.content = new_content.into(); + self.content = to_raw_value(&new_content).expect("to string always works"); + + Ok(()) + } + + pub fn remove_transaction_id(&mut self) -> crate::Result<()> { + if let Some(unsigned) = &self.unsigned { + let mut unsigned: BTreeMap> = + serde_json::from_str(unsigned.get()) + .map_err(|_| Error::bad_database("Invalid unsigned in pdu event"))?; + unsigned.remove("transaction_id"); + self.unsigned = Some(to_raw_value(&unsigned).expect("unsigned is valid")); + } Ok(()) } @@ -192,7 +212,7 @@ impl PduEvent { } #[tracing::instrument(skip(self))] - pub fn to_member_event(&self) -> Raw> { + pub fn to_member_event(&self) -> Raw> { let json = json!({ "content": self.content, "type": self.kind, @@ -212,7 +232,7 @@ impl PduEvent { #[tracing::instrument] pub fn convert_to_outgoing_federation_event( mut pdu_json: CanonicalJsonObject, - ) -> Raw { + ) -> Box { if let Some(unsigned) = pdu_json .get_mut("unsigned") .and_then(|val| val.as_object_mut()) @@ -229,10 +249,7 @@ impl PduEvent { // ) // .expect("Raw::from_value always works") - serde_json::from_value::>( - serde_json::to_value(pdu_json).expect("CanonicalJson is valid serde_json::Value"), - ) - .expect("Raw::from_value always works") + to_raw_value(&pdu_json).expect("CanonicalJson is valid serde_json::Value") } pub fn from_id_val( @@ -240,7 +257,7 @@ impl PduEvent { mut json: CanonicalJsonObject, ) -> Result { json.insert( - "event_id".to_string(), + "event_id".to_owned(), CanonicalJsonValue::String(event_id.as_str().to_owned()), ); @@ -265,7 +282,7 @@ impl state_res::Event for PduEvent { &self.kind } - fn content(&self) -> &serde_json::Value { + fn content(&self) -> &RawJsonValue { &self.content } @@ -281,10 +298,6 @@ impl state_res::Event for PduEvent { Box::new(self.prev_events.iter()) } - fn depth(&self) -> &UInt { - &self.depth - } - fn auth_events(&self) -> Box + '_> { Box::new(self.auth_events.iter()) } @@ -292,18 +305,6 @@ impl state_res::Event for PduEvent { fn redacts(&self) -> Option<&EventId> { self.redacts.as_ref() } - - fn hashes(&self) -> &EventHash { - &self.hashes - } - - fn signatures(&self) -> BTreeMap, BTreeMap> { - self.signatures.clone() - } - - fn unsigned(&self) -> &BTreeMap { - &self.unsigned - } } // These impl's allow us to dedup state snapshots when resolving state @@ -329,9 +330,9 @@ impl Ord for PduEvent { /// /// Returns a tuple of the new `EventId` and the PDU as a `BTreeMap`. pub(crate) fn gen_event_id_canonical_json( - pdu: &Raw, + pdu: &RawJsonValue, ) -> crate::Result<(EventId, CanonicalJsonObject)> { - let value = serde_json::from_str(pdu.json().get()).map_err(|e| { + let value = serde_json::from_str(pdu.get()).map_err(|e| { warn!("Error parsing incoming event {:?}: {:?}", pdu, e); Error::BadServerResponse("Invalid PDU in server response") })?; @@ -352,7 +353,7 @@ pub(crate) fn gen_event_id_canonical_json( pub struct PduBuilder { #[serde(rename = "type")] pub event_type: EventType, - pub content: serde_json::Value, + pub content: Box, pub unsigned: Option>, pub state_key: Option, pub redacts: Option, @@ -363,7 +364,7 @@ impl From for PduBuilder { fn from(event: AnyInitialStateEvent) -> Self { Self { event_type: EventType::from(event.event_type()), - content: serde_json::value::to_value(event.content()) + content: to_raw_value(&event.content()) .expect("AnyStateEventContent came from JSON and can thus turn back into JSON."), unsigned: None, state_key: Some(event.state_key().to_owned()), diff --git a/src/ruma_wrapper.rs b/src/ruma_wrapper.rs index 4629de92..03c115cd 100644 --- a/src/ruma_wrapper.rs +++ b/src/ruma_wrapper.rs @@ -344,7 +344,7 @@ impl Deref for Ruma { } /// This struct converts ruma responses into rocket http responses. -pub type ConduitResult = std::result::Result, Error>; +pub type ConduitResult = Result, Error>; pub fn response(response: RumaResponse) -> response::Result<'static> { let http_response = response diff --git a/src/server_server.rs b/src/server_server.rs index 2b8b06c7..68e262b4 100644 --- a/src/server_server.rs +++ b/src/server_server.rs @@ -1,6 +1,7 @@ use crate::{ client_server::{self, claim_keys_helper, get_keys_helper}, database::{rooms::CompressedStateEvent, DatabaseGuard}, + pdu::EventHash, utils, ConduitResult, Database, Error, PduEvent, Result, Ruma, }; use get_profile_information::v1::ProfileField; @@ -39,22 +40,23 @@ use ruma::{ }, directory::{IncomingFilter, IncomingRoomNetwork}, events::{ - pdu::Pdu, receipt::{ReceiptEvent, ReceiptEventContent}, room::{ - create::CreateEventContent, - member::{MemberEventContent, MembershipState}, + create::RoomCreateEventContent, + member::{MembershipState, RoomMemberEventContent}, }, AnyEphemeralRoomEvent, EventType, }, + int, receipt::ReceiptType, - serde::Raw, + serde::JsonObject, signatures::{CanonicalJsonObject, CanonicalJsonValue}, state_res::{self, RoomVersion, StateMap}, to_device::DeviceIdOrAllDevices, uint, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, }; +use serde_json::value::{to_raw_value, RawValue as RawJsonValue}; use std::{ collections::{btree_map, hash_map, BTreeMap, BTreeSet, HashMap, HashSet}, convert::{TryFrom, TryInto}, @@ -63,7 +65,6 @@ use std::{ mem, net::{IpAddr, SocketAddr}, pin::Pin, - result::Result as StdResult, sync::{Arc, RwLock, RwLockWriteGuard}, time::{Duration, Instant, SystemTime}, }; @@ -335,7 +336,7 @@ fn add_port_to_hostname(destination_str: &str) -> FedDest { None => (destination_str, ":8448"), Some(pos) => destination_str.split_at(pos), }; - FedDest::Named(host.to_string(), port.to_string()) + FedDest::Named(host.to_owned(), port.to_owned()) } /// Returns: actual_destination, host header @@ -357,7 +358,7 @@ async fn find_actual_destination( if let Some(pos) = destination_str.find(':') { // 2: Hostname with included port let (host, port) = destination_str.split_at(pos); - FedDest::Named(host.to_string(), port.to_string()) + FedDest::Named(host.to_owned(), port.to_owned()) } else { match request_well_known(globals, destination.as_str()).await { // 3: A .well-known file is available @@ -369,7 +370,7 @@ async fn find_actual_destination( if let Some(pos) = delegated_hostname.find(':') { // 3.2: Hostname with port in .well-known file let (host, port) = delegated_hostname.split_at(pos); - FedDest::Named(host.to_string(), port.to_string()) + FedDest::Named(host.to_owned(), port.to_owned()) } else { // Delegated hostname has no port in this branch if let Some(hostname_override) = @@ -453,12 +454,12 @@ async fn find_actual_destination( let hostname = if let Ok(addr) = hostname.parse::() { FedDest::Literal(addr) } else if let Ok(addr) = hostname.parse::() { - FedDest::Named(addr.to_string(), ":8448".to_string()) + FedDest::Named(addr.to_string(), ":8448".to_owned()) } else if let Some(pos) = hostname.find(':') { let (host, port) = hostname.split_at(pos); - FedDest::Named(host.to_string(), port.to_string()) + FedDest::Named(host.to_owned(), port.to_owned()) } else { - FedDest::Named(hostname, ":8448".to_string()) + FedDest::Named(hostname, ":8448".to_owned()) }; (actual_destination, hostname) } @@ -475,11 +476,7 @@ async fn query_srv_record( .map(|srv| { srv.iter().next().map(|result| { FedDest::Named( - result - .target() - .to_string() - .trim_end_matches('.') - .to_string(), + result.target().to_string().trim_end_matches('.').to_owned(), format!(":{}", result.port()), ) }) @@ -744,7 +741,7 @@ pub async fn send_transaction_message_route( Some(id) => id, None => { // Event is invalid - resolved_map.insert(event_id, Err("Event needs a valid RoomId.".to_string())); + resolved_map.insert(event_id, Err("Event needs a valid RoomId.".to_owned())); continue; } }; @@ -958,11 +955,11 @@ pub(crate) async fn handle_incoming_pdu<'a>( is_timeline_event: bool, db: &'a Database, pub_key_map: &'a RwLock>>, -) -> StdResult>, String> { +) -> Result>, String> { match db.rooms.exists(room_id) { Ok(true) => {} _ => { - return Err("Room is unknown to this server.".to_string()); + return Err("Room is unknown to this server.".to_owned()); } } @@ -1006,12 +1003,12 @@ pub(crate) async fn handle_incoming_pdu<'a>( // 9. Fetch any missing prev events doing all checks listed here starting at 1. These are timeline events let mut graph = HashMap::new(); let mut eventid_info = HashMap::new(); - let mut todo_outlier_stack = incoming_pdu + let mut todo_outlier_stack: Vec<_> = incoming_pdu .prev_events .iter() .cloned() .map(Arc::new) - .collect::>(); + .collect(); let mut amount = 0; @@ -1071,7 +1068,7 @@ pub(crate) async fn handle_incoming_pdu<'a>( // and lexically by event_id. println!("{}", event_id); Ok(( - 0, + int!(0), MilliSecondsSinceUnixEpoch( eventid_info .get(event_id) @@ -1139,8 +1136,7 @@ fn handle_outlier_pdu<'a>( value: BTreeMap, db: &'a Database, pub_key_map: &'a RwLock>>, -) -> AsyncRecursiveType<'a, StdResult<(Arc, BTreeMap), String>> -{ +) -> AsyncRecursiveType<'a, Result<(Arc, BTreeMap), String>> { Box::pin(async move { // TODO: For RoomVersion6 we must check that Raw<..> is canonical do we anywhere?: https://matrix.org/docs/spec/rooms/v6#canonical-json @@ -1153,14 +1149,11 @@ fn handle_outlier_pdu<'a>( // 2. Check signatures, otherwise drop // 3. check content hash, redact if doesn't match - let create_event_content = - serde_json::from_value::>(create_event.content.clone()) - .expect("Raw::from_value always works.") - .deserialize() - .map_err(|e| { - warn!("Invalid create event: {}", e); - "Invalid create event in db.".to_owned() - })?; + let create_event_content: RoomCreateEventContent = + serde_json::from_str(create_event.content.get()).map_err(|e| { + warn!("Invalid create event: {}", e); + "Invalid create event in db.".to_owned() + })?; let room_version_id = &create_event_content.room_version; let room_version = RoomVersion::new(room_version_id).expect("room version is supported"); @@ -1173,14 +1166,14 @@ fn handle_outlier_pdu<'a>( Err(e) => { // Drop warn!("Dropping bad event {}: {}", event_id, e); - return Err("Signature verification failed".to_string()); + return Err("Signature verification failed".to_owned()); } Ok(ruma::signatures::Verified::Signatures) => { // Redact warn!("Calculated hash does not match: {}", event_id); match ruma::signatures::redact(&value, room_version_id) { Ok(obj) => obj, - Err(_) => return Err("Redaction failed".to_string()), + Err(_) => return Err("Redaction failed".to_owned()), } } Ok(ruma::signatures::Verified::All) => value, @@ -1195,7 +1188,7 @@ fn handle_outlier_pdu<'a>( let incoming_pdu = serde_json::from_value::( serde_json::to_value(&val).expect("CanonicalJsonObj is a valid JsonValue"), ) - .map_err(|_| "Event is not a valid PDU.".to_string())?; + .map_err(|_| "Event is not a valid PDU.".to_owned())?; // 4. fetch any missing auth events doing all checks listed here starting at 1. These are not timeline events // 5. Reject "due to auth events" if can't get all the auth events or some of the auth events are also rejected "due to auth events" @@ -1241,7 +1234,7 @@ fn handle_outlier_pdu<'a>( .expect("all auth events have state keys"), )) { hash_map::Entry::Vacant(v) => { - v.insert(auth_event.clone()); + v.insert(auth_event); } hash_map::Entry::Occupied(_) => { return Err( @@ -1276,13 +1269,13 @@ fn handle_outlier_pdu<'a>( if !state_res::event_auth::auth_check( &room_version, &incoming_pdu, - previous_create, + previous_create.as_ref(), None::, // TODO: third party invite |k, s| auth_events.get(&(k.clone(), s.to_owned())), ) - .map_err(|_e| "Auth check failed".to_string())? + .map_err(|_e| "Auth check failed".to_owned())? { - return Err("Event has failed auth check with auth events.".to_string()); + return Err("Event has failed auth check with auth events.".to_owned()); } debug!("Validation successful."); @@ -1306,7 +1299,7 @@ async fn upgrade_outlier_to_timeline_pdu( db: &Database, room_id: &RoomId, pub_key_map: &RwLock>>, -) -> StdResult>, String> { +) -> Result>, String> { if let Ok(Some(pduid)) = db.rooms.get_pdu_id(&incoming_pdu.event_id) { return Ok(Some(pduid)); } @@ -1319,14 +1312,11 @@ async fn upgrade_outlier_to_timeline_pdu( return Err("Event has been soft failed".into()); } - let create_event_content = - serde_json::from_value::>(create_event.content.clone()) - .expect("Raw::from_value always works.") - .deserialize() - .map_err(|e| { - warn!("Invalid create event: {}", e); - "Invalid create event in db.".to_owned() - })?; + let create_event_content: RoomCreateEventContent = + serde_json::from_str(create_event.content.get()).map_err(|e| { + warn!("Invalid create event: {}", e); + "Invalid create event in db.".to_owned() + })?; let room_version_id = &create_event_content.room_version; let room_version = RoomVersion::new(room_version_id).expect("room version is supported"); @@ -1456,7 +1446,7 @@ async fn upgrade_outlier_to_timeline_pdu( .map_err(|_| "Failed to get_or_create_shortstatekey".to_owned())?; Ok((shortstatekey, Arc::new(event_id))) }) - .collect::>()?, + .collect::>()?, ), Err(e) => { warn!("State resolution on prev events failed, either an event could not be found or deserialization: {}", e); @@ -1562,7 +1552,7 @@ async fn upgrade_outlier_to_timeline_pdu( let check_result = state_res::event_auth::auth_check( &room_version, &incoming_pdu, - previous_create.as_deref(), + previous_create.as_ref(), None::, // TODO: third party invite |k, s| { db.rooms @@ -1638,7 +1628,7 @@ async fn upgrade_outlier_to_timeline_pdu( .compress_state_event(*shortstatekey, id, &db.globals) .map_err(|_| "Failed to compress_state_event".to_owned()) }) - .collect::>()?; + .collect::>()?; // 13. Check if the event passes auth based on the "current state" of the room, if not "soft fail" it debug!("starting soft fail auth check"); @@ -1646,7 +1636,7 @@ async fn upgrade_outlier_to_timeline_pdu( let soft_fail = !state_res::event_auth::auth_check( &room_version, &incoming_pdu, - previous_create.as_deref(), + previous_create.as_ref(), None::, |k, s| auth_events.get(&(k.clone(), s.to_owned())), ) @@ -1758,7 +1748,7 @@ async fn upgrade_outlier_to_timeline_pdu( .compress_state_event(*k, id, &db.globals) .map_err(|_| "Failed to compress_state_event.".to_owned()) }) - .collect::>()? + .collect::>()? } else { // We do need to force an update to this room's state update_state = true; @@ -1777,7 +1767,7 @@ async fn upgrade_outlier_to_timeline_pdu( ); } - let fork_states = &fork_states + let fork_states: Vec<_> = fork_states .into_iter() .map(|map| { map.into_iter() @@ -1788,12 +1778,12 @@ async fn upgrade_outlier_to_timeline_pdu( }) .collect::>>() }) - .collect::>>() + .collect::>() .map_err(|_| "Failed to get_statekey_from_short.".to_owned())?; let state = match state_res::resolve( room_version_id, - fork_states, + &fork_states, auth_chain_sets, |id| { let res = db.rooms.get_pdu(id); @@ -1820,7 +1810,7 @@ async fn upgrade_outlier_to_timeline_pdu( .compress_state_event(shortstatekey, &event_id, &db.globals) .map_err(|_| "Failed to compress state event".to_owned()) }) - .collect::>()? + .collect::>()? }; // Set the new room state to the resolved state @@ -2040,12 +2030,12 @@ pub(crate) async fn fetch_signing_keys( trace!("Loading signing keys for {}", origin); - let mut result = db + let mut result: BTreeMap<_, _> = db .globals .signing_keys_for(origin)? .into_iter() .map(|(k, v)| (k.to_string(), v.key)) - .collect::>(); + .collect(); if contains_all_ids(&result) { return Ok(result); @@ -2250,14 +2240,10 @@ pub(crate) fn get_auth_chain<'a>( continue; } - let chunk_key = chunk - .iter() - .map(|(short, _)| short) - .copied() - .collect::>(); + let chunk_key: Vec = chunk.iter().map(|(short, _)| short).copied().collect(); if let Some(cached) = db.rooms.get_auth_chain_from_cache(&chunk_key)? { hits += 1; - full_auth_chain.extend(cached.iter().cloned()); + full_auth_chain.extend(cached.iter().copied()); continue; } misses += 1; @@ -2268,7 +2254,7 @@ pub(crate) fn get_auth_chain<'a>( for (sevent_id, event_id) in chunk { if let Some(cached) = db.rooms.get_auth_chain_from_cache(&[sevent_id])? { hits2 += 1; - chunk_cache.extend(cached.iter().cloned()); + chunk_cache.extend(cached.iter().copied()); } else { misses2 += 1; let auth_chain = Arc::new(get_auth_chain_inner(room_id, &event_id, db)?); @@ -2569,9 +2555,9 @@ pub fn get_room_state_route( Ok(get_room_state::v1::Response { auth_chain: auth_chain_ids .map(|id| { - Ok::<_, Error>(PduEvent::convert_to_outgoing_federation_event( - db.rooms.get_pdu_json(&id)?.unwrap(), - )) + db.rooms.get_pdu_json(&id).map(|maybe_json| { + PduEvent::convert_to_outgoing_federation_event(maybe_json.unwrap()) + }) }) .filter_map(|r| r.ok()) .collect(), @@ -2655,27 +2641,24 @@ pub fn create_join_event_template_route( )); } - let prev_events = db + let prev_events: Vec<_> = db .rooms .get_pdu_leaves(&body.room_id)? .into_iter() .take(20) - .collect::>(); + .collect(); let create_event = db .rooms .room_state_get(&body.room_id, &EventType::RoomCreate, "")?; - let create_event_content = create_event + let create_event_content: Option = create_event .as_ref() .map(|create_event| { - serde_json::from_value::>(create_event.content.clone()) - .expect("Raw::from_value always works.") - .deserialize() - .map_err(|e| { - warn!("Invalid create event: {}", e); - Error::bad_database("Invalid create event in db.") - }) + serde_json::from_str(create_event.content.get()).map_err(|e| { + warn!("Invalid create event: {}", e); + Error::bad_database("Invalid create event in db.") + }) }) .transpose()?; @@ -2702,7 +2685,7 @@ pub fn create_join_event_template_route( )); } - let content = serde_json::to_value(MemberEventContent { + let content = to_raw_value(&RoomMemberEventContent { avatar_url: None, blurhash: None, displayname: None, @@ -2738,7 +2721,7 @@ pub fn create_join_event_template_route( unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone()); unsigned.insert( "prev_sender".to_owned(), - serde_json::to_value(&prev_pdu.sender).expect("UserId::to_value always works"), + serde_json::from_str(prev_pdu.sender.as_str()).expect("UserId is valid string"), ); } @@ -2759,17 +2742,21 @@ pub fn create_join_event_template_route( .map(|(_, pdu)| pdu.event_id.clone()) .collect(), redacts: None, - unsigned, - hashes: ruma::events::pdu::EventHash { + unsigned: if unsigned.is_empty() { + None + } else { + Some(to_raw_value(&unsigned).expect("to_raw_value always works")) + }, + hashes: EventHash { sha256: "aaa".to_owned(), }, - signatures: BTreeMap::new(), + signatures: None, }; let auth_check = state_res::auth_check( &room_version, &pdu, - create_prev_event.as_deref(), + create_prev_event, None::, // TODO: third_party_invite |k, s| auth_events.get(&(k.clone(), s.to_owned())), ) @@ -2799,10 +2786,7 @@ pub fn create_join_event_template_route( Ok(create_join_event_template::v1::Response { room_version: Some(room_version_id), - event: serde_json::from_value::>( - serde_json::to_value(pdu_json).expect("CanonicalJson is valid serde_json::Value"), - ) - .expect("Raw::from_value always works"), + event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"), } .into()) } @@ -2810,7 +2794,7 @@ pub fn create_join_event_template_route( async fn create_join_event( db: &DatabaseGuard, room_id: &RoomId, - pdu: &Raw, + pdu: &RawJsonValue, ) -> Result { if !db.globals.allow_federation() { return Err(Error::bad_config("Federation is disabled.")); @@ -2840,7 +2824,7 @@ async fn create_join_event( } }; - let origin = serde_json::from_value::>( + let origin: Box = serde_json::from_value( serde_json::to_value(value.get("origin").ok_or(Error::BadRequest( ErrorKind::InvalidParam, "Event needs an origin field.", @@ -2947,7 +2931,7 @@ pub async fn create_join_event_v2_route( #[tracing::instrument(skip(db, body))] pub async fn create_invite_route( db: DatabaseGuard, - body: Ruma, + body: Ruma>, ) -> ConduitResult { if !db.globals.allow_federation() { return Err(Error::bad_config("Federation is disabled.")); @@ -3014,14 +2998,12 @@ pub async fn create_invite_route( let mut invite_state = body.invite_room_state.clone(); - let mut event = serde_json::from_str::>( - &body.event.json().to_string(), - ) - .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event bytes."))?; + let mut event: JsonObject = serde_json::from_str(body.event.get()) + .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event bytes."))?; event.insert("event_id".to_owned(), "$dummy".into()); - let pdu = serde_json::from_value::(event.into()).map_err(|e| { + let pdu: PduEvent = serde_json::from_value(event.into()).map_err(|e| { warn!("Invalid invite event: {}", e); Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event.") })?; @@ -3280,13 +3262,13 @@ pub(crate) async fn fetch_required_signing_keys( // Gets a list of servers for which we don't have the signing key yet. We go over // the PDUs and either cache the key or add it to the list that needs to be retrieved. fn get_server_keys_from_cache( - pdu: &Raw, + pdu: &RawJsonValue, servers: &mut BTreeMap, BTreeMap>, room_version: &RoomVersionId, pub_key_map: &mut RwLockWriteGuard<'_, BTreeMap>>, db: &Database, ) -> Result<()> { - let value = serde_json::from_str::(pdu.json().get()).map_err(|e| { + let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| { error!("Invalid PDU in server response: {:?}: {:?}", pdu, e); Error::BadServerResponse("Invalid PDU in server response") })?; @@ -3347,19 +3329,16 @@ fn get_server_keys_from_cache( trace!("Loading signing keys for {}", origin); - let result = db + let result: BTreeMap<_, _> = db .globals .signing_keys_for(origin)? .into_iter() .map(|(k, v)| (k.to_string(), v.key)) - .collect::>(); + .collect(); if !contains_all_ids(&result) { trace!("Signing key not loaded for {}", origin); - servers.insert( - origin.clone(), - BTreeMap::::new(), - ); + servers.insert(origin.clone(), BTreeMap::new()); } pub_key_map.insert(origin.to_string(), result); @@ -3374,8 +3353,8 @@ pub(crate) async fn fetch_join_signing_keys( pub_key_map: &RwLock>>, db: &Database, ) -> Result<()> { - let mut servers = - BTreeMap::, BTreeMap>::new(); + let mut servers: BTreeMap, BTreeMap> = + BTreeMap::new(); { let mut pkm = pub_key_map @@ -3440,7 +3419,7 @@ pub(crate) async fn fetch_join_signing_keys( } } - let mut futures = servers + let mut futures: FuturesUnordered<_> = servers .into_iter() .map(|(server, _)| async move { ( @@ -3454,16 +3433,16 @@ pub(crate) async fn fetch_join_signing_keys( server, ) }) - .collect::>(); + .collect(); while let Some(result) = futures.next().await { if let (Ok(get_keys_response), origin) = result { - let result = db + let result: BTreeMap<_, _> = db .globals .add_signing_key(&origin, get_keys_response.server_key.clone())? .into_iter() .map(|(k, v)| (k.to_string(), v.key)) - .collect::>(); + .collect(); pub_key_map .write() diff --git a/src/utils.rs b/src/utils.rs index d21395e1..26d71a8c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -123,7 +123,7 @@ pub fn deserialize_from_str< E: std::fmt::Display, >( deserializer: D, -) -> std::result::Result { +) -> Result { struct Visitor, E>(std::marker::PhantomData); impl<'de, T: FromStr, Err: std::fmt::Display> serde::de::Visitor<'de> for Visitor