fix: Remove redundant check that accidentally banned everyone

This commit is contained in:
timedout authored and Jade Ellis committed 2026-06-27 20:16:44 +01:00
1 parent 95473f4c24
commit 9292f16cd7
2 files changed
+3 -22

No files matched your search

@@ -229,7 +229,7 @@ impl super::Service {
let (incoming_pdu, val) = self
.handle_outlier_pdu(origin, create_event, event_id, room_id, value, false)
.await
.inspect(|e| error!("[TODO] Failed to handle outlier PDU: {e:?}"))?;
.inspect_err(|e| error!("[TODO] Failed to handle outlier PDU: {e:?}"))?;
// 8. if not timeline event: stop
if !is_timeline_event {
@@ -1,8 +1,8 @@
use std::collections::{BTreeMap, HashMap, hash_map};
use conduwuit::{
Err, Event, PduEvent, Result, debug, debug_info, debug_warn, err, info, state_res,
state_res::EventTypeExt, trace, warn,
Err, Event, PduEvent, Result, debug, debug_info, debug_warn, err, info, state_res, trace,
warn,
};
use futures::future::ready;
use ruma::{
@@ -211,25 +211,6 @@ impl super::Service {
}
}
// The original create event must be in the auth events
let claimed_create_event =
auth_events_by_key.get(&StateEventType::RoomCreate.with_state_key(""));
if let Some(claimed_create_event) = claimed_create_event {
if claimed_create_event.event_id() != create_event.event_id() {
self.services.pdu_metadata.mark_event_rejected(event_id);
self.services
.outlier
.add_pdu_outlier(pdu_event.event_id(), &incoming_pdu);
return Err!(Request(Forbidden(
"Incoming event refers to wrong create event (expected {}, got {})",
create_event.event_id(),
claimed_create_event.event_id(),
)));
}
} else if !pdu_event.auth_events.is_empty() {
return Err!(Request(Forbidden("Incoming event does not refer to any create event")));
}
let state_fetch = |ty: &StateEventType, sk: &str| {
let key = (ty.to_owned(), sk.into());
ready(auth_events_by_key.get(&key).map(ToOwned::to_owned))