From 57260aff827ec6fde15549eca8feeb2fd8a34cc0 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Wed, 28 Oct 2026 02:34:09 +0800 Subject: [PATCH] refactor(cookies): make delete partition scope explicit --- moli-cookie-jar/src/jar.rs | 17 +++++++++------- moli-cookie-store/src/cookie_store/policy.rs | 15 ++++---------- moli-cookie-store/src/cookie_store/store.rs | 20 +++++++++++++------ moli-cookie-store/src/cookie_store/tests.rs | 11 +++++----- .../src/cookie_store/tests/query_filter.rs | 6 ++---- .../src/cookie_store/tests/write.rs | 19 ++++++++++++++++-- moli-cookie-store/src/lib.rs | 6 +++--- 7 files changed, 56 insertions(+), 38 deletions(-) diff --git a/moli-cookie-jar/src/jar.rs b/moli-cookie-jar/src/jar.rs index 82d62a25889..c8fb07009e4 100644 --- a/moli-cookie-jar/src/jar.rs +++ b/moli-cookie-jar/src/jar.rs @@ -6,8 +6,8 @@ use std::borrow::Cow; use std::sync::Arc; use cookie_store::{ - CanonicalCookieInput, CookieDeleteFilter, CookieExpiration, CookieStore, CookieStoreLimits, - HttpRequestType, InsertContext, QueryContext, SameSite, SameSiteContext, + CanonicalCookieInput, CookieDeleteFilter, CookieExpiration, CookiePartitionMatch, CookieStore, + CookieStoreLimits, HttpRequestType, InsertContext, QueryContext, SameSite, SameSiteContext, SameSiteRequestContext, }; use moli_site::{public_suffix_list, same_site_urls}; @@ -428,17 +428,20 @@ impl BrowserCookieStore { StoredCookieDomainMatch::Canonical => (domain, None), StoredCookieDomainMatch::Serialized => (None, domain), }; + let partition = match partition_key.as_ref() { + Some(key) => CookiePartitionMatch::Exact(key), + None if matches!(partition_filter, StoredCookiePartitionFilter::Unpartitioned) => { + CookiePartitionMatch::Unpartitioned + } + None => CookiePartitionMatch::Any, + }; let removed = self.full_core.delete_matching(&CookieDeleteFilter { name, domain, serialized_domain, path, url_host, - partition_key: partition_key.as_ref(), - unpartitioned_only: matches!( - partition_filter, - StoredCookiePartitionFilter::Unpartitioned - ), + partition, }); if removed > 0 { self.bump_document_cookie_generation(); diff --git a/moli-cookie-store/src/cookie_store/policy.rs b/moli-cookie-store/src/cookie_store/policy.rs index 8790a1e6d50..f64ae8c0245 100644 --- a/moli-cookie-store/src/cookie_store/policy.rs +++ b/moli-cookie-store/src/cookie_store/policy.rs @@ -103,18 +103,11 @@ pub(super) fn cookie_matches_delete_filter( return false; } - if filter.unpartitioned_only && cookie.partition_key().is_some() { - return false; + match filter.partition { + CookiePartitionMatch::Any => true, + CookiePartitionMatch::Unpartitioned => cookie.partition_key().is_none(), + CookiePartitionMatch::Exact(wanted) => cookie.partition_key() == Some(wanted), } - - if filter - .partition_key - .is_some_and(|wanted| cookie.partition_key() != Some(wanted)) - { - return false; - } - - true } pub(super) fn delete_filter_domain_matches_host( diff --git a/moli-cookie-store/src/cookie_store/store.rs b/moli-cookie-store/src/cookie_store/store.rs index e58e5998dcc..08ceffc1982 100644 --- a/moli-cookie-store/src/cookie_store/store.rs +++ b/moli-cookie-store/src/cookie_store/store.rs @@ -51,6 +51,18 @@ pub enum StoreAction { pub type StoreResult = Result; pub type InsertResult = Result; +/// Partition scope for cookie deletion. +#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] +pub enum CookiePartitionMatch<'a> { + /// Match cookies in every partition, including unpartitioned cookies. + #[default] + Any, + /// Match only cookies without a partition key. + Unpartitioned, + /// Match cookies in one exact partition, including opaque partitions. + Exact(&'a crate::CookiePartitionKey), +} + /// Filter used for deleting matching cookies from the store. /// /// This is intentionally close to the browser-facing filters used by CDP and @@ -70,12 +82,8 @@ pub struct CookieDeleteFilter<'a> { /// Further constrain matches using browser host-only semantics for this /// request host. pub url_host: Option<&'a str>, - /// When present, delete only cookies in this exact partition. `None` keeps - /// the compatibility behavior of deleting all matching partitions. - pub partition_key: Option<&'a crate::CookiePartitionKey>, - /// Exclude partitioned cookies. Defaults to false so an omitted partition - /// key continues to match all partitions unless explicitly constrained. - pub unpartitioned_only: bool, + /// Match all partitions by default, or explicitly constrain their scope. + pub partition: CookiePartitionMatch<'a>, } /// Browser-oriented cookie store limits. diff --git a/moli-cookie-store/src/cookie_store/tests.rs b/moli-cookie-store/src/cookie_store/tests.rs index d7f1585f2b4..7a2b7dd695e 100644 --- a/moli-cookie-store/src/cookie_store/tests.rs +++ b/moli-cookie-store/src/cookie_store/tests.rs @@ -1,10 +1,11 @@ use super::{ BrowserSiteContext, CookieAccessSemantics, CookieDeleteFilter, CookieEffectiveSameSite, - CookieExclusionReason, CookieScopeSemantics, CookieSetAccessResult, CookieSetRejectionReason, - CookieSetResult, CookieSetWarningReason, CookieStore, CookieStoreLimits, CookieWarningReason, - HttpRequestType, InsertContext, QueryContext, SameSiteContext, SameSiteContextDowngradeType, - SameSiteContextHttpMethod, SameSiteContextMetadata, SameSiteContextRedirectType, - SameSiteContextTrackMetadata, SameSiteRequestContext, StorageAccessStatus, + CookieExclusionReason, CookiePartitionMatch, CookieScopeSemantics, CookieSetAccessResult, + CookieSetRejectionReason, CookieSetResult, CookieSetWarningReason, CookieStore, + CookieStoreLimits, CookieWarningReason, HttpRequestType, InsertContext, QueryContext, + SameSiteContext, SameSiteContextDowngradeType, SameSiteContextHttpMethod, + SameSiteContextMetadata, SameSiteContextRedirectType, SameSiteContextTrackMetadata, + SameSiteRequestContext, StorageAccessStatus, }; use super::{InsertResult, StoreAction}; use crate::cookie::{CanonicalCookieInput, Cookie}; diff --git a/moli-cookie-store/src/cookie_store/tests/query_filter.rs b/moli-cookie-store/src/cookie_store/tests/query_filter.rs index 61aa7d53981..cff6043bd62 100644 --- a/moli-cookie-store/src/cookie_store/tests/query_filter.rs +++ b/moli-cookie-store/src/cookie_store/tests/query_filter.rs @@ -24,8 +24,7 @@ fn delete_matching_removes_matching_domain_cookie_but_not_host_only_cookie() { serialized_domain: None, path: None, url_host: Some("deep.sub.example.com"), - partition_key: None, - unpartitioned_only: false, + partition: CookiePartitionMatch::Any, }); assert_eq!(removed, 1); @@ -57,8 +56,7 @@ fn delete_matching_url_host_filter_respects_host_only_semantics() { serialized_domain: None, path: None, url_host: Some("deep.sub.example.com"), - partition_key: None, - unpartitioned_only: false, + partition: CookiePartitionMatch::Any, }); assert_eq!(removed, 1); diff --git a/moli-cookie-store/src/cookie_store/tests/write.rs b/moli-cookie-store/src/cookie_store/tests/write.rs index 80ef36c3fca..007553c8302 100644 --- a/moli-cookie-store/src/cookie_store/tests/write.rs +++ b/moli-cookie-store/src/cookie_store/tests/write.rs @@ -544,8 +544,7 @@ fn partitioned_cookies_coexist_and_query_by_exact_partition_key() { serialized_domain: None, path: Some("/foo"), url_host: None, - partition_key: Some(&key_a), - unpartitioned_only: false, + partition: CookiePartitionMatch::Exact(&key_a), }), 1 ); @@ -556,6 +555,22 @@ fn partitioned_cookies_coexist_and_query_by_exact_partition_key() { .get_with_partition_key("cdn.example", "/foo", "sid", Some(&key_b)) .is_some()); assert!(store.get("cdn.example", "/foo", "sid").is_some()); + + assert_eq!( + store.delete_matching(&CookieDeleteFilter { + name: Some("sid"), + partition: CookiePartitionMatch::Unpartitioned, + ..Default::default() + }), + 1 + ); + assert!(store.get("cdn.example", "/foo", "sid").is_none()); + assert!(store + .get_with_partition_key("cdn.example", "/foo", "sid", Some(&key_b)) + .is_some()); + + assert_eq!(store.delete_matching(&CookieDeleteFilter::default()), 1); + assert_eq!(store.iter_unexpired().count(), 0); } #[test] diff --git a/moli-cookie-store/src/lib.rs b/moli-cookie-store/src/lib.rs index 0ca68f43f6d..d3aa0c3ab0f 100644 --- a/moli-cookie-store/src/lib.rs +++ b/moli-cookie-store/src/lib.rs @@ -29,9 +29,9 @@ mod cookie_store; pub use crate::cookie_store::{ BrowserSiteContext, CookieAccessQueryResult, CookieAccessResult, CookieAccessSemantics, CookieAccessSource, CookieDeleteFilter, CookieEffectiveSameSite, CookieExclusionReason, - CookieInclusionStatus, CookieQueryResult, CookieScopeSemantics, CookieSetAccessResult, - CookieSetRejectionReason, CookieSetResult, CookieSetWarningReason, CookieStore, - CookieStoreLimits, CookieWarningReason, CookieWithAccessResult, ExcludedCookie, + CookieInclusionStatus, CookiePartitionMatch, CookieQueryResult, CookieScopeSemantics, + CookieSetAccessResult, CookieSetRejectionReason, CookieSetResult, CookieSetWarningReason, + CookieStore, CookieStoreLimits, CookieWarningReason, CookieWithAccessResult, ExcludedCookie, HttpRequestType, InsertContext, QueryContext, SameSiteContext, SameSiteContextDowngradeType, SameSiteContextHttpMethod, SameSiteContextMetadata, SameSiteContextRedirectType, SameSiteContextTrackMetadata, SameSiteRequestContext, StorageAccessStatus, StoreAction,