melody/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-06-26 15:46:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unsafe, untested, and potentially overeager PDU sanity checks

Browse source
This commit is contained in:
nexy7574 2025-06-11 00:45:57 +01:00 • committed by Jacob Taylor
parent b7e472a838
commit f91bc71eba
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/matrix/state_res/event_auth.rs
View file

@ -219,7 +219,7 @@ where
/* /*
// TODO: In the past this code was commented as it caused problems with Synapse. This is no // TODO: In the past this code was commented as it caused problems with Synapse. This is no
// longer the case. This needs to be implemented. // longer the case. This needs to be implemented.
// See also: https://github.com/ruma/ruma/pull/2064 // See also: https://github.com/ruma/ruma/pull/2064
// //
// 2. Reject if auth_events // 2. Reject if auth_events
// a. auth_events cannot have duplicate keys since it's a BTree // a. auth_events cannot have duplicate keys since it's a BTree
@ -264,9 +264,11 @@ where
if room_id_server_name != room_create_event.sender().server_name() { if room_id_server_name != room_create_event.sender().server_name() {
warn!( warn!(
"servername of room ID origin ({}) does not match servername of m.room.create sender ({})", "servername of room ID origin ({}) does not match servername of m.room.create \
sender ({})",
room_id_server_name, room_id_server_name,
room_create_event.sender().server_name()); room_create_event.sender().server_name()
);
return Ok(false); return Ok(false);
} }

14
src/service/rooms/timeline/mod.rs
View file

@ -698,6 +698,20 @@ impl Service {
.await .await
.saturating_add(uint!(1)); .saturating_add(uint!(1));
if state_key.is_none() {
if prev_events.is_empty() {
warn!("Timeline event had zero prev_events, something broke.");
return Err!(Request(Unknown("Timeline event had zero prev_events.")));
}
if depth.le(&uint!(2)) {
warn!(
"Had unsafe depth of {depth} in {room_id} when creating non-state event. \
Bad!"
);
return Err!(Request(Unknown("Unsafe depth for non-state event.")));
}
};
let mut unsigned = unsigned.unwrap_or_default(); let mut unsigned = unsigned.unwrap_or_default();
if let Some(state_key) = &state_key { if let Some(state_key) = &state_key {