snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

remove token from InvalidToken error

Browse Source
This commit is contained in:
ad hoc 2022-03-07 15:15:51 +01:00
parent 19da45c53b
commit ddd25bfe01
No known key found for this signature in database
GPG Key ID: 4F00A782990CC643
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-http/src/extractors/authentication/error.rs
View File

@ -5,7 +5,7 @@ pub enum AuthenticationError {
#[error("The Authorization header is missing. It must use the bearer authorization method.")]
MissingAuthorizationHeader,
#[error("The provided API key is invalid.")]
InvalidToken(String),
InvalidToken,
// Triggered on configuration error.
#[error("An internal error has occurred. `Irretrievable state`.")]
IrretrievableState,
@ -15,7 +15,7 @@ impl ErrorCode for AuthenticationError {
fn error_code(&self) -> Code {
match self {
AuthenticationError::MissingAuthorizationHeader => Code::MissingAuthorizationHeader,
AuthenticationError::InvalidToken(_) => Code::InvalidToken,
AuthenticationError::InvalidToken => Code::InvalidToken,
AuthenticationError::IrretrievableState => Code::Internal,
}
}

21
meilisearch-http/src/extractors/authentication/mod.rs
View File

@ -33,7 +33,7 @@ impl<P, D> GuardedData<P, D> {
P: Policy + 'static,
{
match Self::authenticate(auth, token, index).await? {
(_, Some(filters)) => match data {
Some(filters) => match data {
Some(data) => Ok(Self {
data,
filters,
@ -41,7 +41,7 @@ impl<P, D> GuardedData<P, D> {
}),
None => Err(AuthenticationError::IrretrievableState.into()),
},
(token, None) => Err(AuthenticationError::InvalidToken(token).into()),
None => Err(AuthenticationError::InvalidToken.into()),
}
}
@ -49,7 +49,7 @@ impl<P, D> GuardedData<P, D> {
where
P: Policy + 'static,
{
match Self::authenticate(auth, "", None).await?.1 {
match Self::authenticate(auth, String::new(), None).await? {
Some(filters) => match data {
Some(data) => Ok(Self {
data,
@ -62,18 +62,16 @@ impl<P, D> GuardedData<P, D> {
}
}
async fn authenticate<S>(
async fn authenticate(
auth: AuthController,
token: S,
token: String,
index: Option<String>,
) -> Result<(S, Option<AuthFilter>), ResponseError>
) -> Result<Option<AuthFilter>, ResponseError>
where
P: Policy + 'static,
S: AsRef<str> + 'static + Send,
{
Ok(tokio::task::spawn_blocking(move || {
let res = P::authenticate(auth, token.as_ref(), index.as_deref());
(token, res)
P::authenticate(auth, token.as_ref(), index.as_deref())
})
.await
.map_err(|e| ResponseError::from_msg(e.to_string(), Code::Internal))?)
@ -114,10 +112,7 @@ impl<P: Policy + 'static, D: 'static + Clone> FromRequest for GuardedData<P, D>
index.map(String::from),
req.app_data::<D>().cloned(),
)),
None => Box::pin(err(AuthenticationError::InvalidToken(
"unknown".to_string(),
)
.into())),
None => Box::pin(err(AuthenticationError::InvalidToken.into())),
}
}
_otherwise => {