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

Authentication: Make allow_index_creation a private field

Browse Source
This commit is contained in:
Louis Dureuil 2023-02-19 15:08:36 +01:00
parent d0f2c9c72e
commit 690bb2e5cc
No known key found for this signature in database
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meilisearch-auth/src/lib.rs
View File

@ -158,7 +158,7 @@ impl AuthController {
pub struct AuthFilter { pub struct AuthFilter {
search_rules: Option<SearchRules>, search_rules: Option<SearchRules>,
key_authorized_indexes: SearchRules, key_authorized_indexes: SearchRules,
pub allow_index_creation: bool, allow_index_creation: bool,
} }
impl Default for AuthFilter { impl Default for AuthFilter {
@ -172,6 +172,11 @@ impl Default for AuthFilter {
} }
impl AuthFilter { impl AuthFilter {
#[inline]
pub fn allow_index_creation(&self) -> bool {
self.allow_index_creation
}
pub fn with_allowed_indexes(allowed_indexes: HashSet<IndexUidPattern>) -> Self { pub fn with_allowed_indexes(allowed_indexes: HashSet<IndexUidPattern>) -> Self {
Self { Self {
search_rules: None, search_rules: None,

4
meilisearch/src/routes/indexes/documents.rs
View File

@ -192,7 +192,7 @@ pub async fn replace_documents(
analytics.add_documents(&params, index_scheduler.index(&index_uid).is_err(), &req); analytics.add_documents(&params, index_scheduler.index(&index_uid).is_err(), &req);
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let task = document_addition( let task = document_addition(
extract_mime_type(&req)?, extract_mime_type(&req)?,
index_scheduler, index_scheduler,
@ -223,7 +223,7 @@ pub async fn update_documents(
analytics.update_documents(&params, index_scheduler.index(&index_uid).is_err(), &req); analytics.update_documents(&params, index_scheduler.index(&index_uid).is_err(), &req);
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let task = document_addition( let task = document_addition(
extract_mime_type(&req)?, extract_mime_type(&req)?,
index_scheduler, index_scheduler,

8
meilisearch/src/routes/indexes/settings.rs
View File

@ -45,7 +45,7 @@ macro_rules! make_setting_route {
let new_settings = Settings { $attr: Setting::Reset.into(), ..Default::default() }; let new_settings = Settings { $attr: Setting::Reset.into(), ..Default::default() };
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let task = KindWithContent::SettingsUpdate { let task = KindWithContent::SettingsUpdate {
index_uid: index_uid.to_string(), index_uid: index_uid.to_string(),
@ -86,7 +86,7 @@ macro_rules! make_setting_route {
..Default::default() ..Default::default()
}; };
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let task = KindWithContent::SettingsUpdate { let task = KindWithContent::SettingsUpdate {
index_uid: index_uid.to_string(), index_uid: index_uid.to_string(),
@ -560,7 +560,7 @@ pub async fn update_all(
Some(&req), Some(&req),
); );
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let index_uid = IndexUid::try_from(index_uid.into_inner())?.into_inner(); let index_uid = IndexUid::try_from(index_uid.into_inner())?.into_inner();
let task = KindWithContent::SettingsUpdate { let task = KindWithContent::SettingsUpdate {
index_uid, index_uid,
@ -596,7 +596,7 @@ pub async fn delete_all(
let new_settings = Settings::cleared().into_unchecked(); let new_settings = Settings::cleared().into_unchecked();
let allow_index_creation = index_scheduler.filters().allow_index_creation; let allow_index_creation = index_scheduler.filters().allow_index_creation();
let index_uid = IndexUid::try_from(index_uid.into_inner())?.into_inner(); let index_uid = IndexUid::try_from(index_uid.into_inner())?.into_inner();
let task = KindWithContent::SettingsUpdate { let task = KindWithContent::SettingsUpdate {
index_uid, index_uid,