Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(csp): match wildcard ports on exact hosts
ldm096ee6e182db6
diff --git a/moli-renderer-v8/src/content_security_policy.rs b/moli-renderer-v8/src/content_security_policy.rsindex 13151798d..5735a005f 100644--- a/moli-renderer-v8/src/content_security_policy.rs+++ b/moli-renderer-v8/src/content_security_policy.rs@@ -1610,7 +1610,7 @@ fn source_url_matches(return false;}if let Some(matches) =- wildcard_host_source_matches(source, protected_url, request_url, redirect_status)+ wildcard_source_url_matches(source, protected_url, request_url, redirect_status){return matches;}@@ -1746,7 +1746,7 @@ fn csp_scheme_and_port_match(scheme_match: CspSchemeMatch, port_match: CspPortMascheme_can_upgrade && port_can_upgrade}-fn wildcard_host_source_matches(+fn wildcard_source_url_matches(source: &str,protected_url: &Url,request_url: &Url,@@ -1761,7 +1761,10 @@ fn wildcard_host_source_matches(};let (authority, source_path) = split_authority_and_path(rest);let (source_host, source_port) = split_source_authority(authority)?;- if source_host != "*" && !source_host.starts_with("*.") {+ let has_wildcard_host = source_host == "*" || source_host.starts_with("*.");+ // A wildcard port is CSP syntax even with an exact hostname. URL parsing+ // cannot represent it; keep matching the scheme, host, and path separately.+ if !has_wildcard_host && (source_port != Some("*") || source.starts_with("//")) {return None;}let source_scheme = source_scheme.unwrap_or_else(|| protected_url.scheme());@@ -1776,7 +1779,12 @@ fn wildcard_host_source_matches(let Some(request_host) = request_url.host_str() else {return Some(false);};- if !wildcard_source_host_matches(source_host, request_host) {+ let host_matches = if has_wildcard_host {+ wildcard_source_host_matches(source_host, request_host)+ } else {+ exact_source_host_matches(source_host, request_host)+ };+ if !host_matches {return Some(false);}if let Some(source_path) = source_path@@ -1826,6 +1834,22 @@ fn wildcard_source_host_matches(source_host: &str, request_host: &str) -> bool {&& request_host.as_bytes()[request_host.len() - source_suffix.len() - 1] == b'.'}+fn exact_source_host_matches(source_host: &str, request_host: &str) -> bool {+ if !source_host.eq_ignore_ascii_case(request_host) {+ return false;+ }+ let labels = source_host.strip_suffix('.').unwrap_or(source_host);+ if !labels.split('.').all(|label| {+ !label.is_empty()+ && label+ .bytes()+ .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-')+ }) {+ return false;+ }+ source_host == "127.0.0.1" || source_host.parse::<std::net::Ipv4Addr>().is_err()+}+fn wildcard_source_port_match(source_scheme: &str,source_port: Option<&str>,@@ -2791,6 +2815,153 @@ mod tests {));}+ #[test]+ fn exact_host_port_wildcards_apply_across_resource_kinds() {+ for kind in [+ ContentSecurityPolicyResourceKind::DocumentConnect,+ ContentSecurityPolicyResourceKind::DocumentFrame,+ ContentSecurityPolicyResourceKind::DocumentImage,+ ContentSecurityPolicyResourceKind::DocumentManifest,+ ContentSecurityPolicyResourceKind::DocumentMedia,+ ContentSecurityPolicyResourceKind::DocumentScriptElement,+ ContentSecurityPolicyResourceKind::DocumentStyleElement,+ ContentSecurityPolicyResourceKind::WorkerConnect,+ ContentSecurityPolicyResourceKind::WorkerScript,+ ContentSecurityPolicyResourceKind::SharedWorkerScript,+ ContentSecurityPolicyResourceKind::WorkerStaticModuleImport,+ ] {+ for source in ["https://cdn.test:*", "http://cdn.test:*", "CDN.TEST:*"] {+ for port in ["", ":0", ":80", ":443", ":8443", ":65535"] {+ let policy = format!("default-src {source}");+ let request = format!("https://cdn.test{port}/asset");+ assert!(+ allowed(&policy, kind, &request),+ "{policy} should allow {request} for {kind:?}"+ );+ }+ }+ }+ }++ #[test]+ fn exact_host_port_wildcards_preserve_other_source_restrictions() {+ for (source, request, expected) in [+ ("http://cdn.test:*", "http://cdn.test:8080/asset", true),+ ("https://CDN.TEST:*", "https://cdn.test:8443/asset", true),+ ("cdn.test:*", "https://cdn.test:8443/asset", true),+ ("cdn.test:*", "http://cdn.test:8080/asset", false),+ (+ "https://cdn.test:*",+ "https://sub.cdn.test:8443/asset",+ false,+ ),+ (+ "https://cdn.test:*",+ "https://evilcdn.test:8443/asset",+ false,+ ),+ ("https://cdn.test.:*", "https://cdn.test:8443/asset", false),+ ("https://cdn.test.:*", "https://cdn.test.:8443/asset", true),+ ("https://cdn.test:*", "http://cdn.test:8080/asset", false),+ ("http://cdn.test:*", "ws://cdn.test:8080/asset", false),+ ("ws://cdn.test:*", "wss://cdn.test:8443/asset", true),+ ("wss://cdn.test:*", "ws://cdn.test:8080/asset", false),+ (+ "https://cdn.test:*/trusted/",+ "https://cdn.test:8443/trusted/asset",+ true,+ ),+ (+ "https://cdn.test:*/trusted/",+ "https://cdn.test:8443/trusted%2Fevil",+ false,+ ),+ (+ "https://cdn.test:*/trusted/",+ "https://cdn.test:8443/other/asset",+ false,+ ),+ (+ "https://cdn.test:*/asset",+ "https://cdn.test:8443/asset?cache=1",+ true,+ ),+ (+ "https://cdn.test:*/asset",+ "https://cdn.test:8443/asset/extra",+ false,+ ),+ (+ "https://cdn.test:*/asset",+ "https://cdn.test:8443/ASSET",+ false,+ ),+ ("//cdn.test:*", "https://cdn.test:8443/asset", false),+ (+ "https://[email protected]:*",+ "https://cdn.test:8443/asset",+ false,+ ),+ ("https://%63dn.test:*", "https://cdn.test:8443/asset", false),+ (+ "https://cdn.test:*/asset?ignored",+ "https://cdn.test:8443/asset",+ false,+ ),+ (+ "https://cdn.test:*/asset#ignored",+ "https://cdn.test:8443/asset",+ false,+ ),+ ("https://cdn.test:*0", "https://cdn.test:8443/asset", false),+ (+ "https://bad_host.test:*",+ "https://bad_host.test:8443/asset",+ false,+ ),+ (+ "https://bad..host.test:*",+ "https://bad..host.test:8443/asset",+ false,+ ),+ ("https://127.0.0.1:*", "https://127.0.0.1:8443/asset", true),+ ("https://192.0.2.1:*", "https://192.0.2.1:8443/asset", false),+ ("https://[::1]:*", "https://[::1]:8443/asset", false),+ ] {+ let policy = format!("img-src {source}");+ assert_eq!(+ allowed(+ &policy,+ ContentSecurityPolicyResourceKind::DocumentImage,+ request+ ),+ expected,+ "{policy} with {request}"+ );+ }+ }++ #[test]+ fn exact_host_port_wildcards_preserve_redirect_restrictions() {+ for (request, expected) in [+ ("https://cdn.test:9443/other/asset", true),+ ("https://other.test:9443/other/asset", false),+ ("http://cdn.test:8080/other/asset", false),+ ] {+ assert_eq!(+ content_security_policy_allows_url_with_redirect_status(+ &["script-src https://cdn.test:*/trusted/".to_owned()],+ &protected_url(),+ &request_url(request),+ ContentSecurityPolicyResourceKind::DocumentScriptElement,+ ContentSecurityPolicyRedirectStatus::FollowedRedirect,+ ),+ expected,+ "a redirected wildcard-port request must still match scheme and host: {request}"+ );+ }+ }+#[test]fn host_sources_use_csp_secure_upgrade_rules() {assert!(allowed(