split server_keys from event_handler into service

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-31 21:05:15 +00:00
parent eb94aa7079
commit 5b1642f641
11 changed files with 61 additions and 39 deletions

View file

@ -883,8 +883,7 @@ async fn join_room_by_id_helper_remote(
info!("Fetching join signing keys");
services
.rooms
.event_handler
.server_keys
.fetch_join_signing_keys(&send_join_response, &room_version_id, &pub_key_map)
.await?;
@ -1230,8 +1229,7 @@ async fn join_room_by_id_helper_local(
drop(state_lock);
let pub_key_map = RwLock::new(BTreeMap::new());
services
.rooms
.event_handler
.server_keys
.fetch_required_signing_keys([&signed_value], &pub_key_map)
.await?;
services
@ -1474,8 +1472,7 @@ pub(crate) async fn invite_helper(
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Origin field is invalid."))?;
services
.rooms
.event_handler
.server_keys
.fetch_required_signing_keys([&value], &pub_key_map)
.await?;

View file

@ -250,8 +250,7 @@ async fn auth_server(
};
let keys_result = services
.rooms
.event_handler
.server_keys
.fetch_signing_keys_for_server(origin, vec![x_matrix.key.to_string()])
.await;

View file

@ -105,8 +105,7 @@ async fn handle_pdus(
let pub_key_map = RwLock::new(BTreeMap::new());
if !parsed_pdus.is_empty() {
services
.rooms
.event_handler
.server_keys
.fetch_required_signing_keys(parsed_pdus.iter().map(|(_event_id, event, _room_id)| event), &pub_key_map)
.await
.unwrap_or_else(|e| warn!("Could not fetch all signatures for PDUs from {origin}: {e:?}"));

View file

@ -138,8 +138,7 @@ async fn create_join_event(
}
services
.rooms
.event_handler
.server_keys
.fetch_required_signing_keys([&value], &pub_key_map)
.await?;

View file

@ -150,8 +150,7 @@ async fn create_leave_event(
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "origin is not a server name."))?;
services
.rooms
.event_handler
.server_keys
.fetch_required_signing_keys([&value], &pub_key_map)
.await?;