serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-14 13:36:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do soft fail check before doing state res to allow leave events

Browse source
This commit is contained in:
Timo Kösters 2023-06-27 18:48:34 +02:00
parent be877ef719
commit d64a56d88b
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -736,6 +736,23 @@ impl Service {
} }
info!("Auth check succeeded"); info!("Auth check succeeded");
// Soft fail check before doing state res
let auth_events = services().rooms.state.get_auth_events(
room_id,
&incoming_pdu.kind,
&incoming_pdu.sender,
incoming_pdu.state_key.as_deref(),
&incoming_pdu.content,
)?;
let soft_fail = !state_res::event_auth::auth_check(
&room_version,
&incoming_pdu,
None::<PduEvent>,
|k, s| auth_events.get(&(k.clone(), s.to_owned())),
)
.map_err(|_e| Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed."))?;
// 13. Use state resolution to find new room state // 13. Use state resolution to find new room state
// We start looking at current room state now, so lets lock the room // We start looking at current room state now, so lets lock the room
@ -822,22 +839,6 @@ impl Service {
// 14. Check if the event passes auth based on the "current state" of the room, if not soft fail it // 14. Check if the event passes auth based on the "current state" of the room, if not soft fail it
info!("Starting soft fail auth check"); info!("Starting soft fail auth check");
let auth_events = services().rooms.state.get_auth_events(
room_id,
&incoming_pdu.kind,
&incoming_pdu.sender,
incoming_pdu.state_key.as_deref(),
&incoming_pdu.content,
)?;
let soft_fail = !state_res::event_auth::auth_check(
&room_version,
&incoming_pdu,
None::<PduEvent>,
|k, s| auth_events.get(&(k.clone(), s.to_owned())),
)
.map_err(|_e| Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed."))?;
if soft_fail { if soft_fail {
services().rooms.timeline.append_incoming_pdu( services().rooms.timeline.append_incoming_pdu(
&incoming_pdu, &incoming_pdu,