snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Return an internal error when index pattern should be valid

Browse Source
This commit is contained in:
Kerollmops 2023-02-13 17:26:34 +01:00
parent 47748395dc
commit 4b1cd10653
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meilisearch-auth/src/store.rs
View File

@ -5,6 +5,7 @@ use std::convert::{TryFrom, TryInto};
use std::fs::create_dir_all; use std::fs::create_dir_all;
use std::path::Path; use std::path::Path;
use std::str; use std::str;
use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use hmac::{Hmac, Mac}; use hmac::{Hmac, Mac};
@ -18,7 +19,7 @@ use time::OffsetDateTime;
use uuid::fmt::Hyphenated; use uuid::fmt::Hyphenated;
use uuid::Uuid; use uuid::Uuid;
use super::error::Result; use super::error::{AuthControllerError, Result};
use super::{Action, Key}; use super::{Action, Key};
const AUTH_STORE_SIZE: usize = 1_073_741_824; //1GiB const AUTH_STORE_SIZE: usize = 1_073_741_824; //1GiB
@ -225,9 +226,9 @@ impl HeedAuthStore {
for result in self.action_keyid_index_expiration.prefix_iter(&rtxn, &tuple)? { for result in self.action_keyid_index_expiration.prefix_iter(&rtxn, &tuple)? {
let ((_, _, index_uid_pattern), expiration) = result?; let ((_, _, index_uid_pattern), expiration) = result?;
if let Some((pattern, index)) = index_uid_pattern.zip(index) { if let Some((pattern, index)) = index_uid_pattern.zip(index) {
let index_uid_pattern = str::from_utf8(pattern)?.to_string(); let index_uid_pattern = str::from_utf8(pattern)?;
// TODO I shouldn't unwrap here but rather return an internal error let pattern = IndexUidPattern::from_str(index_uid_pattern)
let pattern = IndexUidPattern::try_from(index_uid_pattern).unwrap(); .map_err(|e| AuthControllerError::Internal(Box::new(e)))?;
if pattern.matches_str(index) { if pattern.matches_str(index) {
return Ok(Some(expiration)); return Ok(Some(expiration));
} }