diff --git a/src/services/protocol_login.py b/src/services/protocol_login.py index f61eb764..c1c49067 100644 --- a/src/services/protocol_login.py +++ b/src/services/protocol_login.py @@ -16,6 +16,7 @@ cookie_pairs_for_url, normalize_cookie_storage_text, parse_browser_cookie_payload, + serialize_cookie_header_for_url, validate_flow_cookie_storage, ) @@ -156,12 +157,16 @@ async def login( session_kwargs["proxy"] = normalized_proxy try: + cookie_hdr = serialize_cookie_header_for_url( + google_cookies_raw, f"{FLOW_BASE}/projects" + ) + req_headers = {"Referer": f"{FLOW_BASE}/"} + if cookie_hdr: + req_headers["Cookie"] = cookie_hdr async with AsyncSession(**session_kwargs) as session: response = await session.get( f"{FLOW_BASE}/projects", - headers={ - "Referer": f"{FLOW_BASE}/", - }, + headers=req_headers, ) # The Python session jar only merges updates; a fresh snapshot also # honors cookies deleted by Set-Cookie, including during redirects. diff --git a/tests/test_cookie_refresh.py b/tests/test_cookie_refresh.py index 7354d8b7..4586b6e6 100644 --- a/tests/test_cookie_refresh.py +++ b/tests/test_cookie_refresh.py @@ -110,7 +110,12 @@ async def test_rotated_and_deleted_cookies_are_exported_with_scope(self): self.assertFalse(cookies["SID"]["hostOnly"]) self.assertNotIn("deleted", cookies) self.assertEqual(factory.call_args.kwargs["proxy"], "http://127.0.0.1:7890") - self.assertNotIn("Cookie", session.get.call_args.kwargs["headers"]) + # 续期请求必须显式带上浏览器会发的那份 Cookie 头: + # path=/project 的 deleted 不属于 /projects 的作用域,不应出现在这里。 + self.assertEqual( + session.get.call_args.kwargs["headers"]["Cookie"], + "OSID=session-old; SID=account-cookie", + ) async def test_anonymous_frontend_does_not_count_as_refresh(self): result, _, _ = await self.call_login(page="boq_labs-ai-sandbox-frontend_")