diff options
Diffstat (limited to 'crates/shirabe/src/util/http')
| -rw-r--r-- | crates/shirabe/src/util/http/curl_downloader.rs | 15 | ||||
| -rw-r--r-- | crates/shirabe/src/util/http/response.rs | 7 |
2 files changed, 11 insertions, 11 deletions
diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs index 6140bb08..91165015 100644 --- a/crates/shirabe/src/util/http/curl_downloader.rs +++ b/crates/shirabe/src/util/http/curl_downloader.rs @@ -31,10 +31,9 @@ use crate::util::http::ProxyManager; use crate::util::http::Response; use crate::util::{AuthHelper, PromptAuthResult, StoreAuth}; use indexmap::IndexMap; -use shirabe_pcre::Preg; use shirabe_php_shim::{ - PhpMixed, in_array_loose, in_array_strict, parse_url, php_regex, preg_quote, rename, strpos, - substr, unlink_silent, + PhpMixed, in_array_loose, in_array_strict, parse_url, php_regex, preg_match2, preg_quote, + preg_replace, rename, strpos, substr, unlink_silent, }; use std::sync::atomic::{AtomicBool, Ordering}; @@ -147,7 +146,7 @@ impl CurlDownloader { // check URL can be accessed (i.e. is not insecure), but allow insecure Packagist calls to // $hashed providers as file integrity is verified with sha256 - if !Preg::is_match(php_regex!(r"{^http://(repo\.)?packagist\.org/p/}"), url) + if preg_match2(php_regex!(r"{^http://(repo\.)?packagist\.org/p/}"), url, 0).is_none() || (strpos(url, "$").is_none() && strpos(url, "%24").is_none()) { self.config.borrow_mut().prohibit_url_by_config( @@ -653,7 +652,7 @@ impl CurlDownloader { // Absolute path; e.g. /foo let url_host = parse_url(url).and_then(|parsed| parsed.host); let url_host_str = url_host.as_deref().unwrap_or(""); - target_url = Preg::replace( + target_url = preg_replace( format!( r"{{^(.+(?://|@){}(?::\d+)?)(?:[/\?].*)?$}}", preg_quote(url_host_str, None) @@ -663,7 +662,7 @@ impl CurlDownloader { ); } else { // Relative path; e.g. foo - target_url = Preg::replace( + target_url = preg_replace( php_regex!(r"{^(.+/)[^/?]*(?:\?.*)?$}"), &format!("\\1{}", location_header), url, @@ -747,13 +746,15 @@ impl CurlDownloader { && substr(url, -4, None) == ".zip" && (location_header.is_none() || substr(location_header.as_deref().unwrap_or(""), -4, None) != ".zip") - && Preg::is_match( + && preg_match2( php_regex!(r"{^text/html\b}i"), &response .inner .get_header("content-type") .unwrap_or_default(), + 0, ) + .is_some() { needs_auth_retry = Some("Bitbucket requires authentication and it was not provided"); } diff --git a/crates/shirabe/src/util/http/response.rs b/crates/shirabe/src/util/http/response.rs index bd117a24..ed5c5214 100644 --- a/crates/shirabe/src/util/http/response.rs +++ b/crates/shirabe/src/util/http/response.rs @@ -1,8 +1,7 @@ //! ref: composer/src/Composer/Util/Http/Response.php use crate::json::JsonFile; -use shirabe_pcre::Preg; -use shirabe_php_shim::{PhpMixed, php_regex, preg_quote}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_match2, preg_quote}; #[derive(Debug)] pub struct Response { @@ -29,7 +28,7 @@ impl Response { pub fn get_status_message(&self) -> Option<String> { let mut value = None; for header in &self.headers { - if Preg::is_match(php_regex!(r"{^HTTP/\S+ \d+}i"), header) { + if preg_match2(php_regex!(r"{^HTTP/\S+ \d+}i"), header, 0).is_some() { // In case of redirects, headers contain the headers of all responses // so we can not return directly and need to keep iterating value = Some(header.clone()); @@ -65,7 +64,7 @@ impl Response { let mut value = None; let pattern = format!("{{^{}:\\s*(.+?)\\s*$}}i", preg_quote(name, None)); for header in headers { - if let Some(matches) = Preg::match3(&pattern, header) + if let Some(matches) = preg_match2(&pattern, header, 0) && let Some(s) = matches.get(1) { value = Some(s.to_string()); |