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

work around bug in ruma::state_res::resolve

Browse source
This commit is contained in:
Charles Hall 2024-11-02 15:24:52 -07:00
parent 0b4cc6a1b1
commit 4e1691fc9d
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/cli/repair.rs
View file

@ -18,7 +18,9 @@ use petgraph::{
};
use rayon::iter::{IntoParallelIterator, ParallelIterator};
use ruma::{
events::{room::member::MembershipState, StateEventType},
events::{
room::member::MembershipState, StateEventType, TimelineEventType,
},
state_res::StateMap,
EventId, RoomId, RoomVersionId, UserId,
};
@ -441,8 +443,26 @@ fn get_state_event_graphs(
return None;
};
// Filter out non-state events
pdu.state_key?;
let Some(state_key) = pdu.state_key else {
// Filter out non-state events
return None;
};
// Ruma fails the entire state resolution if it sees an event whose
// `state_key` it needs to parse as an ID and the parsing fails, so
// we pre-emptively drop these events. Real-world cases where this
// has happened are detailed on the issue linked below.
//
// <https://github.com/ruma/ruma/issues/1944>
if pdu.kind == TimelineEventType::RoomMember
&& <&UserId>::try_from(&*state_key).is_err()
{
t::warn!(
event_id = %pdu.event_id,
"Dropping event that could cause state resolution to fail",
);
return None;
}
Some((
<Arc<RoomId>>::from(pdu.room_id),