S74 单流程输出安全加固
这个提交存在于:
父节点
d0daedfeb8
当前提交
0375be1555
共有 2 个文件被更改,包括 61 次插入 和 2 次删除
|
|
@ -3,6 +3,7 @@
|
|||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import re
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
|
@ -39,10 +40,11 @@ class SingleFlowEngine:
|
|||
model_route = str(request.get("model_route") or node.model_route or "image_low")
|
||||
width, height = _dimensions(str(request.get("aspect_ratio") or "1:1"))
|
||||
assets: list[MockGeneratedAsset] = []
|
||||
task_stem = _safe_file_stem(task.task_id)
|
||||
for index in range(count):
|
||||
seed = int(request.get("seed") or 1000 + index)
|
||||
image_uri = f"storage://images/single/{task.task_id}_{index + 1}.png"
|
||||
thumbnail_uri = f"storage://thumbnails/single/{task.task_id}_{index + 1}.png"
|
||||
image_uri = f"storage://images/single/{task_stem}_{index + 1}.png"
|
||||
thumbnail_uri = f"storage://thumbnails/single/{task_stem}_{index + 1}.png"
|
||||
self._write_png(image_uri)
|
||||
self._write_png(thumbnail_uri)
|
||||
assets.append(
|
||||
|
|
@ -90,3 +92,8 @@ def _dimensions(aspect_ratio: str) -> tuple[int, int]:
|
|||
if aspect_ratio == "16:9":
|
||||
return 1280, 720
|
||||
return 1024, 1024
|
||||
|
||||
|
||||
def _safe_file_stem(value: str) -> str:
|
||||
stem = re.sub(r"[^A-Za-z0-9_-]+", "_", str(value or "").strip()).strip("_")
|
||||
return stem or "task"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ from pathlib import Path
|
|||
|
||||
from backend.routes.node_routes import generate_node
|
||||
from backend.dto.common import ApiError, ErrorCode
|
||||
from backend.dto.job_dto import GenerationTask
|
||||
from backend.dto.workflow_dto import WorkflowNode
|
||||
from backend.services.generation_service import GenerationService
|
||||
from backend.services.image_service import ImageService
|
||||
from backend.services.profile_service import ProfileService
|
||||
|
|
@ -156,6 +158,56 @@ storage:
|
|||
self.assertEqual(len(self.image_service.list_by_node(node_id)), 2)
|
||||
self.assertEqual(len(self.event_bus.history("generation.node_queued")), 1)
|
||||
|
||||
def test_single_flow_engine_keeps_mock_outputs_vfs_safe(self):
|
||||
node = WorkflowNode(
|
||||
node_id="node_001",
|
||||
workflow_id="workflow_001",
|
||||
node_key="single",
|
||||
title="Single",
|
||||
description=None,
|
||||
step_name=None,
|
||||
node_type="single_image",
|
||||
status="running",
|
||||
branch_name="main",
|
||||
prompt="portrait",
|
||||
negative_prompt=None,
|
||||
model_route="image_low",
|
||||
selected_image_id=None,
|
||||
sort_order=1,
|
||||
metadata={},
|
||||
created_at="2026-01-01T00:00:00Z",
|
||||
updated_at="2026-01-01T00:00:00Z",
|
||||
)
|
||||
task = GenerationTask(
|
||||
task_id="task:../unsafe\\id",
|
||||
profile_id="profile_001",
|
||||
workflow_id="workflow_001",
|
||||
node_id="node_001",
|
||||
task_type="generate",
|
||||
status="running",
|
||||
model_route="image_low",
|
||||
progress=20,
|
||||
idempotency_key=None,
|
||||
request={},
|
||||
result={},
|
||||
error_message=None,
|
||||
metadata={},
|
||||
created_at="2026-01-01T00:00:00Z",
|
||||
updated_at="2026-01-01T00:00:00Z",
|
||||
)
|
||||
|
||||
assets = self.generation_service.single_flow_engine.generate(node, task, {"count": 1})
|
||||
|
||||
self.assertEqual(len(assets), 1)
|
||||
asset = assets[0]
|
||||
self.assertEqual(asset.image_uri, "storage://images/single/task_unsafe_id_1.png")
|
||||
self.assertEqual(asset.thumbnail_uri, "storage://thumbnails/single/task_unsafe_id_1.png")
|
||||
self.assertTrue(VfsStorage(self.config_service).ensure_file(asset.image_uri).exists())
|
||||
self.assertTrue(VfsStorage(self.config_service).ensure_file(asset.thumbnail_uri).exists())
|
||||
serialized = asset.__dict__
|
||||
self.assertFalse(any(":\\" in str(value) or str(self.root) in str(value) for value in serialized.values()))
|
||||
self.assertNotIn("local_path", asset.metadata)
|
||||
|
||||
def test_queue_service_rejects_invalid_task_transition(self):
|
||||
task = self.queue_service.create_task({"status": "succeeded"}, self.ctx)
|
||||
|
||||
|
|
|
|||
正在加载…
添加表格
在新工单中引用