diff options
Diffstat (limited to 'crates/shirabe/src/cache.rs')
| -rw-r--r-- | crates/shirabe/src/cache.rs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs index 47f3219c..80085ff9 100644 --- a/crates/shirabe/src/cache.rs +++ b/crates/shirabe/src/cache.rs @@ -6,11 +6,11 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; use chrono::Utc; -use shirabe_pcre::Preg; use shirabe_php_shim::{ ErrorException, bin2hex, clearstatcache, date_format_to_strftime, dirname, disk_free_space, file_exists, file_get_contents, file_put_contents, filemtime, function_exists, hash_file, - is_dir, is_writable, mkdir, php_regex, random_bytes, random_int, rename, time, unlink, + is_dir, is_writable, mkdir, php_regex, preg_match2, preg_replace, random_bytes, random_int, + rename, time, unlink, }; use shirabe_symfony_finder::Finder; use std::sync::Mutex; @@ -94,10 +94,12 @@ impl Cache { } pub fn is_usable(path: &str) -> bool { - !Preg::is_match( + preg_match2( php_regex!(r"{(^|[\\\\/])(\$null|nul|NUL|/dev/null)([\\\\/]|$)}"), path, + 0, ) + .is_none() } pub fn is_enabled(&mut self) -> bool { @@ -127,7 +129,7 @@ impl Cache { pub fn read(&mut self, file: &str) -> Option<String> { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { self.io.write_error3( @@ -147,7 +149,7 @@ impl Cache { let was_enabled = self.enabled == Some(true); if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); self.io.write_error3( &format!("Writing {}{} into cache", self.root, file), @@ -186,11 +188,12 @@ impl Cache { true, crate::io::DEBUG, ); - if let Some(m) = Preg::match3( + if let Some(m) = preg_match2( php_regex!( r"{^file_put_contents\(\): Only ([0-9]+) of ([0-9]+) bytes written}" ), e.get_message(), + 0, ) { // Remove partial file. unlink(&temp_file_name); @@ -226,7 +229,7 @@ impl Cache { /// Copy a file into the cache pub fn copy_from(&mut self, file: &str, source: &str) -> bool { if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); self.filesystem .borrow_mut() @@ -255,7 +258,7 @@ impl Cache { /// Copy a file out of the cache pub fn copy_to(&mut self, file: &str, target: &str) -> anyhow::Result<bool> { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { let touch_result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| { @@ -315,7 +318,7 @@ impl Cache { pub fn remove(&mut self, file: &str) -> bool { if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return self @@ -344,7 +347,7 @@ impl Cache { pub fn get_age(&mut self, file: &str) -> Option<i64> { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) && let Some(mtime) = filemtime(&full_path) @@ -461,7 +464,7 @@ impl Cache { pub fn sha1(&mut self, file: &str) -> Option<String> { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return hash_file("sha1", &full_path); @@ -473,7 +476,7 @@ impl Cache { pub fn sha256(&mut self, file: &str) -> Option<String> { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return hash_file("sha256", &full_path); |