Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(api): list only safe local material files

Rudy Celeklie132df7569c0
diff --git a/app/controllers/v1/video.py b/app/controllers/v1/video.py
index 4617b96c..592d2e11 100644
--- a/app/controllers/v1/video.py
+++ b/app/controllers/v1/video.py
@@ -1,4 +1,3 @@
-import glob
import os
import pathlib
import shutil
@@ -416,29 +415,32 @@ def upload_bgm_file(request: Request, file: UploadFile = File(...)):
"/video_materials", response_model=VideoMaterialRetrieveResponse, summary="Retrieve local video materials"
)
def get_video_materials_list(request: Request):
- allowed_suffixes = tuple(
- extension.removeprefix(".")
- for extension in material_upload_service.SUPPORTED_MATERIAL_EXTENSIONS
- )
+ allowed_suffixes = material_upload_service.SUPPORTED_MATERIAL_EXTENSIONS
local_videos_dir = utils.storage_dir("local_videos", create=True)
- files = []
- for suffix in allowed_suffixes:
- files.extend(glob.glob(os.path.join(local_videos_dir, f"*.{suffix}")))
- # 文件系统枚举顺序不稳定,直接返回会导致“顺序拼接”在不同机器或不同
- # 时刻表现不一致。这里统一按文件名排序,至少保证服务端返回顺序可预测。
- files.sort(key=lambda file_path: os.path.basename(file_path).lower())
video_materials_list = []
- for file in files:
- filename = os.path.basename(file)
- video_materials_list.append(
- {
- "name": filename,
- "size": os.path.getsize(file),
- # 与 BGM 一样,只返回文件名;创建任务时再在 local_videos
- # 白名单目录内解析,避免 API 泄露宿主机绝对路径。
- "file": filename,
- }
- )
+ with os.scandir(local_videos_dir) as entries:
+ for entry in entries:
+ if (
+ entry.name.startswith(".")
+ or pathlib.Path(entry.name).suffix.lower() not in allowed_suffixes
+ ):
+ continue
+ try:
+ # Do not follow links outside local_videos or list an upload
+ # that disappeared while the directory was being scanned.
+ if not entry.is_file(follow_symlinks=False):
+ continue
+ size = entry.stat(follow_symlinks=False).st_size
+ except OSError as exc:
+ logger.warning(
+ f"skip unavailable local material: name={entry.name}, error={exc}"
+ )
+ continue
+ video_materials_list.append(
+ {"name": entry.name, "size": size, "file": entry.name}
+ )
+ # Keep ordered material selection stable across file systems and runs.
+ video_materials_list.sort(key=lambda item: (item["name"].casefold(), item["name"]))
response = {"files": video_materials_list}
return utils.get_response(200, response)
diff --git a/test/services/test_controller_video.py b/test/services/test_controller_video.py
index f3ee2816..f3b657c0 100644
--- a/test/services/test_controller_video.py
+++ b/test/services/test_controller_video.py
@@ -49,6 +49,43 @@ class TestVideoControllerHelpers(unittest.TestCase):
expected,
)
+ def test_local_material_list_skips_broken_and_external_symlinks(self):
+ """One stale link must not 500 the picker or reveal external file metadata."""
+ with tempfile.TemporaryDirectory() as temp_dir:
+ root = Path(temp_dir)
+ material_dir = root / "materials"
+ material_dir.mkdir()
+ (material_dir / "clip.mp4").write_bytes(b"video")
+ external = root / "private.mp4"
+ external.write_bytes(b"private contents")
+ try:
+ (material_dir / "external.mp4").symlink_to(external)
+ (material_dir / "broken.mp4").symlink_to(root / "missing.mp4")
+ except (OSError, NotImplementedError) as exc:
+ self.skipTest(f"symlinks are unavailable: {exc}")
+
+ with patch.object(
+ video_controller.utils, "storage_dir", return_value=str(material_dir)
+ ):
+ response = video_controller.get_video_materials_list(self._request())
+
+ self.assertEqual(response["data"]["files"], [
+ {"name": "clip.mp4", "size": 5, "file": "clip.mp4"}
+ ])
+
+ def test_local_material_list_includes_supported_uppercase_extensions(self):
+ """Manually copied materials should be listed like uploads on any OS."""
+ with tempfile.TemporaryDirectory() as temp_dir:
+ (Path(temp_dir) / "photo.PNG").write_bytes(b"image")
+ with patch.object(
+ video_controller.utils, "storage_dir", return_value=temp_dir
+ ):
+ response = video_controller.get_video_materials_list(self._request())
+
+ self.assertEqual(response["data"]["files"], [
+ {"name": "photo.PNG", "size": 5, "file": "photo.PNG"}
+ ])
+
def test_fastapi_startup_recovers_interrupted_cross_posts(self):
"""API 进程启动时必须执行一次发布遗留状态恢复。"""
from app.services import task as task_service