char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'incoming-pdu' into 'master' 

fix: don't accept incoming pdus if we know about them already

Closes #70

See merge request famedly/conduit!33
next
Timo Kösters 2021-03-04 14:38:07 +00:00
parent 03440f4b15 1ce00f90fe
commit 643109309b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server_server.rs
View File

@ -558,6 +558,12 @@ pub async fn send_transaction_message_route<'a>(
// TODO: redact event if hashing fails // TODO: redact event if hashing fails
let (event_id, value) = crate::pdu::process_incoming_pdu(pdu); let (event_id, value) = crate::pdu::process_incoming_pdu(pdu);
// Skip the pdu if we already know about it
if db.rooms.get_pdu_id(&event_id)?.is_some() {
resolved_map.insert(event_id, Err("We already know about this event".into()));
continue;
}
let pdu = serde_json::from_value::<PduEvent>( let pdu = serde_json::from_value::<PduEvent>(
serde_json::to_value(&value).expect("CanonicalJsonObj is a valid JsonValue"), serde_json::to_value(&value).expect("CanonicalJsonObj is a valid JsonValue"),
) )