全面修复: 所有微博API调用统一跳过首页+不跟随重定向, 彻底解决SSO误判问题

This commit is contained in:
2026-04-17 09:19:45 +08:00
parent 7e1c389a11
commit 36bb86a8f7
2 changed files with 33 additions and 20 deletions

View File

@@ -210,14 +210,18 @@ async def _verify_weibo_cookie(cookie_str: str) -> dict:
Returns {"valid": bool, "uid": str|None, "screen_name": str|None}. Returns {"valid": bool, "uid": str|None, "screen_name": str|None}.
""" """
cookies = _parse_cookie_str(cookie_str) cookies = _parse_cookie_str(cookie_str)
async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client: async with httpx.AsyncClient(timeout=15, follow_redirects=False) as client:
# Step 1: check login via /ajax/side/cards # Step 1: check login via /ajax/side/cards (不跟随重定向)
resp = await client.get( resp = await client.get(
"https://weibo.com/ajax/side/cards", "https://weibo.com/ajax/side/cards",
params={"count": "1"}, params={"count": "1"},
headers=WEIBO_HEADERS, headers={**WEIBO_HEADERS, "X-Requested-With": "XMLHttpRequest"},
cookies=cookies, cookies=cookies,
) )
if resp.status_code in (301, 302):
return {"valid": False, "uid": None, "screen_name": None}
try: try:
data = resp.json() data = resp.json()
except Exception: except Exception:
@@ -346,10 +350,9 @@ async def _get_super_topics(cookie_str: str, weibo_uid: str = "") -> List[dict]:
cookies = _parse_cookie_str(cookie_str) cookies = _parse_cookie_str(cookie_str)
topics: List[dict] = [] topics: List[dict] = []
async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client: async with httpx.AsyncClient(timeout=15, follow_redirects=False) as client:
# First get XSRF-TOKEN by visiting weibo.com # 直接请求 API不访问首页避免 SSO 重定向)
await client.get("https://weibo.com/", headers=WEIBO_HEADERS, cookies=cookies) xsrf = cookies.get("XSRF-TOKEN", "")
xsrf = client.cookies.get("XSRF-TOKEN", "")
headers = { headers = {
**WEIBO_HEADERS, **WEIBO_HEADERS,
@@ -414,10 +417,9 @@ async def _do_signin(cookie_str: str, topic_title: str, containerid: str) -> dic
import time as _time import time as _time
cookies = _parse_cookie_str(cookie_str) cookies = _parse_cookie_str(cookie_str)
async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client: async with httpx.AsyncClient(timeout=15, follow_redirects=False) as client:
# Get XSRF-TOKEN # 直接从 Cookie 获取 XSRF不访问首页
await client.get("https://weibo.com/", headers=WEIBO_HEADERS, cookies=cookies) xsrf = cookies.get("XSRF-TOKEN", "")
xsrf = client.cookies.get("XSRF-TOKEN", "")
headers = { headers = {
**WEIBO_HEADERS, **WEIBO_HEADERS,
@@ -448,6 +450,10 @@ async def _do_signin(cookie_str: str, topic_title: str, containerid: str) -> dic
headers=headers, headers=headers,
cookies=cookies, cookies=cookies,
) )
if resp.status_code in (301, 302):
return {"status": "failed", "message": "签到API被重定向Cookie可能失效"}
try: try:
data = resp.json() data = resp.json()
except Exception: except Exception:

View File

@@ -411,7 +411,7 @@ async def _async_do_signin(account_id: str, cron_expr: str = ""):
signed = already = failed = 0 signed = already = failed = 0
log_entries = [] log_entries = []
async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client: async with httpx.AsyncClient(timeout=15, follow_redirects=False) as client:
# 直接从 Cookie 获取 XSRF token不访问首页 # 直接从 Cookie 获取 XSRF token不访问首页
xsrf = cookies.get("XSRF-TOKEN", "") xsrf = cookies.get("XSRF-TOKEN", "")
@@ -592,6 +592,11 @@ async def _do_single_signin(client, cookies: dict, topic: dict, xsrf: str) -> di
}, },
headers=h, cookies=cookies, headers=h, cookies=cookies,
) )
# 被重定向 = Cookie 失效
if resp.status_code in (301, 302):
return {"status": "failed", "message": "签到API被重定向Cookie可能失效"}
try: try:
data = resp.json() data = resp.json()
except Exception: except Exception:
@@ -746,21 +751,23 @@ async def _build_daily_report() -> str:
remain_days = (expire_dt - now).days remain_days = (expire_dt - now).days
expire_str = expire_dt.strftime("%m-%d") expire_str = expire_dt.strftime("%m-%d")
# 真实 API 验证 # 真实 API 验证(不跟随重定向,直接请求 AJAX API
real_valid = False real_valid = False
try: try:
async with _httpx.AsyncClient(timeout=10, follow_redirects=True) as hc: async with _httpx.AsyncClient(timeout=10, follow_redirects=False) as hc:
vresp = await hc.get( vresp = await hc.get(
"https://weibo.com/ajax/side/cards", "https://weibo.com/ajax/side/cards",
params={"count": "1"}, params={"count": "1"},
headers=WEIBO_HEADERS, headers={**WEIBO_HEADERS, "X-Requested-With": "XMLHttpRequest"},
cookies=cookie_dict, cookies=cookie_dict,
) )
if vresp.status_code == 200:
try: try:
vdata = vresp.json() vdata = vresp.json()
real_valid = vdata.get("ok") == 1 real_valid = vdata.get("ok") == 1
except Exception: except Exception:
real_valid = False real_valid = False
# 302 = Cookie 失效
except Exception: except Exception:
real_valid = False real_valid = False