nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix: ACL error shouldn't break the whole request

Browse source
This commit is contained in:
Timo Kösters 2023-08-11 20:29:22 +02:00
parent 11103a92ed
commit f73a657a23
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/api/server_server.rs
View file

@ -735,11 +735,6 @@ pub async fn send_transaction_message_route(
}; };
// We do not add the event_id field to the pdu here because of signature and hashes checks // We do not add the event_id field to the pdu here because of signature and hashes checks
services()
.rooms
.event_handler
.acl_check(sender_servername, &room_id)?;
let mutex = Arc::clone( let mutex = Arc::clone(
services() services()
.globals .globals

2
src/service/rooms/event_handler/mod.rs
View file

@ -92,6 +92,8 @@ impl Service {
)); ));
} }
services().rooms.event_handler.acl_check(origin, &room_id)?;
// 1. Skip the PDU if we already have it as a timeline event // 1. Skip the PDU if we already have it as a timeline event
if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(event_id)? { if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(event_id)? {
return Ok(Some(pdu_id.to_vec())); return Ok(Some(pdu_id.to_vec()));