serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-04-01 18:50:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: checks for incoming cross signing changes

Browse source
This commit is contained in:
Timo Kösters 2022-04-06 19:08:23 +02:00
parent b8411ae2fd
commit 17ad5f0595
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
1 changed files with 10 additions and 2 deletions

12
src/server_server.rs
View file

@ -639,6 +639,11 @@ pub async fn send_transaction_message_route(
return Err(Error::bad_config("Federation is disabled."));
}
let sender_servername = body
.sender_servername
.as_ref()
.expect("server is authenticated");
let mut resolved_map = BTreeMap::new();
let pub_key_map = RwLock::new(BTreeMap::new());
@ -674,7 +679,7 @@ pub async fn send_transaction_message_route(
}
};
acl_check(&body.origin, &room_id, &db)?;
acl_check(&sender_servername, &room_id, &db)?;
let mutex = Arc::clone(
db.globals
@ -689,7 +694,7 @@ pub async fn send_transaction_message_route(
resolved_map.insert(
event_id.clone(),
handle_incoming_pdu(
&body.origin,
&sender_servername,
&event_id,
&room_id,
value,
@ -845,6 +850,9 @@ pub async fn send_transaction_message_route(
master_key,
self_signing_key,
}) => {
if user_id.server_name() != sender_servername {
continue;
}
if let Some(master_key) = master_key {
db.users.add_cross_signing_keys(
&user_id,