mirror of
https://github.com/lexmount/moli.git
synced 2026-11-17 08:08:43 +00:00
refactor(cookies): make delete partition scope explicit
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -51,6 +51,18 @@ pub enum StoreAction {
|
||||
pub type StoreResult<T> = Result<T, crate::Error>;
|
||||
pub type InsertResult = Result<StoreAction, CookieError>;
|
||||
|
||||
/// 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.
|
||||
|
||||
@@ -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};
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user