Browse Source

fix: ACL error shouldn't break the whole request

merge-requests/560/head
Timo Kösters 3 years ago
parent
commit
f73a657a23
No known key found for this signature in database
GPG Key ID: B25E636FBA7E4CB
  1. 5
      src/api/server_server.rs
  2. 2
      src/service/rooms/event_handler/mod.rs

5
src/api/server_server.rs

@ -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
services()
.rooms
.event_handler
.acl_check(sender_servername, &room_id)?;
let mutex = Arc::clone(
services()
.globals

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

@ -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
if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(event_id)? {
return Ok(Some(pdu_id.to_vec()));

Loading…
Cancel
Save