mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-26 12:05:05 +08:00
Make it work for any all routes including stats and index swaps
This commit is contained in:
parent
184b8afd9e
commit
ec7de4bae7
@ -8,6 +8,7 @@ use std::path::Path;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use error::{AuthControllerError, Result};
|
use error::{AuthControllerError, Result};
|
||||||
|
use meilisearch_types::index_uid_pattern::IndexUidPattern;
|
||||||
use meilisearch_types::keys::{Action, CreateApiKey, Key, PatchApiKey};
|
use meilisearch_types::keys::{Action, CreateApiKey, Key, PatchApiKey};
|
||||||
use meilisearch_types::star_or::StarOr;
|
use meilisearch_types::star_or::StarOr;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -141,9 +142,7 @@ impl AuthController {
|
|||||||
.get_expiration_date(uid, action, None)?
|
.get_expiration_date(uid, action, None)?
|
||||||
.or(match index {
|
.or(match index {
|
||||||
// else check if the key has access to the requested index.
|
// else check if the key has access to the requested index.
|
||||||
Some(index) => {
|
Some(index) => self.store.get_expiration_date(uid, action, Some(index))?,
|
||||||
self.store.get_expiration_date(uid, action, Some(index.as_bytes()))?
|
|
||||||
}
|
|
||||||
// or to any index if no index has been requested.
|
// or to any index if no index has been requested.
|
||||||
None => self.store.prefix_first_expiration_date(uid, action)?,
|
None => self.store.prefix_first_expiration_date(uid, action)?,
|
||||||
}) {
|
}) {
|
||||||
@ -196,8 +195,20 @@ impl Default for SearchRules {
|
|||||||
impl SearchRules {
|
impl SearchRules {
|
||||||
pub fn is_index_authorized(&self, index: &str) -> bool {
|
pub fn is_index_authorized(&self, index: &str) -> bool {
|
||||||
match self {
|
match self {
|
||||||
Self::Set(set) => set.contains("*") || set.contains(index),
|
Self::Set(set) => {
|
||||||
Self::Map(map) => map.contains_key("*") || map.contains_key(index),
|
set.contains("*")
|
||||||
|
|| set.contains(index)
|
||||||
|
|| set
|
||||||
|
.iter() // We must store the IndexUidPattern in the Set
|
||||||
|
.any(|pattern| IndexUidPattern::new_unchecked(pattern).matches_str(index))
|
||||||
|
}
|
||||||
|
Self::Map(map) => {
|
||||||
|
map.contains_key("*")
|
||||||
|
|| map.contains_key(index)
|
||||||
|
|| map
|
||||||
|
.keys() // We must store the IndexUidPattern in the Map
|
||||||
|
.any(|pattern| IndexUidPattern::new_unchecked(pattern).matches_str(index))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@ use std::str;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use hmac::{Hmac, Mac};
|
use hmac::{Hmac, Mac};
|
||||||
|
use meilisearch_types::index_uid_pattern::IndexUidPattern;
|
||||||
use meilisearch_types::keys::KeyId;
|
use meilisearch_types::keys::KeyId;
|
||||||
use meilisearch_types::milli;
|
use meilisearch_types::milli;
|
||||||
use meilisearch_types::milli::heed::types::{ByteSlice, DecodeIgnore, SerdeJson};
|
use meilisearch_types::milli::heed::types::{ByteSlice, DecodeIgnore, SerdeJson};
|
||||||
@ -210,11 +211,28 @@ impl HeedAuthStore {
|
|||||||
&self,
|
&self,
|
||||||
uid: Uuid,
|
uid: Uuid,
|
||||||
action: Action,
|
action: Action,
|
||||||
index: Option<&[u8]>,
|
index: Option<&str>,
|
||||||
) -> Result<Option<Option<OffsetDateTime>>> {
|
) -> Result<Option<Option<OffsetDateTime>>> {
|
||||||
let rtxn = self.env.read_txn()?;
|
let rtxn = self.env.read_txn()?;
|
||||||
let tuple = (&uid, &action, index);
|
let tuple = (&uid, &action, index.map(|s| s.as_bytes()));
|
||||||
Ok(self.action_keyid_index_expiration.get(&rtxn, &tuple)?)
|
match self.action_keyid_index_expiration.get(&rtxn, &tuple)? {
|
||||||
|
Some(expiration) => Ok(Some(expiration)),
|
||||||
|
None => {
|
||||||
|
let tuple = (&uid, &action, None);
|
||||||
|
for result in self.action_keyid_index_expiration.prefix_iter(&rtxn, &tuple)? {
|
||||||
|
let ((_, _, index_uid_pattern), expiration) = result?;
|
||||||
|
if let Some((pattern, index)) = index_uid_pattern.zip(index) {
|
||||||
|
let index_uid_pattern = str::from_utf8(pattern)?.to_string();
|
||||||
|
// TODO I shouldn't unwrap here but rather return an internal error
|
||||||
|
let pattern = IndexUidPattern::try_from(index_uid_pattern).unwrap();
|
||||||
|
if pattern.matches_str(index) {
|
||||||
|
return Ok(Some(expiration));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn prefix_first_expiration_date(
|
pub fn prefix_first_expiration_date(
|
||||||
|
Loading…
Reference in New Issue
Block a user