Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(web): 保留播放时间与队列查询参数

longmeidaofc6071459814
diff --git a/src/peach/routes_auth.py b/src/peach/routes_auth.py
index 77df479d7..3bf12311d 100644
--- a/src/peach/routes_auth.py
+++ b/src/peach/routes_auth.py
@@ -181,11 +181,28 @@ def require_asset_auth(request: Request) -> dict[str, str]:
return args
+def _query_token_matches(request: Request) -> bool:
+ token = request.app.state.settings.token
+ supplied = _first_query_values(request).get("t", "")
+ return bool(token) and hmac.compare_digest(supplied.encode(), token.encode())
+
+
+def query_auth_redirect(request: Request) -> str | None:
+ """为已授权页面清除 URL 口令,保留原始编码、重复参数与播放时间。"""
+ if not _query_token_matches(request):
+ return None
+ token = request.app.state.settings.token
+ pairs = request.scope.get("query_string", b"").decode("latin-1").split("&")
+ retained = [pair for pair in pairs if parse_qs(pair).get("t") != [token]]
+ query = "&".join(retained)
+ return (request.url.path or "/") + (f"?{query}" if query else "")
+
+
def set_auth_cookie(response: Response, request: Request, *, days: int = 30, login: bool = False) -> None:
token = request.app.state.settings.token
policy = _policy(request)
response.headers["Cache-Control"] = "no-store"
- if token and policy["mode"] in {"password", "legacy"} and (login or request.query_params.get("t") == token):
+ if token and policy["mode"] in {"password", "legacy"} and (login or _query_token_matches(request)):
value, max_age = access.issue(policy, days)
response.set_cookie(access.COOKIE, value, max_age=max_age, path="/", httponly=True,
samesite="lax", secure=request.url.scheme == "https")
diff --git a/src/peach/routes_pages.py b/src/peach/routes_pages.py
index f4a2670de..f385f1ef7 100644
--- a/src/peach/routes_pages.py
+++ b/src/peach/routes_pages.py
@@ -38,7 +38,7 @@ from fastapi.responses import (
from . import distribution, onboarding, settings_file
from .config import PROJECT_ROOT
from .entities import resolve_entity, resolve_entity_id
-from .routes_auth import require_asset_auth, require_page_auth, set_auth_cookie
+from .routes_auth import query_auth_redirect, require_asset_auth, require_page_auth, set_auth_cookie
from .web_entry import page_shell, runtime_fact_entries
from .web_state import FAVICON
@@ -227,8 +227,9 @@ def stylesheet_response(request: Request, web: Path) -> Response:
@router.api_route("/", methods=["GET", "HEAD"])
def index(request: Request, args: dict[str, str] = Depends(require_page_auth)):
settings = request.app.state.settings
- if settings.token and args.get("t"):
- response = RedirectResponse(request.url.path or "/", status_code=303)
+ auth_target = query_auth_redirect(request)
+ if auth_target is not None:
+ response = RedirectResponse(auth_target, status_code=303)
set_auth_cookie(response, request)
return response
if not settings.configured:
diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.py
index da729f546..5c3f7f293 100644
--- a/tests/test_fastapi_api.py
+++ b/tests/test_fastapi_api.py
@@ -1684,6 +1684,30 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):
self.assertEqual(response.status_code, 200)
self.assertIn("ready", response.text)
+ async def test_playback_time_requires_a_session_and_survives_page_navigation(self):
+ denied = await self.client.get("/assets/1?t=42")
+ self.assertEqual(denied.status_code, 303)
+ self.assertTrue(denied.headers["location"].startswith("/login?"))
+ await self.client.get("/?t=secret")
+ for path in ("/assets/1", "/posts/1", "/works/ABP-968"):
+ response = await self.client.get(path + "?t=42&tag=a%20b&tag=c")
+ self.assertEqual(response.status_code, 200, path)
+ self.assertNotIn("location", response.headers)
+ legacy = await self.client.get("/item/1?t=42&mix=7")
+ self.assertEqual(legacy.headers["location"], "/assets/1?t=42&mix=7")
+ page = await self.client.get(legacy.headers["location"])
+ self.assertEqual(page.status_code, 200)
+
+ async def test_query_credentials_are_removed_without_losing_page_parameters(self):
+ response = await self.client.get(
+ "/assets/1?tag=a%20b&t=secret&t=42&tag=c&t=se%63ret&playlist=7")
+ self.assertEqual(response.status_code, 303)
+ self.assertEqual(response.headers["location"],
+ "/assets/1?tag=a%20b&t=42&tag=c&playlist=7")
+ self.assertIn("peach_session=", response.headers["set-cookie"])
+ page = await self.client.get(response.headers["location"])
+ self.assertEqual(page.status_code, 200)
+
async def test_login_posts_the_token_without_putting_it_in_the_url(self):
page = await self.client.get("/login?next=/stats")
self.assertEqual(page.status_code, 200)