dandri/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity/ synced 2026-08-29 14:08:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Update error message wording

Browse Source
This commit is contained in:
Ginger
2026-06-09 14:06:24 -04:00
parent 513259a837
commit d4fdf87daa
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/router/auth.rs
+9 -12
View File
@@ -101,7 +101,7 @@ fn authenticate<R: IncomingRequest<Authentication = Self> + Any, B: AsRef<[u8]>
async move {
let output = Self::extract_authentication(incoming_request).map_err(|err| {
err!(Request(Unauthorized(warn!(
"Failed to extract authorization: {}",
"Failed to extract request authentication: {}",
err.into()
))))
})?;
@@ -131,8 +131,8 @@ async fn verify<R: IncomingRequest<Authentication = Self> + Any, B: AsRef<[u8]>
.server_keys
.get_verify_key(&output.origin, &output.key)
.await
.map_err(|e| {
err!(Request(Unauthorized(warn!("Failed to fetch signing keys: {e}"))))
.map_err(|err| {
err!(Request(Unauthorized(warn!("Failed to fetch signing keys: {err}"))))
})?;
let keys: PubKeys = [(output.key.to_string(), key.key)].into();
@@ -286,7 +286,7 @@ async fn verify_access_token(
ErrorKind::UnknownToken(
assign!(UnknownTokenErrorData::new(), { soft_logout: true }),
),
"This token has expired".into(),
"This access token has expired.".into(),
StatusCode::UNAUTHORIZED,
));
}
@@ -321,12 +321,12 @@ async fn verify_access_token(
)));
}
} else {
// Otherwise, explicitly if the endpoint is restricted to admins only.
// Otherwise, explicitly check if the endpoint is restricted to admins only.
if required_scopes.contains(&OAuthScope::ServerAdministration)
&& services.users.is_admin(&sender_user).await
{
return Err!(Request(Forbidden(
"Only server administrators can use this endpoint"
"Only server administrators can use this endpoint."
)));
}
}
@@ -346,7 +346,7 @@ async fn verify_access_token(
};
if !appservice_info.is_user_match(&sender_user) {
return Err!(Request(Exclusive("User is not in namespace.")));
return Err!(Request(Exclusive("User is not in this appservice's namespace.")));
}
// MSC3202/MSC4190: Handle device_id masquerading for appservices.
@@ -360,10 +360,7 @@ async fn verify_access_token(
.await
.is_err()
{
return Err!(Request(Forbidden(
"Device does not exist for user or appservice cannot masquerade as this \
device."
)));
return Err!(Request(Forbidden("Appservice cannot masquerade as this device.")));
}
Some(device_id.to_owned())
@@ -379,7 +376,7 @@ async fn verify_access_token(
} else {
Err(Error::Request(
ErrorKind::UnknownToken(UnknownTokenErrorData::new()),
"Invalid token".into(),
"Invalid access token.".into(),
StatusCode::UNAUTHORIZED,
))
}