studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Macroize several legacy errors.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-09-23 03:39:11 +00:00
parent ed324d5972
commit 27222f23d2
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/client/keys.rs
View File

@@ -6,13 +6,10 @@ use ruma::{
CanonicalJsonObject, CanonicalJsonValue, OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, CanonicalJsonObject, CanonicalJsonValue, OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId,
UserId, UserId,
api::{ api::{
client::{ client::keys::{
error::ErrorKind, claim_keys, get_key_changes, get_keys, upload_keys,
keys::{ upload_signatures::{self},
claim_keys, get_key_changes, get_keys, upload_keys, upload_signing_keys,
upload_signatures::{self},
upload_signing_keys,
},
}, },
federation, federation,
}, },
@@ -20,7 +17,7 @@ use ruma::{
serde::Raw, serde::Raw,
}; };
use serde_json::json; use serde_json::json;
use tuwunel_core::{Err, Error, Result, debug, debug_error, debug_warn, err, result::NotFound}; use tuwunel_core::{Err, Result, debug, debug_error, debug_warn, err, result::NotFound};
use tuwunel_service::{Services, users::parse_master_key}; use tuwunel_service::{Services, users::parse_master_key};
use crate::{Ruma, router::auth_uiaa}; use crate::{Ruma, router::auth_uiaa};
@@ -360,12 +357,12 @@ pub(crate) async fn get_key_changes_route(
let from = body let from = body
.from .from
.parse() .parse()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`."))?; .map_err(|_| err!(Request(InvalidParam("Invalid `from`."))))?;
let to = body let to = body
.to .to
.parse() .parse()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?; .map_err(|_| err!(Request(InvalidParam("Invalid `to`."))))?;
device_list_updates.extend( device_list_updates.extend(
services services

14
src/service/users/keys.rs
View File

@@ -476,19 +476,20 @@ pub fn parse_master_key(
let master_key = master_key let master_key = master_key
.deserialize() .deserialize()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid master key"))?; .map_err(|_| err!(Request(InvalidParam("Invalid master key"))))?;
let mut master_key_ids = master_key.keys.values(); let mut master_key_ids = master_key.keys.values();
let master_key_id = master_key_ids let master_key_id = master_key_ids
.next() .next()
.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Master key contained no key."))?; .ok_or(err!(Request(InvalidParam("Master key contained no key."))))?;
if master_key_ids.next().is_some() { if master_key_ids.next().is_some() {
return Err(Error::BadRequest( return Err!(Request(InvalidParam("Master key contained more than one key.")));
ErrorKind::InvalidParam,
"Master key contained more than one key.",
));
} }
let mut master_key_key = prefix.clone(); let mut master_key_key = prefix.clone();
master_key_key.extend_from_slice(master_key_id.as_bytes()); master_key_key.extend_from_slice(master_key_id.as_bytes());
Ok((master_key_key, master_key)) Ok((master_key_key, master_key))
} }
@@ -532,6 +533,7 @@ where
{ {
let sid = <&UserId>::try_from(user.as_str()) let sid = <&UserId>::try_from(user.as_str())
.map_err(|_| Error::bad_database("Invalid user ID in database."))?; .map_err(|_| Error::bad_database("Invalid user ID in database."))?;
if sender_user == Some(user_id) || sid == user_id || allowed_signatures(sid) { if sender_user == Some(user_id) || sid == user_id || allowed_signatures(sid) {
signatures.insert(user, signature); signatures.insert(user, signature);
} }