mirror of
https://github.com/lexmount/moli.git
synced 2026-11-22 16:02:34 +00:00
fix(fetch): preserve independent CDP authentication handlers
Combine CDP Fetch sessions and Network/BiDi auth rules with OR for both URL matching and renderer eligibility. Reuse the CDP predicate for owner selection and remove the redundant aggregate bit from interception snapshots. Replace the test that preserved the legacy suppression behavior with source-union, disable and scoped-URL assertions.
This commit is contained in:
@@ -1125,9 +1125,12 @@ impl TargetFetchConfig {
|
||||
pub(crate) fn subresource_interception_config(
|
||||
&self,
|
||||
) -> moli_core::page::SubresourceInterceptionClasses {
|
||||
if auth_interception_url_patterns(self.handle_auth_requests, &self.network_intercepts)
|
||||
.next()
|
||||
.is_some()
|
||||
if auth_interception_url_patterns(
|
||||
fetch_sessions_handle_auth_requests(&self.fetch_sessions),
|
||||
&self.network_intercepts,
|
||||
)
|
||||
.next()
|
||||
.is_some()
|
||||
{
|
||||
// Auth challenges are matched by URL alone, regardless of the
|
||||
// resource classes named by Fetch.enable patterns. The renderer
|
||||
@@ -1144,7 +1147,6 @@ impl TargetFetchConfig {
|
||||
TargetFetchSubresourceInterceptionSnapshot {
|
||||
enabled: self.enabled,
|
||||
event_session_id: self.session_id.clone(),
|
||||
handle_auth_requests: self.handle_auth_requests,
|
||||
fetch_sessions: self.fetch_sessions.clone(),
|
||||
fetch_session_order: self.fetch_session_order.clone(),
|
||||
patterns: self.patterns().to_vec(),
|
||||
@@ -1191,7 +1193,7 @@ impl TargetFetchConfig {
|
||||
}
|
||||
|
||||
pub(crate) fn matches_auth_required(&self, url: &Url) -> bool {
|
||||
matches_auth_required(self.handle_auth_requests, &self.network_intercepts, url)
|
||||
matches_auth_required(&self.fetch_sessions, &self.network_intercepts, url)
|
||||
}
|
||||
|
||||
pub(crate) fn matching_auth_required_network_intercepts(
|
||||
@@ -1319,10 +1321,7 @@ impl TargetFetchConfig {
|
||||
.values()
|
||||
.find_map(|intercept| intercept.session_id.clone())
|
||||
});
|
||||
self.handle_auth_requests = self
|
||||
.fetch_sessions
|
||||
.values()
|
||||
.any(|config| config.handle_auth_requests)
|
||||
self.handle_auth_requests = fetch_sessions_handle_auth_requests(&self.fetch_sessions)
|
||||
|| self
|
||||
.network_intercepts
|
||||
.values()
|
||||
@@ -1372,7 +1371,6 @@ impl Drop for TargetFetchOwner {
|
||||
pub(crate) struct TargetFetchSubresourceInterceptionSnapshot {
|
||||
enabled: bool,
|
||||
event_session_id: Option<String>,
|
||||
handle_auth_requests: bool,
|
||||
fetch_sessions: BTreeMap<Option<String>, TargetFetchSessionConfig>,
|
||||
fetch_session_order: Vec<Option<String>>,
|
||||
patterns: Vec<FetchInterceptionPattern>,
|
||||
@@ -1713,11 +1711,7 @@ impl TargetFetchSubresourceInterceptionSnapshot {
|
||||
&self,
|
||||
url: &Url,
|
||||
) -> Option<PendingSubresourceFetchOwnerKind> {
|
||||
if self
|
||||
.fetch_sessions
|
||||
.values()
|
||||
.any(|config| config.handle_auth_requests)
|
||||
{
|
||||
if fetch_sessions_handle_auth_requests(&self.fetch_sessions) {
|
||||
return Some(PendingSubresourceFetchOwnerKind::Fetch);
|
||||
}
|
||||
(!matching_auth_required_network_intercepts(&self.network_intercepts, url).is_empty())
|
||||
@@ -1737,7 +1731,7 @@ impl TargetFetchSubresourceInterceptionSnapshot {
|
||||
}
|
||||
|
||||
pub(crate) fn matches_auth_required(&self, url: &Url) -> bool {
|
||||
matches_auth_required(self.handle_auth_requests, &self.network_intercepts, url)
|
||||
matches_auth_required(&self.fetch_sessions, &self.network_intercepts, url)
|
||||
}
|
||||
|
||||
pub(crate) fn matching_auth_required_network_intercepts(
|
||||
@@ -1805,30 +1799,36 @@ fn matching_network_intercepts(
|
||||
}
|
||||
|
||||
/// Effective auth URL patterns shared by renderer eligibility and per-request
|
||||
/// matching. Without network intercepts, enabled Fetch auth applies to any URL.
|
||||
/// matching. Fetch handlers and network rules contribute independently.
|
||||
fn auth_interception_url_patterns(
|
||||
handle_auth_requests: bool,
|
||||
fetch_handles_auth_requests: bool,
|
||||
intercepts: &BTreeMap<String, TargetNetworkInterceptConfig>,
|
||||
) -> impl Iterator<Item = &str> {
|
||||
let all_urls = (handle_auth_requests && intercepts.is_empty()).then_some("*");
|
||||
let enabled_intercepts = handle_auth_requests
|
||||
.then_some(intercepts)
|
||||
.into_iter()
|
||||
.flat_map(|intercepts| intercepts.values());
|
||||
let all_urls = fetch_handles_auth_requests.then_some("*");
|
||||
all_urls.into_iter().chain(
|
||||
enabled_intercepts
|
||||
intercepts
|
||||
.values()
|
||||
.filter(|intercept| intercept.handle_auth_requests)
|
||||
.flat_map(|intercept| intercept.auth_url_patterns.iter().map(String::as_str)),
|
||||
)
|
||||
}
|
||||
|
||||
fn matches_auth_required(
|
||||
handle_auth_requests: bool,
|
||||
fetch_sessions: &BTreeMap<Option<String>, TargetFetchSessionConfig>,
|
||||
intercepts: &BTreeMap<String, TargetNetworkInterceptConfig>,
|
||||
url: &Url,
|
||||
) -> bool {
|
||||
auth_interception_url_patterns(handle_auth_requests, intercepts)
|
||||
.any(|pattern| url_pattern_matches(pattern, url.as_str()))
|
||||
auth_interception_url_patterns(
|
||||
fetch_sessions_handle_auth_requests(fetch_sessions),
|
||||
intercepts,
|
||||
)
|
||||
.any(|pattern| url_pattern_matches(pattern, url.as_str()))
|
||||
}
|
||||
|
||||
fn fetch_sessions_handle_auth_requests(
|
||||
sessions: &BTreeMap<Option<String>, TargetFetchSessionConfig>,
|
||||
) -> bool {
|
||||
sessions.values().any(|config| config.handle_auth_requests)
|
||||
}
|
||||
|
||||
fn matching_auth_required_network_intercepts(
|
||||
|
||||
@@ -828,77 +828,141 @@ fn target_fetch_owner_reports_matching_auth_required_network_intercepts() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fetch_session_auth_flag_without_matching_intercept_keeps_pattern_class_scope() {
|
||||
fn cdp_auth_is_independent_of_network_intercept_registration() {
|
||||
let mut owner = TargetFetchOwner::default();
|
||||
// Fetch.enable{handleAuthRequests:true} with a typed pattern, plus a
|
||||
// network intercept that cannot match auth: `matches_auth_required`
|
||||
// requires some intercept with handleAuthRequests and non-empty auth URL
|
||||
// patterns once any intercept exists, so the class set must stay scoped
|
||||
// to the pattern instead of widening to every class.
|
||||
owner.configure(
|
||||
Some("SID-fetch".to_owned()),
|
||||
let image_patterns = vec![FetchInterceptionPattern {
|
||||
url_pattern: "*".to_owned(),
|
||||
resource_type_filter: Some(FetchResourceTypeFilter::Image),
|
||||
request_stage: FetchRequestStage::Request,
|
||||
}];
|
||||
owner.configure(Some("SID-fetch".to_owned()), true, image_patterns.clone());
|
||||
owner.configure(Some("SID-other".to_owned()), true, image_patterns.clone());
|
||||
owner.add_network_intercept(
|
||||
"intercept-no-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
false,
|
||||
vec!["*".to_owned()],
|
||||
image_patterns.clone(),
|
||||
);
|
||||
|
||||
let any_url = Url::parse("https://example.test/protected/basic").unwrap();
|
||||
let config = owner.config_snapshot();
|
||||
assert!(owner.handle_auth_requests());
|
||||
assert!(config.matches_auth_required(&any_url));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::ALL
|
||||
);
|
||||
assert!(owner.remove_network_intercept("intercept-no-auth"));
|
||||
assert!(owner.config_snapshot().matches_auth_required(&any_url));
|
||||
owner.add_network_intercept(
|
||||
"intercept-no-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
false,
|
||||
Vec::new(),
|
||||
image_patterns.clone(),
|
||||
);
|
||||
|
||||
// A scoped network auth rule adds an owner only for its own URL. It
|
||||
// cannot remove either CDP handler's authority over other challenges.
|
||||
owner.add_network_intercept(
|
||||
"intercept-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
true,
|
||||
vec!["https://other.test/protected*".to_owned()],
|
||||
Vec::new(),
|
||||
);
|
||||
let config = owner.config_snapshot();
|
||||
let snapshot = config.subresource_interception_snapshot();
|
||||
assert!(config.matches_auth_required(&any_url));
|
||||
assert!(snapshot.matches_auth_required(&any_url));
|
||||
assert!(
|
||||
snapshot
|
||||
.matching_auth_required_network_intercepts(&any_url)
|
||||
.is_empty()
|
||||
);
|
||||
assert_eq!(
|
||||
snapshot.auth_required_owner_kind(&any_url),
|
||||
Some(PendingSubresourceFetchOwnerKind::Fetch)
|
||||
);
|
||||
assert_eq!(
|
||||
snapshot
|
||||
.matching_auth_required_pause_sessions(None, &any_url)
|
||||
.len(),
|
||||
2
|
||||
);
|
||||
assert!(owner.remove_fetch_session(Some("SID-fetch")));
|
||||
assert!(owner.config_snapshot().matches_auth_required(&any_url));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::ALL
|
||||
);
|
||||
|
||||
owner.configure(Some("SID-other".to_owned()), false, image_patterns);
|
||||
let config = owner.config_snapshot();
|
||||
let snapshot = config.subresource_interception_snapshot();
|
||||
let other_url = Url::parse("https://other.test/protected/basic").unwrap();
|
||||
assert!(!config.matches_auth_required(&any_url));
|
||||
assert!(!snapshot.matches_auth_required(&any_url));
|
||||
assert!(
|
||||
snapshot
|
||||
.matching_auth_required_pause_sessions(None, &any_url)
|
||||
.is_empty()
|
||||
);
|
||||
assert!(config.matches_auth_required(&other_url));
|
||||
assert!(snapshot.matches_auth_required(&other_url));
|
||||
assert_eq!(
|
||||
snapshot.auth_required_owner_kind(&other_url),
|
||||
Some(PendingSubresourceFetchOwnerKind::NetworkOrBidi)
|
||||
);
|
||||
// A real auth rule still requires all resource classes even though it
|
||||
// no longer authorizes unrelated URLs after the last CDP handler stops.
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::ALL
|
||||
);
|
||||
assert!(owner.remove_network_intercept("intercept-auth"));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::IMAGE
|
||||
);
|
||||
assert!(!owner.config_snapshot().matches_auth_required(&other_url));
|
||||
assert!(owner.remove_fetch_session(Some("SID-other")));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::IMAGE
|
||||
);
|
||||
assert!(owner.remove_network_intercept("intercept-no-auth"));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::NONE
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn network_auth_without_url_patterns_does_not_broaden_or_authorize_requests() {
|
||||
let mut owner = TargetFetchOwner::default();
|
||||
owner.add_network_intercept(
|
||||
"intercept-empty-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
true,
|
||||
Vec::new(),
|
||||
vec![FetchInterceptionPattern {
|
||||
url_pattern: "*".to_owned(),
|
||||
resource_type_filter: Some(FetchResourceTypeFilter::Image),
|
||||
request_stage: FetchRequestStage::Request,
|
||||
}],
|
||||
);
|
||||
let any_url = Url::parse("https://example.test/protected/basic").unwrap();
|
||||
let other_url = Url::parse("https://other.test/public").unwrap();
|
||||
let config = owner.config_snapshot();
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::ALL
|
||||
);
|
||||
assert!(config.matches_auth_required(&any_url));
|
||||
assert!(config.matches_auth_required(&other_url));
|
||||
|
||||
owner.add_network_intercept(
|
||||
"intercept-no-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
false,
|
||||
vec!["*".to_owned()],
|
||||
Vec::new(),
|
||||
);
|
||||
|
||||
let url = Url::parse("https://example.test/protected/basic").unwrap();
|
||||
let config = owner.config_snapshot();
|
||||
let snapshot = config.subresource_interception_snapshot();
|
||||
assert!(owner.handle_auth_requests());
|
||||
assert!(!config.matches_auth_required(&any_url));
|
||||
assert!(!config.matches_auth_required(&url));
|
||||
assert!(!snapshot.matches_auth_required(&url));
|
||||
assert_eq!(snapshot.auth_required_owner_kind(&url), None);
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::IMAGE,
|
||||
"unmatched session auth must not broaden the renderer class set"
|
||||
);
|
||||
|
||||
owner.add_network_intercept(
|
||||
"intercept-empty-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
true,
|
||||
Vec::new(),
|
||||
Vec::new(),
|
||||
);
|
||||
assert!(!owner.config_snapshot().matches_auth_required(&any_url));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::IMAGE,
|
||||
"an auth intercept without URL patterns must not broaden the class set"
|
||||
);
|
||||
|
||||
// A matching auth intercept widens the set back to every class.
|
||||
owner.add_network_intercept(
|
||||
"intercept-auth".to_owned(),
|
||||
Some("BIDI-SID".to_owned()),
|
||||
true,
|
||||
vec!["https://example.test/protected*".to_owned()],
|
||||
Vec::new(),
|
||||
);
|
||||
let config = owner.config_snapshot();
|
||||
assert!(config.matches_auth_required(&any_url));
|
||||
assert!(!config.matches_auth_required(&other_url));
|
||||
assert_eq!(
|
||||
owner.subresource_interception_config(),
|
||||
SubresourceInterceptionClasses::ALL
|
||||
SubresourceInterceptionClasses::IMAGE
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user