Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
667db8e8
Commit
667db8e8
authored
11 months ago
by
🥺
Committed by
🥺
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
output error if sending to trusted key server failed
Signed-off-by:
strawberry
<
strawberry@puppygock.gay
>
parent
935202ea
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/service/rooms/event_handler/mod.rs
+31
-27
31 additions, 27 deletions
src/service/rooms/event_handler/mod.rs
with
31 additions
and
27 deletions
src/service/rooms/event_handler/mod.rs
+
31
−
27
View file @
667db8e8
...
@@ -1445,7 +1445,7 @@ async fn batch_request_signing_keys(
...
@@ -1445,7 +1445,7 @@ async fn batch_request_signing_keys(
)
->
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 @@ async fn batch_request_signing_keys(
...
@@ -1455,35 +1455,39 @@ async fn batch_request_signing_keys(
)
)
.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
);
},
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment