backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 15:21:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor soft fail check

Browse source
This commit is contained in:
Olivia Lee 2025-07-19 16:53:45 -07:00 • committed by Charles Hall
parent aade2e17c2
commit 644639ad10
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/service/rooms/event_handler.rs
View file

@ -912,19 +912,22 @@ impl Service {
&incoming_pdu.content, &incoming_pdu.content,
)?; )?;
let soft_fail = !state_res::event_auth::auth_check( let auth_fail_against_current = !state_res::event_auth::auth_check(
&ruma_room_version, &ruma_room_version,
&incoming_pdu, &incoming_pdu,
|k, s| auth_events.get(&(k.clone(), s.to_owned())), |k, s| auth_events.get(&(k.clone(), s.to_owned())),
) )
.map_err(|_e| { .map_err(|_e| {
Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed.") Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed.")
})? || incoming_pdu.kind })?;
let cannot_redact = incoming_pdu.kind
== TimelineEventType::RoomRedaction == TimelineEventType::RoomRedaction
&& services() && !services()
.rooms .rooms
.state_accessor .state_accessor
.redaction_event_allowed(&incoming_pdu)?; .redaction_event_allowed(&incoming_pdu)?;
let soft_fail = auth_fail_against_current || cannot_redact;
// 13. Use state resolution to find new room state // 13. Use state resolution to find new room state