From 71a1285c7b9808dd9e2563a0ddb568fbaa6cb8d4 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 27 May 2024 04:13:40 +0000 Subject: [PATCH] hoist receipt ACL check Signed-off-by: Jason Volk --- src/api/server_server.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/api/server_server.rs b/src/api/server_server.rs index c9069fa1..e4afa2a1 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -352,22 +352,22 @@ pub(crate) async fn send_transaction_message_route( } for (room_id, room_updates) in receipt.receipts { + if services() + .rooms + .event_handler + .acl_check(origin, &room_id) + .is_err() + { + debug_warn!(%origin, %room_id, "received read receipt EDU from ACL'd server"); + continue; + } + 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() - .rooms - .event_handler - .acl_check(user_id.server_name(), &room_id) - .is_err() - { - debug_warn!(%user_id, %room_id, "received read receipt EDU from ACL'd user's server"); - continue; - } - if services().rooms.state_cache.is_joined(&user_id, &room_id)? { if let Some((event_id, _)) = user_updates .event_ids