diff options
Diffstat (limited to 'crates/shirabe/src/util/process_executor.rs')
| -rw-r--r-- | crates/shirabe/src/util/process_executor.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs index 64082064..6d609421 100644 --- a/crates/shirabe/src/util/process_executor.rs +++ b/crates/shirabe/src/util/process_executor.rs @@ -11,8 +11,9 @@ use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ LogicException, PHP_EOL, PhpMixed, PregMatches, RuntimeException, array_intersect, array_map, escapeshellarg, explode, implode, in_array_strict, is_array, is_dir, is_numeric, is_string, - php_regex, preg_match, preg_replace, preg_replace_callback, preg_replace2, preg_split, rtrim, - str_replace, strcspn, strlen, strpbrk, strtolower, strtr_array, substr_replace, trim, + php_regex, preg_is_match, preg_match, preg_replace, preg_replace_callback, preg_replace2, + preg_split, rtrim, str_replace, strcspn, strlen, strpbrk, strtolower, strtr_array, + substr_replace, trim, }; use shirabe_symfony_process::ExecutableFinder; use shirabe_symfony_process::Process; @@ -832,15 +833,13 @@ impl ProcessExecutor { php_regex!(r"{://(?P<user>[^:/\s]+):(?P<password>[^@\s/]+)@}i"), |m: &PregMatches| -> anyhow::Result<String> { // if the username looks like a long (12char+) hex string, or a modern github token (e.g. ghp_xxx, github_pat_xxx) we obfuscate that - if preg_match( + if preg_is_match( GitHub::GITHUB_TOKEN_REGEX, m.name("user").unwrap_or_default(), - ) - .is_some() - { + ) { return Ok("://***:***@".to_string()); } - if preg_match(r"{^[a-f0-9]{12,}$}", m.name("user").unwrap_or_default()).is_some() { + if preg_is_match(r"{^[a-f0-9]{12,}$}", m.name("user").unwrap_or_default()) { return Ok("://***:***@".to_string()); } @@ -903,7 +902,7 @@ impl ProcessExecutor { -1, Some(&mut dquotes), ); - let meta = dquotes > 0 || preg_match(php_regex!(r"/%[^%]+%|![^!]+!/"), &argument).is_some(); + let meta = dquotes > 0 || preg_is_match(php_regex!(r"/%[^%]+%|![^!]+!/"), &argument); if !meta && !quote { quote = strpbrk(&argument, "^&|<>()").is_some(); |