magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore inbound EDUs for users that dont belong to origin server

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-05-26 18:05:15 -04:00 • committed by June 🍓🦴
parent e5e358cc68
commit f31b7b9420
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/api/server_server.rs
View file

@ -332,6 +332,11 @@ pub(crate) async fn send_transaction_message_route(
} }
for update in presence.push { for update in presence.push {
if update.user_id.server_name() != origin {
debug_warn!(%update.user_id, %origin, "received presence EDU for user not belonging to origin");
continue;
}
services().presence.set_presence( services().presence.set_presence(
&update.user_id, &update.user_id,
&update.presence, &update.presence,
@ -348,6 +353,11 @@ pub(crate) async fn send_transaction_message_route(
for (room_id, room_updates) in receipt.receipts { for (room_id, room_updates) in receipt.receipts {
for (user_id, user_updates) in room_updates.read { for (user_id, user_updates) in room_updates.read {
if user_id.server_name() != origin {
debug_warn!(%user_id, %origin, "received read receipt EDU for user not belonging to origin");
continue;
}
if services() if services()
.rooms .rooms
.event_handler .event_handler
@ -406,6 +416,11 @@ pub(crate) async fn send_transaction_message_route(
continue; continue;
} }
if typing.user_id.server_name() != origin {
debug_warn!(%typing.user_id, %origin, "received typing EDU for user not belonging to origin");
continue;
}
if services() if services()
.rooms .rooms
.event_handler .event_handler
@ -450,6 +465,11 @@ pub(crate) async fn send_transaction_message_route(
user_id, user_id,
.. ..
}) => { }) => {
if user_id.server_name() != origin {
debug_warn!(%user_id, %origin, "received device list update EDU for user not belonging to origin");
continue;
}
services().users.mark_device_key_update(&user_id)?; services().users.mark_device_key_update(&user_id)?;
}, },
Edu::DirectToDevice(DirectDeviceContent { Edu::DirectToDevice(DirectDeviceContent {
@ -458,6 +478,11 @@ pub(crate) async fn send_transaction_message_route(
message_id, message_id,
messages, messages,
}) => { }) => {
if sender.server_name() != origin {
debug_warn!(%sender, %origin, "received direct to device EDU for user not belonging to origin");
continue;
}
// Check if this is a new transaction id // Check if this is a new transaction id
if services() if services()
.transaction_ids .transaction_ids
@ -514,13 +539,16 @@ pub(crate) async fn send_transaction_message_route(
debug_info!(%user_id, %origin, "received signing key update EDU from server that does not belong to user's server"); debug_info!(%user_id, %origin, "received signing key update EDU from server that does not belong to user's server");
continue; continue;
} }
if let Some(master_key) = master_key { if let Some(master_key) = master_key {
services() services()
.users .users
.add_cross_signing_keys(&user_id, &master_key, &self_signing_key, &None, true)?; .add_cross_signing_keys(&user_id, &master_key, &self_signing_key, &None, true)?;
} }
}, },
Edu::_Custom(_) => {}, Edu::_Custom(custom) => {
debug_info!(?custom, "received custom/unknown EDU");
},
} }
} }