improvement: federation get_keys and optimize signingkey storage

- get encryption keys over federation
- optimize signing key storage
- rate limit parsing of bad events
- rate limit signature fetching
- dependency bumps

src/client_server/config.rs

@@ -8,11 +8,11 @@ use ruma::{
             set_room_account_data,
         },
     },
-    events::{custom::CustomEventContent, AnyBasicEventContent, BasicEvent},
+    events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
     serde::Raw,
 };
 use serde::Deserialize;
-use serde_json::value::RawValue as RawJsonValue;
+use serde_json::{json, value::RawValue as RawJsonValue};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};
@@ -28,7 +28,7 @@ pub async fn set_global_account_data_route(
 ) -> ConduitResult<set_global_account_data::Response> {
     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::from_str::<serde_json::Value>(body.data.get())
         .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
 
     let event_type = body.event_type.to_string();
@@ -37,9 +37,10 @@ pub async fn set_global_account_data_route(
         None,
         sender_user,
         event_type.clone().into(),
-        &BasicEvent {
-            content: CustomEventContent { event_type, data },
-        },
+        &json!({
+            "type": event_type,
+            "content": data,
+        }),
         &db.globals,
     )?;
 
@@ -71,9 +72,10 @@ pub async fn set_room_account_data_route(
         Some(&body.room_id),
         sender_user,
         event_type.clone().into(),
-        &BasicEvent {
-            content: CustomEventContent { event_type, data },
-        },
+        &json!({
+            "type": event_type,
+            "content": data,
+        }),
         &db.globals,
     )?;
 
@@ -99,7 +101,7 @@ pub async fn get_global_account_data_route(
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
     db.flush().await?;
 
-    let account_data = serde_json::from_str::<ExtractEventContent>(event.get())
+    let account_data = serde_json::from_str::<ExtractGlobalEventContent>(event.get())
         .map_err(|_| Error::bad_database("Invalid account data event in db."))?
         .content;
 
@@ -130,7 +132,7 @@ pub async fn get_room_account_data_route(
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
     db.flush().await?;
 
-    let account_data = serde_json::from_str::<ExtractEventContent>(event.get())
+    let account_data = serde_json::from_str::<ExtractRoomEventContent>(event.get())
         .map_err(|_| Error::bad_database("Invalid account data event in db."))?
         .content;
 
@@ -138,6 +140,11 @@ pub async fn get_room_account_data_route(
 }
 
 #[derive(Deserialize)]
-struct ExtractEventContent {
-    content: Raw<AnyBasicEventContent>,
+struct ExtractRoomEventContent {
+    content: Raw<AnyRoomAccountDataEventContent>,
+}
+
+#[derive(Deserialize)]
+struct ExtractGlobalEventContent {
+    content: Raw<AnyGlobalAccountDataEventContent>,
 }