oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

Merge branch 'prevent-some-panics' into 'next'

Browse source 
fix: some edge-cases causing panics

See merge request famedly/conduit!771
This commit is contained in:
Matthias Ahouansou 2025-07-25 18:12:00 +00:00
commit c9f4609520
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/service/rooms/helpers/mod.rs
View file

@ -141,17 +141,17 @@ impl Service {
));
}
match signed_value["signatures"]
.as_object()
.ok_or(Error::BadRequest(
ErrorKind::InvalidParam,
"Server sent invalid signatures type",
))
match signed_value
.get("signatures")
.ok_or("server did not return any signatures")
.and_then(|signatures| {
signatures
.as_object()
.ok_or("Server sent invalid signatures type")
})
.and_then(|e| {
e.get(remote_server.as_str()).ok_or(Error::BadRequest(
ErrorKind::InvalidParam,
"Server did not send its signature",
))
e.get(remote_server.as_str())
.ok_or("Server did not send its signature")
}) {
Ok(signature) => {
join_event

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

@ -783,8 +783,9 @@ impl Service {
}
// Hash and sign
let mut pdu_json =
utils::to_canonical_object(&pdu).expect("event is valid, we just created it");
let mut pdu_json = utils::to_canonical_object(&pdu).map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "Event content provided is invalid")
})?;
pdu_json.remove("event_id");