Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: sanitise_name: Don't consider punctuation and control chars as part of file extension (#6362)

Browse Source
This commit is contained in:
iequidoo
2024-12-23 15:16:13 -03:00
committed by iequidoo
parent 5772284e82
commit 64a1b8e57c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blob.rs
View File

@@ -279,7 +279,9 @@ impl<'a> BlobObject<'a> {
let ext: String = name let ext: String = name
.chars() .chars()
.rev() .rev()
.take_while(|c| !c.is_whitespace()) .take_while(|c| {
(!c.is_ascii_punctuation() || *c == '.') && !c.is_whitespace() && !c.is_control()
})
.take(33) .take(33)
.collect::<Vec<_>>() .collect::<Vec<_>>()
.iter() .iter()
@@ -982,6 +984,10 @@ mod tests {
let (stem, ext) = BlobObject::sanitise_name("a. tar.tar.gz"); let (stem, ext) = BlobObject::sanitise_name("a. tar.tar.gz");
assert_eq!(stem, "a. tar"); assert_eq!(stem, "a. tar");
assert_eq!(ext, ".tar.gz"); assert_eq!(ext, ".tar.gz");
let (stem, ext) = BlobObject::sanitise_name("Guia_uso_GNB (v0.8).pdf");
assert_eq!(stem, "Guia_uso_GNB (v0.8)");
assert_eq!(ext, ".pdf");
} }
#[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)]