From 23cf39c525790122a97090b041e16b68e94644de Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Mon, 31 Oct 2022 12:08:01 +0100
Subject: [PATCH] Cleanly handle invalid response from trusted server instead
 of panicking

---
 src/service/rooms/event_handler/mod.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index 477a9719..3b41e86f 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -1464,7 +1464,17 @@ impl Service {
                     .write()
                     .map_err(|_| Error::bad_database("RwLock is poisoned."))?;
                 for k in keys.server_keys {
-                    let k = k.deserialize().unwrap();
+                    let k = match k.deserialize() {
+                        Ok(key) => key,
+                        Err(e) => {
+                            warn!(
+                                "Received error {} while fetching keys from trusted server {}",
+                                e, server
+                            );
+                            warn!("{}", k.into_json());
+                            continue;
+                        }
+                    };
 
                     // TODO: Check signature from trusted server?
                     servers.remove(&k.server_name);