xiaoxia/xiaoxia-saas

fix: 封面选帧输入源改为最终成片，预览片段作为兼容回退 #1534

Merged

xiaoxia merged 7 commits from fix/cover-from-final-video into develop

2026-08-29 01:19:02 +08:00

Author	SHA1	Message	Date
CI Bot	f9d243a5af	style: auto-format with black + isort + prettier [skip ci-format-check] CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 3m51s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 4m22s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 4m52s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 5m21s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m43s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details AI Code Review / AI Code Review (pull_request) Successful in 6m18s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m16s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 7m6s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m4s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 5m6s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 10m24s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 6m20s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 32s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 3m41s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 5m15s Details	2026-08-28 16:59:07 +00:00
xiaoxia	cf7e295f35	fix: SSRF 内网判定改用 ipaddress 标准库，覆盖全部 IPv4/IPv6 私有段 CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 3m20s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 3m30s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 3m19s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 2m48s Details AI Code Review / AI Code Review (pull_request) Failing after 3m31s Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m1s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build API Image (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details Preview Deploy / Deploy Preview Environment (pull_request) Has been cancelled Details AI Code Review 第三轮指出：IPv6 链路本地地址使用字符串前缀匹配（fe80/fe90/...）不严谨且易漏。修复：新增 _is_private_or_reserved_host()，统一用标准库 ipaddress.ip_address().is_private/is_loopback/is_link_local/ is_reserved 判定，一次性准确覆盖： - IPv4: 10/8、172.16/12、192.168/16、127/8、169.254/16、0.0.0.0 - IPv6: ::1、fc00::/7(ULA)、fe80::/10(链路本地)、保留段删除手工字符串切片逻辑，可读性和正确性都更好。 36 个测试全部通过。	2026-08-29 00:49:11 +08:00
xiaoxia	bde37af2bb	fix: SSRF 白名单加固 — 修复 endpoint 解析绕过 + 补充 IPv6 内网拦截 CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 4m7s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 4m45s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 4m52s Details AI Code Review / AI Code Review (pull_request) Failing after 5m18s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 5m24s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m27s Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 8m9s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build API Image (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details AI Code Review 第二轮指出的两个阻塞问题： 1. endpoint 主机名解析绕过：原逻辑 ep.split(':')[0] 在 endpoint 带 scheme（http://host:9000）时取到 'http'，虽白名单顺序使 public_url 先生效，但 endpoint 分支可能错误匹配 '.http' 后缀。修复：新增 _endpoint_host() 统一用 urlparse 提取主机名，兼容有无 scheme、带端口等各种配置形式。 2. 缺失 IPv6 内网地址校验：[::1]、fe80::/10（链路本地）、 fc00::/7（唯一本地）等 IPv6 本地地址未拦截。修复：补充 IPv6 回环/链路本地/ULA 地址显式拒绝。附带： - 移除函数内重复的 urlparse 导入，统一使用顶部导入 - 新增 2 个白名单单元测试（IPv4/IPv6/元数据拦截 + scheme 解析） - 共 36 个测试全部通过	2026-08-29 00:39:05 +08:00
CI Bot	e5e18ef269	style: auto-format with black + isort + prettier [skip ci-format-check] CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 3m41s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 4m0s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 4m1s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m5s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 5m54s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 7m1s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details AI Code Review / AI Code Review (pull_request) Failing after 8m22s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 8m41s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m33s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m34s Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details	2026-08-28 16:27:56 +00:00
xiaoxia	3b828ab184	fix: 封面选帧接口安全加固 — 权限校验防绕过 + video_url SSRF 白名单 CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2m31s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m35s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 3m55s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 4m4s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m56s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 4m31s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m3s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details AI Code Review / AI Code Review (pull_request) Has been cancelled Details PR Automation / Auto Approve on CI Green (pull_request) Has been cancelled Details AI Code Review 指出的两个阻塞问题： 1. 权限校验绕过（步骤0a）：原逻辑仅在关联任务存在且 created_by_user_id 非空时才校验归属；若 GeneratedVideo 的 generation_task_id 为空或关联任务被删除，校验被静默跳过。修复： - 优先校验 GeneratedVideo.user_id 直接归属 - 关联任务存在时校验 task.created_by_user_id - video 无 owner 且关联任务也查不到（归属无法确认）→ 403，不再静默放行 2. video_url SSRF（步骤0b）：原逻辑直接使用请求体传入的 URL，攻击者可传入内网/云元数据地址诱导服务端请求。修复：新增 _is_trusted_media_url() 白名单校验： - 仅允许 http/https 且主机为自家 OSS bucket/endpoint 域名 - 显式拒绝 localhost/127./10./192.168./169.254./172.16-31.* - 校验失败静默忽略该 URL，回退后续查找链附带改进（review 建议项）： - 函数内联 import 全部移至模块顶部（storage/re） - 新增 2 个安全测试：SSRF 内网地址拦截、归属无法确认 403 - 现有 32 个测试适配新的 mock 命名空间，共 34 个测试全过	2026-08-29 00:21:49 +08:00
CI Bot	b6f211ebe6	style: auto-format with black + isort + prettier [skip ci-format-check] CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2m31s Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 3m18s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m57s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m16s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m53s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 35s Details AI Code Review / AI Code Review (pull_request) Failing after 7m15s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 11m22s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 12m31s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 28m3s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 25m1s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 4m50s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 31s Details	2026-08-28 15:35:01 +00:00
xiaoxia	3e71a00b12	fix: 封面选帧输入源改为最终成片，预览片段作为兼容回退 CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1m37s Details AI Code Review / AI Code Review (pull_request) Failing after 3m22s Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m40s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m30s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m38s Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 53s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m19s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 11m47s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 13m51s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details - GenerateCoverRequest 新增可选字段 generated_video_id / video_url，与前端 PR #1533 契约对齐：前端在「选择封面」步骤传入确认生成产出的最终视频 ID 或 URL，后端据此定位最终成片文件并抽帧 - 视频源查找优先级调整： 0a. 请求体 generated_video_id → GeneratedVideo.file_url 0b. 请求体 video_url → 直接使用 1. plan.config.rendered_storage_key 2. plan.config.generation_task_id 3. source_edit_plan 关联的 is_preview=False 已完成任务（最终成片优先） 4. source_edit_plan 关联的 is_preview=True 预览任务（回退） 5. user+template 最近预览任务（兜底） - cover_url 查找同步调整：优先最终成片任务的 cover_url，再回退预览 - MediaKit 的 strategy/max_frames/轮询/重试/降级逻辑全部不变 - 权限校验：通过 generated_video_id 关联的 generation_task 校验归属 - 新增 5 个单测覆盖：schema 字段、video_id 抽帧、video_url 抽帧、最终成片优先于预览、权限校验 403	2026-08-28 23:13:18 +08:00