From 32a05cfc60b15490677bd1b0742fb4162cd0c0d7 Mon Sep 17 00:00:00 2001 From: 2977094657 <2977094657@qq.com> Date: Tue, 27 Jan 2026 16:26:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(chat):=20proxy=5Fimage=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=20tc.qq.com=20=E5=B9=B6=E5=A2=9E=E5=BC=BA=E9=98=B2=E7=9B=97?= =?UTF-8?q?=E9=93=BE=20Referer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - proxy_image 放开 .tc.qq.com 白名单，兼容朋友圈/CDN 图片 - 下载时按多组 Referer/Origin 轮询，提高成功率 - 保持 host 校验与 10MB 限制 --- src/wechat_decrypt_tool/routers/chat_media.py | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/src/wechat_decrypt_tool/routers/chat_media.py b/src/wechat_decrypt_tool/routers/chat_media.py index 655f0bc..0943374 100644 --- a/src/wechat_decrypt_tool/routers/chat_media.py +++ b/src/wechat_decrypt_tool/routers/chat_media.py @@ -414,7 +414,7 @@ def _is_allowed_proxy_image_host(host: str) -> bool: if not h: return False # WeChat public account/article thumbnails and avatars commonly live on these CDNs. - return h.endswith(".qpic.cn") or h.endswith(".qlogo.cn") + return h.endswith(".qpic.cn") or h.endswith(".qlogo.cn") or h.endswith(".tc.qq.com") @router.get("/api/chat/media/proxy_image", summary="代理获取远程图片（解决微信公众号图片防盗链）") @@ -435,33 +435,52 @@ async def proxy_image(url: str): raise HTTPException(status_code=400, detail="Unsupported url host for proxy_image.") def _download_bytes() -> tuple[bytes, str]: - headers = { + base_headers = { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120 Safari/537.36", "Accept": "image/avif,image/webp,image/apng,image/*,*/*;q=0.8", - # qpic/qlogo often require a mp.weixin.qq.com referer (anti-hotlink) - "Referer": "https://mp.weixin.qq.com/", - "Origin": "https://mp.weixin.qq.com", } - r = requests.get(u, headers=headers, timeout=20, stream=True) - try: - r.raise_for_status() - content_type = str(r.headers.get("Content-Type") or "").strip() - max_bytes = 10 * 1024 * 1024 - chunks: list[bytes] = [] - total = 0 - for ch in r.iter_content(chunk_size=64 * 1024): - if not ch: - continue - chunks.append(ch) - total += len(ch) - if total > max_bytes: - raise HTTPException(status_code=400, detail="Proxy image too large (>10MB).") - return b"".join(chunks), content_type - finally: + + # Different Tencent CDNs enforce different anti-hotlink rules. + # Try a couple of safe referers so Moments(qpic) and MP(qpic) both work. + header_variants = [ + {"Referer": "https://wx.qq.com/", "Origin": "https://wx.qq.com"}, + {"Referer": "https://mp.weixin.qq.com/", "Origin": "https://mp.weixin.qq.com"}, + {"Referer": "https://www.baidu.com/", "Origin": "https://www.baidu.com"}, + {}, + ] + + last_err: Exception | None = None + for extra in header_variants: + headers = dict(base_headers) + headers.update(extra) + r = requests.get(u, headers=headers, timeout=20, stream=True) try: - r.close() - except Exception: - pass + r.raise_for_status() + content_type = str(r.headers.get("Content-Type") or "").strip() + max_bytes = 10 * 1024 * 1024 + chunks: list[bytes] = [] + total = 0 + for ch in r.iter_content(chunk_size=64 * 1024): + if not ch: + continue + chunks.append(ch) + total += len(ch) + if total > max_bytes: + raise HTTPException(status_code=400, detail="Proxy image too large (>10MB).") + return b"".join(chunks), content_type + except HTTPException: + # Hard failure, don't retry with another referer. + raise + except Exception as e: + last_err = e + finally: + try: + r.close() + except Exception: + pass + + # All variants failed. + raise last_err or RuntimeError("proxy_image download failed") try: data, ct = await asyncio.to_thread(_download_bytes)