Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(auth): 限制隧道登录来源头的信任范围

kcinzggc12d793d3f8f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec7fa7562..8807f8ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,10 @@ Removed / Fixed / Security。
- **馆藏**:处理失败后的线程清理完成前保留停止中状态,避免立即重试撞上仍持有的处理锁;起步失败时显示本次错误,不再退回上一轮结果。
- **采集**:云下载能力未取得时,在本机诊断记录保留令牌、挂载点或目录探测阶段及失败分类,便于区分配置与网络问题。
+### 安全
+
+- **配置**:仅对隧道的本机转发连接采用有效的客户端地址头,防止直接连接的客户端伪造来源绕过登录限速。
+
## [0.51.0] - 2026-10-28
作者从 2026 年 10 月 29 日开始游玩《影之刃零》,通关前会暂缓更新和维护。
diff --git a/src/peach/routes_auth.py b/src/peach/routes_auth.py
index 0459ef8ce..c4c8442f1 100644
--- a/src/peach/routes_auth.py
+++ b/src/peach/routes_auth.py
@@ -10,6 +10,7 @@
from __future__ import annotations
import hmac
+import ipaddress
from collections import OrderedDict
import threading
import time
@@ -30,15 +31,20 @@ _ATTEMPTS_LOCK = threading.Lock()
def _attempt_key(request: Request) -> str:
"""限速按真实来源分桶。
- 隧道在跑时所有请求的连接源都是 cloudflared 的回环地址,按它计数等于把整个公网
- 合成一个桶:外面一台机器试满十次,本机浏览器也跟着被锁一分钟。这时改用边缘给出
- 的客户端地址,隧道没在跑就仍按连接源,避免任何人自带一个头就换一个桶。
+ 隧道运行且连接来自回环或服务自己的地址时才读取边缘客户端地址。源码隧道连接本机
+ HTTPS 地址;其他局域网客户端按连接源计数。转发地址必须有效并归一化。
"""
- if tunnel.running(getattr(request.app.state, "tunnel", None)):
+ peer = request.client.host if request.client else "unknown"
+ server = request.scope.get('server')
+ local_peer = peer in ("127.0.0.1", "::1") or bool(
+ server and peer == server[0] and peer not in ('0.0.0.0', '::'))
+ if local_peer and tunnel.running(getattr(request.app.state, "tunnel", None)):
forwarded = (request.headers.get("cf-connecting-ip") or "").strip()
- if forwarded:
- return f"cf:{forwarded}"
- return request.client.host if request.client else "unknown"
+ try:
+ return f"cf:{ipaddress.ip_address(forwarded)}"
+ except ValueError:
+ pass
+ return peer
def _login_attempt(request: Request) -> None:
diff --git a/tests/test_tunnel.py b/tests/test_tunnel.py
index 68f08db65..c6c359110 100644
--- a/tests/test_tunnel.py
+++ b/tests/test_tunnel.py
@@ -6,6 +6,7 @@ import tempfile
import threading
import time
import unittest
+from collections import OrderedDict
from pathlib import Path
from types import SimpleNamespace
from unittest import mock
@@ -1008,6 +1009,32 @@ class LocalClientTests(unittest.TestCase):
request = self.request("stopped", {"cf-connecting-ip": "198.51.100.7"})
self.assertEqual(routes_auth._attempt_key(request), "127.0.0.1")
+ def test_the_login_rate_limit_separates_edge_clients_on_the_service_address(self):
+ request = self.request("running", {"cf-connecting-ip": "198.51.100.7"})
+ request.client.host = "192.0.2.5"
+ request.scope["server"] = ("192.0.2.5", 443)
+ self.assertEqual(routes_auth._attempt_key(request), "cf:198.51.100.7")
+
+ def test_a_lan_client_cannot_reset_the_login_rate_limit_with_forwarded_headers(self):
+ request = self.request("running", {})
+ request.client.host = "192.0.2.8"
+ request.scope["server"] = ("192.0.2.5", 443)
+ with mock.patch.object(routes_auth, "_ATTEMPTS", OrderedDict()):
+ for number in range(10):
+ request.headers = {"cf-connecting-ip": f"198.51.100.{number + 1}"}
+ routes_auth._login_attempt(request)
+ request.headers = {"cf-connecting-ip": "198.51.100.99"}
+ with self.assertRaises(HTTPException) as caught:
+ routes_auth._login_attempt(request)
+ self.assertEqual(caught.exception.status_code, 429)
+
+ def test_a_tunnel_peer_uses_only_a_valid_normalized_forwarded_address(self):
+ for value, expected in (("not-an-ip", "127.0.0.1"),
+ ("2001:0db8:0:0:0:0:0:1", "cf:2001:db8::1")):
+ with self.subTest(value=value):
+ request = self.request("running", {"cf-connecting-ip": value})
+ self.assertEqual(routes_auth._attempt_key(request), expected)
+
class AccessTunnelInterlockTests(unittest.TestCase):
"""关掉访问密码就没有第二道闸门,公网入口必须当场收掉。"""