snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 03:55:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge #3136

Browse Source 
3136: Fix no master key error r=Kerollmops a=ManyTheFish


Fixes #3135

Co-authored-by: ManyTheFish <many@meilisearch.com>
This commit is contained in:
bors[bot] 2022-11-24 15:25:11 +00:00 committed by GitHub
commit 0aa3f667d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,14 @@ impl<P, D> GuardedData<P, D> {
where where
P: Policy + 'static, P: Policy + 'static,
{ {
let missing_master_key = auth.get_master_key().is_none();
match Self::authenticate(auth, token, index).await? { match Self::authenticate(auth, token, index).await? {
Some(filters) => match data { Some(filters) => match data {
Some(data) => Ok(Self { data, filters, _marker: PhantomData }), Some(data) => Ok(Self { data, filters, _marker: PhantomData }),
None => Err(AuthenticationError::IrretrievableState.into()), None => Err(AuthenticationError::IrretrievableState.into()),
}, },
None if missing_master_key => Err(AuthenticationError::MissingMasterKey.into()),
None => Err(AuthenticationError::InvalidToken.into()), None => Err(AuthenticationError::InvalidToken.into()),
} }
} }

9
meilisearch-http/tests/auth/api_keys.rs
View File

@ -1434,12 +1434,13 @@ async fn error_access_api_key_routes_no_master_key_set() {
server.use_api_key("MASTER_KEY"); server.use_api_key("MASTER_KEY");
let expected_response = json!({"message": "The provided API key is invalid.", let expected_response = json!({
"code": "invalid_api_key", "message": "Meilisearch is running without a master key. To access this API endpoint, you must have set a master key at launch.",
"code": "missing_master_key",
"type": "auth", "type": "auth",
"link": "https://docs.meilisearch.com/errors#invalid_api_key" "link": "https://docs.meilisearch.com/errors#missing_master_key"
}); });
let expected_code = 403; let expected_code = 401;
let (response, code) = server.add_api_key(json!({})).await; let (response, code) = server.add_api_key(json!({})).await;