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(cookies): isolate partitioned cookie quotas
ldm07d562fad1222
diff --git a/moli-cookie-store/src/cookie_store/storage.rs b/moli-cookie-store/src/cookie_store/storage.rsindex c9470ffa0..8a263519a 100644--- a/moli-cookie-store/src/cookie_store/storage.rs+++ b/moli-cookie-store/src/cookie_store/storage.rs@@ -1,6 +1,6 @@use std::io::{BufRead, Write};-use crate::cookie::{Cookie, CookiePriority};+use crate::cookie::{Cookie, CookiePartitionKey, CookiePriority};use super::policy::{canonical_cookie_domain, domains_overlap, path_overlap};use super::*;@@ -180,28 +180,36 @@ impl CookieStore {pub(super) fn make_room_for_cookie(&mut self,domain: &str,+ partition_key: Option<&CookiePartitionKey>,incoming_secure_cookie: bool,replacing_existing: bool,) -> bool {- while self- .iter_unexpired()- .count()- .saturating_sub(usize::from(replacing_existing))- >= self.limits.total_cookies+ // The global quota covers only unpartitioned cookies. CHIPS cookies+ // have independent domain quotas within each complete partition key.+ while partition_key.is_none()+ && self+ .iter_unexpired()+ .filter(|cookie| cookie.partition_key().is_none())+ .count()+ .saturating_sub(usize::from(replacing_existing))+ >= self.limits.total_cookies{- if !self.evict_one_cookie(None, incoming_secure_cookie) {+ if !self.evict_one_cookie(None, None, incoming_secure_cookie) {return false;}}while self.iter_unexpired()- .filter(|existing| canonical_cookie_domain(existing) == domain)+ .filter(|existing| {+ existing.partition_key() == partition_key+ && canonical_cookie_domain(existing) == domain+ }).count().saturating_sub(usize::from(replacing_existing))>= self.limits.per_domain_cookies{- if !self.evict_one_cookie(Some(domain), incoming_secure_cookie) {+ if !self.evict_one_cookie(Some(domain), partition_key, incoming_secure_cookie) {return false;}}@@ -209,14 +217,19 @@ impl CookieStore {true}- fn evict_one_cookie(&mut self, domain: Option<&str>, incoming_secure_cookie: bool) -> bool {+ fn evict_one_cookie(+ &mut self,+ domain: Option<&str>,+ partition_key: Option<&CookiePartitionKey>,+ incoming_secure_cookie: bool,+ ) -> bool {for priority in [CookiePriority::Low,CookiePriority::Medium,CookiePriority::High,] {if let Some((name, domain, path, partition_key)) =- self.oldest_accessed_cookie_key(domain, false, priority)+ self.oldest_accessed_cookie_key(domain, partition_key, false, priority){self.remove_with_partition_key(&domain, &path, &name, partition_key.as_ref());return true;@@ -233,7 +246,7 @@ impl CookieStore {CookiePriority::High,] {if let Some((name, domain, path, partition_key)) =- self.oldest_accessed_cookie_key(domain, true, priority)+ self.oldest_accessed_cookie_key(domain, partition_key, true, priority){self.remove_with_partition_key(&domain, &path, &name, partition_key.as_ref());return true;@@ -246,12 +259,14 @@ impl CookieStore {fn oldest_accessed_cookie_key(&self,domain: Option<&str>,+ partition_key: Option<&CookiePartitionKey>,secure: bool,priority: CookiePriority,) -> Option<(String, String, String, Option<crate::CookiePartitionKey>)> {self.iter_unexpired().filter(|cookie| {- cookie.secure().unwrap_or(false) == secure+ cookie.partition_key() == partition_key+ && cookie.secure().unwrap_or(false) == secure&& cookie.effective_priority() == priority&& domain.is_none_or(|domain| canonical_cookie_domain(cookie) == domain)})diff --git a/moli-cookie-store/src/cookie_store/store.rs b/moli-cookie-store/src/cookie_store/store.rsindex 444f17fdc..31e4280e7 100644--- a/moli-cookie-store/src/cookie_store/store.rs+++ b/moli-cookie-store/src/cookie_store/store.rs@@ -80,9 +80,11 @@ pub struct CookieDeleteFilter<'a> {#[derive(Debug, Clone, Copy, PartialEq, Eq)]pub struct CookieStoreLimits {/// Maximum number of unexpired cookies allowed for one canonical cookie- /// domain bucket.+ /// domain bucket, independently for unpartitioned cookies and each+ /// partition key.pub per_domain_cookies: usize,- /// Maximum number of unexpired cookies allowed across the entire store.+ /// Maximum number of unexpired unpartitioned cookies across the store.+ /// Partitioned cookies are limited per domain and partition instead.pub total_cookies: usize,}diff --git a/moli-cookie-store/src/cookie_store/tests/write.rs b/moli-cookie-store/src/cookie_store/tests/write.rsindex 87cd52df7..d51cd4728 100644--- a/moli-cookie-store/src/cookie_store/tests/write.rs+++ b/moli-cookie-store/src/cookie_store/tests/write.rs@@ -1176,6 +1176,107 @@ fn global_eviction_applies_when_total_cookie_limit_is_hit() {);}+#[test]+fn partitioned_cookies_do_not_use_global_cookie_quota() {+ let mut store = CookieStore::default().with_limits(CookieStoreLimits::new(2, 1));+ let login_url = test_utils::url("https://login.example/");+ inserted!(store.insert_response_cookie_str("A2=login; Path=/; HttpOnly", &login_url));++ let key = CookiePartitionKey::site("https://top.example".into(), true);+ for host in ["one.example", "two.example"] {+ let url = test_utils::url(&format!("https://{host}/"));+ let mut context = InsertContext::http(&url);+ context.browser_context.cookie_partition_key = Some(key.clone());+ inserted!(store.insert_response_cookie_str_with_context(+ "chip=1; Path=/; Secure; Partitioned",+ &context,+ ));+ }++ assert!(store.contains("login.example", "/", "A2"));+ assert_eq!(store.iter_unexpired().count(), 3);+}++#[test]+fn unpartitioned_global_eviction_does_not_remove_partitioned_cookies() {+ let mut store = CookieStore::default().with_limits(CookieStoreLimits::new(1, 1));+ let key = CookiePartitionKey::site("https://top.example".into(), true);+ let url = test_utils::url("https://cdn.example/");+ let mut context = InsertContext::http(&url);+ context.browser_context.cookie_partition_key = Some(key.clone());+ inserted!(store+ .insert_response_cookie_str_with_context("chip=1; Path=/; Secure; Partitioned", &context,));++ for host in ["one.example", "two.example"] {+ inserted!(store.insert_response_cookie_str(+ "sid=1; Path=/; Secure",+ &test_utils::url(&format!("https://{host}/")),+ ));+ }++ assert!(store+ .get_with_partition_key("cdn.example", "/", "chip", Some(&key))+ .is_some());+ assert!(!store.contains("one.example", "/", "sid"));+ assert!(store.contains("two.example", "/", "sid"));+ assert_eq!(store.iter_unexpired().count(), 2);+}++#[test]+fn per_domain_cookie_eviction_is_partition_scoped() {+ let mut store = CookieStore::default().with_limits(CookieStoreLimits::new(1, 100));+ let url = test_utils::url("https://cdn.example/");+ let keys = [+ None,+ Some(CookiePartitionKey::site(+ "https://top-a.example".into(),+ false,+ )),+ Some(CookiePartitionKey::site(+ "https://top-a.example".into(),+ true,+ )),+ Some(CookiePartitionKey::site(+ "https://top-b.example".into(),+ true,+ )),+ Some(CookiePartitionKey::opaque(1, true)),+ Some(CookiePartitionKey::opaque(2, true)),+ ];+ for key in &keys {+ let mut context = InsertContext::http(&url);+ context.browser_context.cookie_partition_key = key.clone();+ let partitioned = if key.is_some() { "; Partitioned" } else { "" };+ inserted!(store.insert_response_cookie_str_with_context(+ &format!("sid=old; Path=/; Secure{partitioned}"),+ &context,+ ));+ }+ assert_eq!(store.iter_unexpired().count(), keys.len());++ for key in &keys {+ let mut context = InsertContext::http(&url);+ context.browser_context.cookie_partition_key = key.clone();+ let partitioned = if key.is_some() { "; Partitioned" } else { "" };+ updated!(store.insert_response_cookie_str_with_context(+ &format!("sid=updated; Path=/; Secure{partitioned}"),+ &context,+ ));+ assert_eq!(store.iter_unexpired().count(), keys.len());+ inserted!(store.insert_response_cookie_str_with_context(+ &format!("next=1; Path=/; Secure{partitioned}"),+ &context,+ ));+ assert!(store+ .get_with_partition_key("cdn.example", "/", "sid", key.as_ref())+ .is_none());+ assert!(store+ .get_with_partition_key("cdn.example", "/", "next", key.as_ref())+ .is_some());+ assert_eq!(store.iter_unexpired().count(), keys.len());+ }+}+#[test]fn eviction_prefers_lower_priority_before_higher_priority() {let mut store = CookieStore::default().with_limits(CookieStoreLimits::new(3, 100));diff --git a/moli-cookie-store/src/cookie_store/write.rs b/moli-cookie-store/src/cookie_store/write.rsindex 735bad133..0f709063c 100644--- a/moli-cookie-store/src/cookie_store/write.rs+++ b/moli-cookie-store/src/cookie_store/write.rs@@ -291,6 +291,7 @@ impl CookieStore {let replacing_existing = existing_creation_index.is_some();if !self.make_room_for_cookie(&cookie_domain,+ cookie.partition_key(),cookie.secure().unwrap_or(false),replacing_existing,) {