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

rename signing_keys_for to verify_keys_for

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-17 07:21:51 +00:00
parent 5c0bf29122
commit 4458efa2b2
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/admin/query/globals.rs
View file

@ -46,7 +46,7 @@ pub(super) async fn globals(subcommand: Globals) -> Result<RoomMessageEventConte
origin, origin,
} => { } => {
let timer = tokio::time::Instant::now(); let timer = tokio::time::Instant::now();
let results = services().globals.db.signing_keys_for(&origin); let results = services().globals.db.verify_keys_for(&origin);
let query_time = timer.elapsed(); let query_time = timer.elapsed();
Ok(RoomMessageEventContent::notice_markdown(format!( Ok(RoomMessageEventContent::notice_markdown(format!(

2
src/service/globals/data.rs
View file

@ -289,7 +289,7 @@ impl Data {
/// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
/// for the server. /// for the server.
pub fn signing_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> { pub fn verify_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
let signingkeys = self let signingkeys = self
.server_signingkeys .server_signingkeys
.get(origin.as_bytes())? .get(origin.as_bytes())?

4
src/service/globals/mod.rs
View file

@ -272,8 +272,8 @@ impl Service {
/// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
/// for the server. /// for the server.
pub fn signing_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> { pub fn verify_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
let mut keys = self.db.signing_keys_for(origin)?; let mut keys = self.db.verify_keys_for(origin)?;
if origin == self.server_name() { if origin == self.server_name() {
keys.insert( keys.insert(
format!("ed25519:{}", self.keypair().version()) format!("ed25519:{}", self.keypair().version())

4
src/service/rooms/event_handler/signing_keys.rs
View file

@ -148,7 +148,7 @@ impl super::Service {
let result: BTreeMap<_, _> = self let result: BTreeMap<_, _> = self
.services .services
.globals .globals
.signing_keys_for(origin)? .verify_keys_for(origin)?
.into_iter() .into_iter()
.map(|(k, v)| (k.to_string(), v.key)) .map(|(k, v)| (k.to_string(), v.key))
.collect(); .collect();
@ -354,7 +354,7 @@ impl super::Service {
let mut result: BTreeMap<_, _> = self let mut result: BTreeMap<_, _> = self
.services .services
.globals .globals
.signing_keys_for(origin)? .verify_keys_for(origin)?
.into_iter() .into_iter()
.map(|(k, v)| (k.to_string(), v.key)) .map(|(k, v)| (k.to_string(), v.key))
.collect(); .collect();