fix: #476 serve assets from selected theme

This commit is contained in:
Lan committed 2026-06-05 11:37:44 +08:00
1 parent 8d6eaacb70
commit 1d03337e2f
2 files changed
+78 -14

No files matched your search

+34 -14
View File
@@ -6,10 +6,9 @@ import asyncio
import time
from contextlib import asynccontextmanager
from fastapi import FastAPI
from fastapi import FastAPI, HTTPException
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import HTMLResponse
from fastapi.staticfiles import StaticFiles
from fastapi.responses import FileResponse, HTMLResponse
from tortoise import Tortoise
from tortoise.contrib.fastapi import register_tortoise
@@ -77,12 +76,6 @@ async def lifespan(app: FastAPI):
# 加载配置(多进程下串行化启动写操作)
async with db_startup_lock():
await load_config()
app.mount(
"/assets",
StaticFiles(directory=f"./{settings.themesSelect}/assets"),
name="assets",
)
# 启动后台任务
task = asyncio.create_task(delete_expire_files())
chunk_cleanup_task = asyncio.create_task(clean_incomplete_uploads())
@@ -156,19 +149,46 @@ app.include_router(presign_api, prefix="/api")
app.include_router(admin_api)
def resolve_theme_root():
themes_root = (BASE_DIR / "themes").resolve()
theme_root = (BASE_DIR / str(settings.themesSelect)).resolve()
try:
theme_root.relative_to(themes_root)
except ValueError:
theme_root = (BASE_DIR / DEFAULT_CONFIG["themesSelect"]).resolve()
if not theme_root.exists():
theme_root = (BASE_DIR / DEFAULT_CONFIG["themesSelect"]).resolve()
return theme_root
def resolve_theme_file(*parts: str):
theme_root = resolve_theme_root()
file_path = theme_root.joinpath(*parts).resolve()
# 防止通过 /assets/../ 读取主题目录外的文件。
try:
file_path.relative_to(theme_root)
except ValueError:
raise HTTPException(status_code=404, detail="资源不存在")
if not file_path.is_file():
raise HTTPException(status_code=404, detail="资源不存在")
return file_path
@app.get("/assets/{asset_path:path}", include_in_schema=False)
async def theme_asset(asset_path: str):
return FileResponse(resolve_theme_file("assets", asset_path))
@app.exception_handler(404)
@app.get("/")
async def index(request=None, exc=None):
return HTMLResponse(
content=open(
BASE_DIR / f"{settings.themesSelect}/index.html", "r", encoding="utf-8"
)
.read()
content=resolve_theme_file("index.html")
.read_text(encoding="utf-8")
.replace("{{title}}", str(settings.name))
.replace("{{description}}", str(settings.description))
.replace("{{keywords}}", str(settings.keywords))
.replace("{{opacity}}", str(settings.opacity))
.replace('"/assets/', '"assets/')
.replace("{{background}}", str(settings.background)),
media_type="text/html",
headers={"Cache-Control": "no-cache"},
+44
View File
@@ -0,0 +1,44 @@
import asyncio
import unittest
from fastapi import HTTPException
from core.settings import settings
from main import index, resolve_theme_file
class SettingsOverrideMixin:
def setUp(self):
self._original_user_config = dict(settings.user_config)
def tearDown(self):
settings.user_config = self._original_user_config
class ThemeAssetTests(SettingsOverrideMixin, unittest.TestCase):
def test_resolves_assets_from_current_theme(self):
settings.themesSelect = "themes/2023"
theme_2023_asset = resolve_theme_file("assets", "index-CxMsK_Ni.js")
settings.themesSelect = "themes/2024"
theme_2024_asset = resolve_theme_file("assets", "index-DjzJA_Oj.js")
self.assertIn("themes/2023/assets", str(theme_2023_asset))
self.assertIn("themes/2024/assets", str(theme_2024_asset))
def test_rejects_theme_asset_path_traversal(self):
settings.themesSelect = "themes/2024"
with self.assertRaises(HTTPException) as error:
resolve_theme_file("assets", "..", "..", "core", "settings.py")
self.assertEqual(error.exception.status_code, 404)
def test_index_keeps_absolute_asset_urls(self):
settings.themesSelect = "themes/2023"
response = asyncio.run(index())
html = response.body.decode("utf-8")
self.assertIn('src="/assets/', html)
self.assertIn('href="/assets/', html)