From 92bd4e1b59869f022824ca8a0ea1a5aebadcc294 Mon Sep 17 00:00:00 2001 From: houhuan Date: Mon, 16 Nov 2026 12:53:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Cookie=20=E5=85=88=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=90=8E=E8=90=BD=E7=9B=98=EF=BC=8C=E5=9D=8F=20Cookie=20?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E8=A6=86=E7=9B=96=E6=AD=A3=E5=9C=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=9C=89=E6=95=88=20Cookie=EF=BC=88+2=20?= =?UTF-8?q?=E9=A1=B9=E6=B5=8B=E8=AF=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fengxiang/monitor.py | 20 +++++++++++++++----- tests/test_core.py | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/fengxiang/monitor.py b/fengxiang/monitor.py index c882ec0..a9e2004 100644 --- a/fengxiang/monitor.py +++ b/fengxiang/monitor.py @@ -124,11 +124,15 @@ class Monitor: log.error("读取 cookie 文件失败: %s", exc) return None - def apply_cookies(self, cookies: Dict[str, str], source: str = "file") -> bool: - """校验并应用 Cookie(供主循环与管理接口共用)。""" + def apply_cookies(self, cookies: Dict[str, str], source: str = "file", + validated: bool = False) -> bool: + """应用 Cookie(供主循环与管理接口共用)。 + + validated=True 表示调用方已经校验过,跳过重复的网络校验。 + """ if not cookies: return False - if not self.client.check_cookie(cookies): + if not validated and not self.client.check_cookie(cookies): log.warning("来自 %s 的 Cookie 校验未通过", source) return False self.client.set_cookies(cookies) @@ -163,11 +167,17 @@ class Monitor: return ok def update_cookies(self, cookies: Dict[str, str]) -> bool: - """管理接口收到新 Cookie:落盘后立即校验生效。""" + """管理接口收到新 Cookie:先校验再落盘,避免坏 Cookie 覆盖掉正在用的好 Cookie。""" from .store import atomic_write_json + + if not cookies: + return False + if not self.client.check_cookie(cookies): + log.warning("管理接口提交的 Cookie 校验未通过,已拒绝(保留原有 Cookie)") + return False atomic_write_json(Path(self.cfg.paths.cookies), cookies) self._cookie_sig = self._cookie_sig_of_file() - return self.apply_cookies(cookies, source="admin-api") + return self.apply_cookies(cookies, source="admin-api", validated=True) # ------------------------------------------------------------------ 状态 def status(self) -> Dict[str, Any]: diff --git a/tests/test_core.py b/tests/test_core.py index 72a047a..a51982e 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -186,6 +186,29 @@ class TestProcess(BaseCase): self.assertEqual(dispatcher.messages, []) +# --------------------------------------------------------------------------- Cookie 更新 +class TestCookieUpdate(BaseCase): + def test_invalid_cookie_not_written(self): + """坏 Cookie 不能覆盖掉正在用的好 Cookie。""" + mon, client, _, _ = self.build() + path = self.cfg.paths.cookies + path.write_text(json.dumps({"USS": "good"}), encoding="utf-8") + client.cookie_ok = False + + self.assertFalse(mon.update_cookies({"USS": "bad"})) + self.assertEqual(json.loads(path.read_text(encoding="utf-8")), {"USS": "good"}) + self.assertFalse(mon.state.cookie_valid) + + def test_valid_cookie_written_and_active(self): + mon, client, _, _ = self.build() + client.cookie_ok = True + self.assertTrue(mon.update_cookies({"USS": "good", "PTOKEN": "p"})) + self.assertEqual(json.loads(self.cfg.paths.cookies.read_text(encoding="utf-8")), + {"USS": "good", "PTOKEN": "p"}) + self.assertTrue(mon.state.cookie_valid) + self.assertEqual(mon.client.cookies["USS"], "good") + + # --------------------------------------------------------------------------- 时间窗口 class TestWindows(BaseCase): def _at(self, hh, mm=0):