TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix auth event fetching

Browse source
This commit is contained in:
Timo Kösters 2021-12-16 15:54:42 +01:00
parent 08eed81139
commit 463ded00b2
No known key found for this signature in database
GPG key ID: 356E705610F626D5
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/server_server.rs
View file

@ -1878,15 +1878,16 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
if let Ok(Some(local_pdu)) = db.rooms.get_pdu(id) { if let Ok(Some(local_pdu)) = db.rooms.get_pdu(id) {
trace!("Found {} in db", id); trace!("Found {} in db", id);
pdus.push((local_pdu, None)); pdus.push((local_pdu, None));
continue;
} }
// c. Ask origin server over federation // c. Ask origin server over federation
// We also handle its auth chain here so we don't get a stack overflow in // We also handle its auth chain here so we don't get a stack overflow in
// handle_outlier_pdu. // handle_outlier_pdu.
let mut todo_auth_events = vec![id]; let mut todo_auth_events = vec![Arc::clone(id)];
let mut events_in_reverse_order = Vec::new(); let mut events_in_reverse_order = Vec::new();
while let Some(next_id) = todo_auth_events.pop() { while let Some(next_id) = todo_auth_events.pop() {
if let Ok(Some(_)) = db.rooms.get_pdu(next_id) { if let Ok(Some(_)) = db.rooms.get_pdu(&next_id) {
trace!("Found {} in db", id); trace!("Found {} in db", id);
continue; continue;
} }
@ -1897,7 +1898,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
.send_federation_request( .send_federation_request(
&db.globals, &db.globals,
origin, origin,
get_event::v1::Request { event_id: next_id }, get_event::v1::Request { event_id: &next_id },
) )
.await .await
{ {
@ -1907,21 +1908,35 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
match crate::pdu::gen_event_id_canonical_json(&res.pdu) { match crate::pdu::gen_event_id_canonical_json(&res.pdu) {
Ok(t) => t, Ok(t) => t,
Err(_) => { Err(_) => {
back_off((**next_id).to_owned()); back_off((*next_id).to_owned());
continue; continue;
} }
}; };
if calculated_event_id != **next_id { if calculated_event_id != *next_id {
warn!("Server didn't return event id we requested: requested: {}, we got {}. Event: {:?}", warn!("Server didn't return event id we requested: requested: {}, we got {}. Event: {:?}",
next_id, calculated_event_id, &res.pdu); next_id, calculated_event_id, &res.pdu);
} }
if let Some(auth_events) = value.get("auth_events").and_then(|c| c.as_array()) {
for auth_event in auth_events {
if let Some(Ok(auth_event)) = auth_event.as_str()
.map(|e| serde_json::from_str(e)) {
todo_auth_events.push(auth_event);
} else {
warn!("Auth event id is not valid");
}
}
} else {
warn!("Auth event list invalid");
}
events_in_reverse_order.push((next_id, value)); events_in_reverse_order.push((next_id, value));
} }
Err(_) => { Err(_) => {
warn!("Failed to fetch event: {}", next_id); warn!("Failed to fetch event: {}", next_id);
back_off((**next_id).to_owned()); back_off((*next_id).to_owned());
} }
} }
} }
@ -1930,7 +1945,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
match handle_outlier_pdu( match handle_outlier_pdu(
origin, origin,
create_event, create_event,
next_id, &next_id,
room_id, room_id,
value.clone(), value.clone(),
db, db,
@ -1943,7 +1958,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
} }
Err(e) => { Err(e) => {
warn!("Authentication of event {} failed: {:?}", next_id, e); warn!("Authentication of event {} failed: {:?}", next_id, e);
back_off((**next_id).to_owned()); back_off((*next_id).to_owned());
} }
} }
} }