magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

output error if sending to trusted key server failed

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-02 00:45:03 -04:00 • committed by June
parent 935202eaa3
commit 667db8e8a3
1 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1445,7 +1445,7 @@ impl Service {
) -> Result<()> { ) -> Result<()> {
for server in services().globals.trusted_servers() { for server in services().globals.trusted_servers() {
info!("Asking batch signing keys from trusted server {}", server); info!("Asking batch signing keys from trusted server {}", server);
if let Ok(keys) = services() match services()
.sending .sending
.send_federation_request( .send_federation_request(
server, server,
@ -1455,35 +1455,39 @@ impl Service {
) )
.await .await
{ {
debug!("Got signing keys: {:?}", keys); Ok(keys) => {
let mut pkm = pub_key_map.write().await; debug!("Got signing keys: {:?}", keys);
for k in keys.server_keys { let mut pkm = pub_key_map.write().await;
let k = match k.deserialize() { for k in keys.server_keys {
Ok(key) => key, let k = match k.deserialize() {
Err(e) => { Ok(key) => key,
warn!("Received error {e} while fetching keys from trusted server {server}"); Err(e) => {
warn!("{}", k.into_json()); warn!("Received error {e} while fetching keys from trusted server {server}");
continue; warn!("{}", k.into_json());
}, continue;
}; },
};
// TODO: Check signature from trusted server? // TODO: Check signature from trusted server?
servers.remove(&k.server_name); servers.remove(&k.server_name);
let result = services() let result = services()
.globals .globals
.add_signing_key(&k.server_name, k.clone())? .add_signing_key(&k.server_name, k.clone())?
.into_iter() .into_iter()
.map(|(k, v)| (k.to_string(), v.key)) .map(|(k, v)| (k.to_string(), v.key))
.collect::<BTreeMap<_, _>>(); .collect::<BTreeMap<_, _>>();
pkm.insert(k.server_name.to_string(), result); pkm.insert(k.server_name.to_string(), result);
} }
} else { },
warn!( Err(e) => {
"Failed sending batched key request to trusted key server {server} for the remote servers \ warn!(
{servers:?}" "Failed sending batched key request to trusted key server {server} for the remote servers \
); {:?}: {e}",
servers
);
},
} }
} }