dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-27 20:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_panic_on_long_message' into 'next'

Browse source 
Don't panic when signing event fails.

Closes #232

See merge request famedly/conduit!343
This commit is contained in:
Timo Kösters 2022-05-28 20:47:15 +00:00
parent 89eb54b7ff 090d0fe684
commit 39bc84d81c
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/database/rooms.rs
View file

@ -1938,13 +1938,26 @@ impl Rooms {
CanonicalJsonValue::String(db.globals.server_name().as_ref().to_owned()),
);
ruma::signatures::hash_and_sign_event(
match ruma::signatures::hash_and_sign_event(
db.globals.server_name().as_str(),
db.globals.keypair(),
&mut pdu_json,
&room_version_id,
)
.expect("event is valid, we just created it");
) {
Ok(_) => {}
Err(e) => {
return match e {
ruma::signatures::Error::PduSize => Err(Error::BadRequest(
ErrorKind::TooLarge,
"Message is too long",
)),
_ => Err(Error::BadRequest(
ErrorKind::Unknown,
"Signing event failed",
)),
}
}
}
// Generate event id
pdu.event_id = EventId::parse_arc(format!(