Validate asset pack manifest in dry run
这个提交存在于:
父节点
49fe0208a6
当前提交
0d63feecbf
共有 2 个文件被更改,包括 86 次插入 和 6 次删除
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
|
|
@ -31,34 +32,98 @@ class AssetImportService:
|
|||
raise ApiError(ErrorCode.MEDIA_NOT_FOUND, "asset pack not found", {"uri": package_uri})
|
||||
|
||||
files, total_bytes = _path_file_stats(package_path)
|
||||
manifest_candidates = _manifest_candidates(root, relative, package_path)
|
||||
manifest_summary = _manifest_summary(package_path, manifest_candidates)
|
||||
return {
|
||||
"dry_run": True,
|
||||
"status": "planned",
|
||||
"package_uri": package_uri,
|
||||
"files": files,
|
||||
"bytes": total_bytes,
|
||||
"manifest_candidates": _manifest_candidates(root, relative, package_path),
|
||||
"manifest_candidates": [item["uri"] for item in manifest_candidates],
|
||||
"manifest": manifest_summary,
|
||||
"import_enabled": False,
|
||||
"execution_enabled": False,
|
||||
}
|
||||
|
||||
|
||||
def _manifest_candidates(root: str, relative: Path, package_path: Path) -> list[str]:
|
||||
def _manifest_candidates(root: str, relative: Path, package_path: Path) -> list[dict[str, Any]]:
|
||||
if package_path.is_file():
|
||||
return [_storage_uri(root, relative)] if package_path.name in _MANIFEST_FILENAMES else []
|
||||
return [{"uri": _storage_uri(root, relative), "path": package_path}] if package_path.name in _MANIFEST_FILENAMES else []
|
||||
|
||||
candidates: list[str] = []
|
||||
candidates: list[dict[str, Any]] = []
|
||||
for child in package_path.rglob("*"):
|
||||
if child.is_file() and child.name in _MANIFEST_FILENAMES:
|
||||
child_relative = relative / child.relative_to(package_path)
|
||||
candidates.append(_storage_uri(root, child_relative))
|
||||
return sorted(candidates)
|
||||
candidates.append({"uri": _storage_uri(root, child_relative), "path": child})
|
||||
return sorted(candidates, key=lambda item: item["uri"])
|
||||
|
||||
|
||||
def _manifest_summary(package_path: Path, candidates: list[dict[str, Any]]) -> dict[str, Any]:
|
||||
if not candidates:
|
||||
return {
|
||||
"present": False,
|
||||
"valid": False,
|
||||
"uri": None,
|
||||
"name": None,
|
||||
"version": None,
|
||||
"materials": 0,
|
||||
"styles": 0,
|
||||
"errors": [{"code": "MANIFEST_MISSING", "message": "asset pack manifest was not found"}],
|
||||
}
|
||||
|
||||
selected = candidates[0]
|
||||
try:
|
||||
payload = json.loads(selected["path"].read_text(encoding="utf-8"))
|
||||
except json.JSONDecodeError as exc:
|
||||
return {
|
||||
"present": True,
|
||||
"valid": False,
|
||||
"uri": selected["uri"],
|
||||
"name": None,
|
||||
"version": None,
|
||||
"materials": 0,
|
||||
"styles": 0,
|
||||
"errors": [{"code": "MANIFEST_INVALID_JSON", "message": exc.msg, "line": exc.lineno}],
|
||||
}
|
||||
|
||||
if not isinstance(payload, dict):
|
||||
return {
|
||||
"present": True,
|
||||
"valid": False,
|
||||
"uri": selected["uri"],
|
||||
"name": None,
|
||||
"version": None,
|
||||
"materials": 0,
|
||||
"styles": 0,
|
||||
"errors": [{"code": "MANIFEST_NOT_OBJECT", "message": "asset pack manifest must be a JSON object"}],
|
||||
}
|
||||
|
||||
return {
|
||||
"present": True,
|
||||
"valid": True,
|
||||
"uri": selected["uri"],
|
||||
"name": _optional_text(payload.get("name")),
|
||||
"version": _optional_text(payload.get("version")),
|
||||
"materials": _list_count(payload.get("materials")),
|
||||
"styles": _list_count(payload.get("styles")),
|
||||
"errors": [],
|
||||
}
|
||||
|
||||
|
||||
def _storage_uri(root: str, relative: Path) -> str:
|
||||
return f"storage://{root}/{relative.as_posix()}"
|
||||
|
||||
|
||||
def _optional_text(value: Any) -> str | None:
|
||||
text = str(value or "").strip()
|
||||
return text or None
|
||||
|
||||
|
||||
def _list_count(value: Any) -> int:
|
||||
return len(value) if isinstance(value, list) else 0
|
||||
|
||||
|
||||
def _path_file_stats(path: Path) -> tuple[int, int]:
|
||||
if path.is_file():
|
||||
return 1, path.stat().st_size
|
||||
|
|
|
|||
|
|
@ -687,6 +687,8 @@ database:
|
|||
self.assertTrue(planned["data"]["dry_run"])
|
||||
self.assertEqual(planned["data"]["files"], 2)
|
||||
self.assertIn("storage://materials/pack/manifest.json", planned["data"]["manifest_candidates"])
|
||||
self.assertTrue(planned["data"]["manifest"]["valid"])
|
||||
self.assertEqual(planned["data"]["manifest"]["name"], "demo")
|
||||
self.assertFalse(planned["data"]["import_enabled"])
|
||||
self.assertNotIn(str(self.root), str(planned["data"]))
|
||||
|
||||
|
|
@ -706,6 +708,19 @@ database:
|
|||
self.assertFalse(unsafe["ok"])
|
||||
self.assertEqual(unsafe["error_code"], "VALIDATION_FAILED")
|
||||
|
||||
bad_pack = self.root / "materials" / "bad-pack"
|
||||
bad_pack.mkdir(parents=True, exist_ok=True)
|
||||
(bad_pack / "manifest.json").write_text("{bad json", encoding="utf-8")
|
||||
invalid_manifest = import_asset_pack(
|
||||
self.ctx,
|
||||
{"package_uri": "storage://materials/bad-pack", "dry_run": True},
|
||||
self.asset_import_service,
|
||||
)
|
||||
self.assertTrue(invalid_manifest["ok"])
|
||||
self.assertFalse(invalid_manifest["data"]["manifest"]["valid"])
|
||||
self.assertEqual(invalid_manifest["data"]["manifest"]["errors"][0]["code"], "MANIFEST_INVALID_JSON")
|
||||
self.assertNotIn(str(self.root), str(invalid_manifest["data"]))
|
||||
|
||||
def test_media_signing_rejects_unsafe_or_missing_uri(self):
|
||||
unsafe = sign_media(
|
||||
self.ctx,
|
||||
|
|
|
|||
正在加载…
添加表格
在新工单中引用