snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-06-06 20:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the regex to replace all occurrences of uuids in the redaction

Browse Source 
Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
This commit is contained in:
Martin Tzvetanov Grigorov 2025-05-27 11:47:02 +03:00
parent d2948adea3
commit 46ff78b4ec
No known key found for this signature in database
GPG Key ID: 3194FD8C1AE300EF
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -3594,6 +3594,7 @@ dependencies = [
"md5", "md5",
"once_cell", "once_cell",
"regex-lite", "regex-lite",
"uuid",
] ]
[[package]] [[package]]

3
crates/meili-snap/Cargo.toml
View File

@ -16,3 +16,6 @@ insta = { version = "=1.39.0", features = ["json", "redactions"] }
md5 = "0.7.0" md5 = "0.7.0"
once_cell = "1.20" once_cell = "1.20"
regex-lite = "0.1.6" regex-lite = "0.1.6"
[dev-dependencies]
uuid = { version = "1.17.0", features = ["v4"] }

21
crates/meili-snap/src/lib.rs
View File

@ -6,14 +6,12 @@ use std::sync::Mutex;
pub use insta; pub use insta;
use insta::internals::{Content, ContentPath}; use insta::internals::{Content, ContentPath};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex_lite::{Regex, RegexBuilder}; use regex_lite::Regex;
static SNAPSHOT_NAMES: Lazy<Mutex<HashMap<PathBuf, usize>>> = Lazy::new(Mutex::default); static SNAPSHOT_NAMES: Lazy<Mutex<HashMap<PathBuf, usize>>> = Lazy::new(Mutex::default);
/// A regex to match UUIDs in messages, specifically looking for the UUID v4 format /// A regex to match UUIDs in messages, specifically looking for the UUID v4 format
static UUID_IN_MESSAGE_RE: Lazy<Regex> = Lazy::new(|| { static UUID_IN_MESSAGE_RE: Lazy<Regex> = Lazy::new(|| {
RegexBuilder::new(r"(?<before>.*)([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})(?<after>.*)") Regex::new(r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}").unwrap()
.case_insensitive(true)
.build().unwrap()
}); });
/// Return the md5 hash of the given string /// Return the md5 hash of the given string
@ -37,7 +35,7 @@ pub fn default_snapshot_settings_for_test<'a>(
fn uuid_in_message_redaction(content: Content, _content_path: ContentPath) -> Content { fn uuid_in_message_redaction(content: Content, _content_path: ContentPath) -> Content {
match &content { match &content {
Content::String(s) => { Content::String(s) => {
let uuid_replaced = UUID_IN_MESSAGE_RE.replace_all(s, "$before[uuid]$after"); let uuid_replaced = UUID_IN_MESSAGE_RE.replace_all(s, "[uuid]");
Content::String(uuid_replaced.to_string()) Content::String(uuid_replaced.to_string())
} }
_ => content, _ => content,
@ -252,7 +250,10 @@ macro_rules! json_string {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use uuid::Uuid;
use crate as meili_snap; use crate as meili_snap;
use crate::UUID_IN_MESSAGE_RE;
#[test] #[test]
fn snap() { fn snap() {
snapshot_hash!(10, @"d3d9446802a44259755d38e6d163e820"); snapshot_hash!(10, @"d3d9446802a44259755d38e6d163e820");
@ -300,4 +301,14 @@ mod tests {
// snapshot_hash!("", name: "", @"d41d8cd98f00b204e9800998ecf8427e"); // snapshot_hash!("", name: "", @"d41d8cd98f00b204e9800998ecf8427e");
} }
} }
#[test]
fn uuid_in_message_regex() {
let uuid1 = Uuid::new_v4();
let uuid2 = Uuid::new_v4();
let uuid3 = Uuid::new_v4();
let to_replace = format!("1 {uuid1} 2 {uuid2} 3 {uuid3} 4");
let replaced = UUID_IN_MESSAGE_RE.replace_all(to_replace.as_str(), "[uuid]");
assert_eq!(replaced, "1 [uuid] 2 [uuid] 3 [uuid] 4");
}
} }