Skip to content

Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.

fix(storage_state): await restore, normalize session cookies, scope storage to origin

Laith Weinbergerfa517548957f
diff --git a/browser_use/browser/session.py b/browser_use/browser/session.py
index 56ac6cae1..14d21a6d7 100644
--- a/browser_use/browser/session.py
+++ b/browser_use/browser/session.py
@@ -657,7 +657,10 @@ class BrowserSession(BaseModel):
assert self.cdp_client is not None
# Notify that browser is connected (single place)
- self.event_bus.dispatch(BrowserConnectedEvent(cdp_url=self.cdp_url))
+
+ # Ensure BrowserConnected handlers (storage_state restore) complete before
+ # start() returns so cookies/storage are applied before navigation.
+ await self.event_bus.dispatch(BrowserConnectedEvent(cdp_url=self.cdp_url))
if self.browser_profile.demo_mode:
try:
diff --git a/browser_use/browser/watchdogs/storage_state_watchdog.py b/browser_use/browser/watchdogs/storage_state_watchdog.py
index bf400e665..4f6e3e391 100644
--- a/browser_use/browser/watchdogs/storage_state_watchdog.py
+++ b/browser_use/browser/watchdogs/storage_state_watchdog.py
@@ -249,25 +249,62 @@ class StorageStateWatchdog(BaseWatchdog):
# Apply cookies if present
if 'cookies' in storage and storage['cookies']:
- await self.browser_session._cdp_set_cookies(storage['cookies'])
+ # Playwright exports session cookies with expires=0/-1. CDP treats expires=0 as expired.
+ # Normalize session cookies by omitting expires
+ normalized_cookies: list[dict[str, Any]] = []
+ for cookie in storage['cookies']:
+ if not isinstance(cookie, dict):
+ normalized_cookies.append(cookie)
+ continue
+ c = dict(cookie)
+ expires = c.get('expires')
+ if expires in (0, 0.0, -1, -1.0):
+ c.pop('expires', None)
+ normalized_cookies.append(c)
+
+ await self.browser_session._cdp_set_cookies(normalized_cookies)
self._last_cookie_state = storage['cookies'].copy()
self.logger.debug(f'[StorageStateWatchdog] Added {len(storage["cookies"])} cookies from storage state')
# Apply origins (localStorage/sessionStorage) if present
if 'origins' in storage and storage['origins']:
for origin in storage['origins']:
- if 'localStorage' in origin:
+ origin_value = origin.get('origin')
+ if not origin_value:
+ continue
+
+ # Scope storage restoration to its origin to avoid cross-site pollution.
+ if origin.get('localStorage'):
+ lines = []
for item in origin['localStorage']:
- script = f"""
- window.localStorage.setItem({json.dumps(item['name'])}, {json.dumps(item['value'])});
- """
- await self.browser_session._cdp_add_init_script(script)
- if 'sessionStorage' in origin:
+ lines.append(
+ f"window.localStorage.setItem({json.dumps(item['name'])}, {json.dumps(item['value'])});"
+ )
+ script = (
+ "(function(){\n"
+ f" if (window.location && window.location.origin !== {json.dumps(origin_value)}) return;\n"
+ " try {\n"
+ f" {' '.join(lines)}\n"
+ " } catch (e) {}\n"
+ "})();"
+ )
+ await self.browser_session._cdp_add_init_script(script)
+
+ if origin.get('sessionStorage'):
+ lines = []
for item in origin['sessionStorage']:
- script = f"""
- window.sessionStorage.setItem({json.dumps(item['name'])}, {json.dumps(item['value'])});
- """
- await self.browser_session._cdp_add_init_script(script)
+ lines.append(
+ f"window.sessionStorage.setItem({json.dumps(item['name'])}, {json.dumps(item['value'])});"
+ )
+ script = (
+ "(function(){\n"
+ f" if (window.location && window.location.origin !== {json.dumps(origin_value)}) return;\n"
+ " try {\n"
+ f" {' '.join(lines)}\n"
+ " } catch (e) {}\n"
+ "})();"
+ )
+ await self.browser_session._cdp_add_init_script(script)
self.logger.debug(
f'[StorageStateWatchdog] Applied localStorage/sessionStorage from {len(storage["origins"])} origins'
)