From f53c221e046155094f0fbd8abbe2e148946fc895 Mon Sep 17 00:00:00 2001 From: chinbor Date: Tue, 17 Nov 2026 19:45:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(login):=20=E8=AE=A9=20cookie=20=E7=BB=AD?= =?UTF-8?q?=E6=9C=9F=E8=AF=B7=E6=B1=82=E6=98=BE=E5=BC=8F=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=BD=9C=E7=94=A8=E5=9F=9F=20Cookie?= =?UTF-8?q?=20=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ProtocolLogin 之前只靠 AsyncSession(cookies=jar) 让 curl_cffi 自带 cookie。 session jar 只合并更新,不会因为 Set-Cookie 删除而停止发送,同名重复项与 作用域过滤也和浏览器不一致,导致 /projects 续期拿不到有效 Set-Cookie。 改为用 serialize_cookie_header_for_url 构造与真实浏览器逐字节一致的 Cookie 头(作用域过滤 + 同名按 path 长者优先),显式写入首次请求的 headers。 顺带把 test_rotated_and_deleted_cookies_are_exported_with_scope 里 assertNotIn("Cookie", ...) 的断言改为断言实际发出的 Cookie 头。 --- src/services/protocol_login.py | 11 ++++++++--- tests/test_cookie_refresh.py | 7 ++++++- 2 files changed, 14 insertions(+), 4 deletions(-) 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_")