MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 05:14:20 +01:00
Code Issues Releases Activity

fix: don't unwrap server keys

Browse source
This commit is contained in:
Timo Kösters 2023-02-22 23:49:49 +01:00
parent 8b648d0d3f
commit bde4880c1d
No known key found for this signature in database
GPG key ID: 0B25E636FBA7E4CB
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/service/rooms/event_handler/mod.rs
View file

@ -1529,17 +1529,18 @@ impl Service {
while let Some(result) = futures.next().await { while let Some(result) = futures.next().await {
if let (Ok(get_keys_response), origin) = result { if let (Ok(get_keys_response), origin) = result {
let result: BTreeMap<_, _> = services() if let Ok(key) = get_keys_response.server_key.deserialize() {
.globals let result: BTreeMap<_, _> = services()
.add_signing_key(&origin, get_keys_response.server_key.deserialize().unwrap())? .globals
.into_iter() .add_signing_key(&origin, key)?
.map(|(k, v)| (k.to_string(), v.key)) .into_iter()
.collect(); .map(|(k, v)| (k.to_string(), v.key))
.collect();
pub_key_map pub_key_map
.write() .write()
.map_err(|_| Error::bad_database("RwLock is poisoned."))? .map_err(|_| Error::bad_database("RwLock is poisoned."))?
.insert(origin.to_string(), result); .insert(origin.to_string(), result);
}
} }
} }