serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-29 05:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'parse-pdu-command-panic' into 'next'

Browse source 
fix: do not panic on a JSON not containing the PDU

Closes #236

See merge request famedly/conduit!304
This commit is contained in:
Timo Kösters 2022-02-12 21:22:37 +00:00
commit 0c4b42ac13
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/database/admin.rs
View file

@ -354,24 +354,26 @@ fn process_admin_command(
let string = body[1..body.len() - 1].join("\n"); let string = body[1..body.len() - 1].join("\n");
match serde_json::from_str(&string) { match serde_json::from_str(&string) {
Ok(value) => { Ok(value) => {
let event_id = EventId::parse(format!( match ruma::signatures::reference_hash(&value, &RoomVersionId::V6) {
"${}", Ok(hash) => {
// Anything higher than version3 behaves the same let event_id = EventId::parse(format!("${}", hash));
ruma::signatures::reference_hash(&value, &RoomVersionId::V6)
.expect("ruma can calculate reference hashes")
))
.expect("ruma's reference hashes are valid event ids");
match serde_json::from_value::<PduEvent>( match serde_json::from_value::<PduEvent>(
serde_json::to_value(value).expect("value is json"), serde_json::to_value(value).expect("value is json"),
) { ) {
Ok(pdu) => RoomMessageEventContent::text_plain(format!( Ok(pdu) => RoomMessageEventContent::text_plain(format!(
"EventId: {:?}\n{:#?}", "EventId: {:?}\n{:#?}",
event_id, pdu event_id, pdu
)), )),
Err(e) => RoomMessageEventContent::text_plain(format!(
"EventId: {:?}\nCould not parse event: {}",
event_id, e
)),
}
}
Err(e) => RoomMessageEventContent::text_plain(format!( Err(e) => RoomMessageEventContent::text_plain(format!(
"EventId: {:?}\nCould not parse event: {}", "Could not parse PDU JSON: {:?}",
event_id, e e
)), )),
} }
} }