From bde4880c1d169066e22e4c04288f8bce6c84b32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Wed, 22 Feb 2023 23:49:49 +0100
Subject: [PATCH] fix: don't unwrap server keys
---
src/service/rooms/event_handler/mod.rs | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index 63301b81d..e3502e654 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -1529,17 +1529,18 @@ pub(crate) async fn fetch_join_signing_keys(
while let Some(result) = futures.next().await {
if let (Ok(get_keys_response), origin) = result {
- let result: BTreeMap<_, _> = services()
- .globals
- .add_signing_key(&origin, get_keys_response.server_key.deserialize().unwrap())?
- .into_iter()
- .map(|(k, v)| (k.to_string(), v.key))
- .collect();
-
- pub_key_map
- .write()
- .map_err(|_| Error::bad_database("RwLock is poisoned."))?
- .insert(origin.to_string(), result);
+ if let Ok(key) = get_keys_response.server_key.deserialize() {
+ let result: BTreeMap<_, _> = services()
+ .globals
+ .add_signing_key(&origin, key)?
+ .into_iter()
+ .map(|(k, v)| (k.to_string(), v.key))
+ .collect();
+ pub_key_map
+ .write()
+ .map_err(|_| Error::bad_database("RwLock is poisoned."))?
+ .insert(origin.to_string(), result);
+ }
}
}
--
GitLab