dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fed: relax read receipt EDU check 

so in theory: guest users, peaking over federation,
and world readable rooms should be allowed to send
read receipts even if they're not joined.

relaxing this check to only allow the read receipt if
the server has at least 1 member in the room makes
some of this still work

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-05-28 15:07:30 -04:00
parent 884cbab135
commit 68f42f5a2f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/server_server.rs
View File

@ -367,7 +367,13 @@ pub(crate) async fn send_transaction_message_route(
continue; continue;
} }
if services().rooms.state_cache.is_joined(&user_id, &room_id)? { if services()
.rooms
.state_cache
.room_members(&room_id)
.filter_map(Result::ok)
.any(|member| member.server_name() == user_id.server_name())
{
for event_id in &user_updates.event_ids { for event_id in &user_updates.event_ids {
let mut user_receipts = BTreeMap::new(); let mut user_receipts = BTreeMap::new();
user_receipts.insert(user_id.clone(), user_updates.data.clone()); user_receipts.insert(user_id.clone(), user_updates.data.clone());
@ -389,7 +395,7 @@ pub(crate) async fn send_transaction_message_route(
.readreceipt_update(&user_id, &room_id, event)?; .readreceipt_update(&user_id, &room_id, event)?;
} }
} else { } else {
debug_warn!(%user_id, %room_id, "received read receipt EDU for user not in room"); debug_warn!(%user_id, %room_id, %origin, "received read receipt EDU from server who does not have a single member from their server in the room");
continue; continue;
} }
} }
@ -411,7 +417,7 @@ pub(crate) async fn send_transaction_message_route(
.acl_check(typing.user_id.server_name(), &typing.room_id) .acl_check(typing.user_id.server_name(), &typing.room_id)
.is_err() .is_err()
{ {
debug_warn!(%typing.user_id, %typing.room_id, "received typing EDU for ACL'd user's server"); debug_warn!(%typing.user_id, %typing.room_id, %origin, "received typing EDU for ACL'd user's server");
continue; continue;
} }
@ -441,7 +447,7 @@ pub(crate) async fn send_transaction_message_route(
.await?; .await?;
} }
} else { } else {
debug_warn!(%typing.user_id, %typing.room_id, "received typing EDU for user not in room"); debug_warn!(%typing.user_id, %typing.room_id, %origin, "received typing EDU for user not in room");
continue; continue;
} }
}, },