Validate asset pack material entries
这个提交存在于:
父节点
28245a47ae
当前提交
6752df16bc
共有 2 个文件被更改,包括 59 次插入 和 2 次删除
|
|
@ -190,15 +190,16 @@ def _manifest_summary(package_path: Path, candidates: list[dict[str, Any]]) -> d
|
||||||
"errors": [{"code": "MANIFEST_NOT_OBJECT", "message": "asset pack manifest must be a JSON object"}],
|
"errors": [{"code": "MANIFEST_NOT_OBJECT", "message": "asset pack manifest must be a JSON object"}],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
errors = _manifest_entry_errors(payload)
|
||||||
return {
|
return {
|
||||||
"present": True,
|
"present": True,
|
||||||
"valid": True,
|
"valid": not errors,
|
||||||
"uri": selected["uri"],
|
"uri": selected["uri"],
|
||||||
"name": _optional_text(payload.get("name")),
|
"name": _optional_text(payload.get("name")),
|
||||||
"version": _optional_text(payload.get("version")),
|
"version": _optional_text(payload.get("version")),
|
||||||
"materials": _list_count(payload.get("materials")),
|
"materials": _list_count(payload.get("materials")),
|
||||||
"styles": _list_count(payload.get("styles")),
|
"styles": _list_count(payload.get("styles")),
|
||||||
"errors": [],
|
"errors": errors,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -209,6 +210,40 @@ def _load_manifest_payload(path: Path) -> dict[str, Any]:
|
||||||
return payload
|
return payload
|
||||||
|
|
||||||
|
|
||||||
|
def _manifest_entry_errors(payload: dict[str, Any]) -> list[dict[str, Any]]:
|
||||||
|
errors: list[dict[str, Any]] = []
|
||||||
|
materials = payload.get("materials")
|
||||||
|
if materials is not None and not isinstance(materials, list):
|
||||||
|
errors.append(
|
||||||
|
{
|
||||||
|
"code": "MATERIALS_NOT_LIST",
|
||||||
|
"message": "asset pack materials must be a list",
|
||||||
|
"field": "materials",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return errors
|
||||||
|
for index, item in enumerate(materials or []):
|
||||||
|
field = f"materials[{index}]"
|
||||||
|
if not isinstance(item, dict):
|
||||||
|
errors.append(
|
||||||
|
{
|
||||||
|
"code": "MATERIAL_ENTRY_NOT_OBJECT",
|
||||||
|
"message": "asset pack material entries must be objects",
|
||||||
|
"field": field,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
if not _optional_text(item.get("image_uri") or item.get("uri") or item.get("image") or item.get("file")):
|
||||||
|
errors.append(
|
||||||
|
{
|
||||||
|
"code": "MATERIAL_IMAGE_MISSING",
|
||||||
|
"message": "asset pack material entry must include image_uri, uri, image, or file",
|
||||||
|
"field": f"{field}.image_uri",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return errors
|
||||||
|
|
||||||
|
|
||||||
def _material_payload_from_manifest_item(
|
def _material_payload_from_manifest_item(
|
||||||
item: dict[str, Any],
|
item: dict[str, Any],
|
||||||
*,
|
*,
|
||||||
|
|
|
||||||
|
|
@ -790,6 +790,28 @@ database:
|
||||||
self.assertFalse(invalid_execution["ok"])
|
self.assertFalse(invalid_execution["ok"])
|
||||||
self.assertEqual(invalid_execution["error_code"], "VALIDATION_FAILED")
|
self.assertEqual(invalid_execution["error_code"], "VALIDATION_FAILED")
|
||||||
|
|
||||||
|
missing_image_pack = self.root / "materials" / "missing-image-pack"
|
||||||
|
missing_image_pack.mkdir(parents=True, exist_ok=True)
|
||||||
|
(missing_image_pack / "manifest.json").write_text(
|
||||||
|
'{"name":"missing image","materials":[{"name":"hat"}]}',
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
|
missing_image = import_asset_pack(
|
||||||
|
self.ctx,
|
||||||
|
{"package_uri": "storage://materials/missing-image-pack", "dry_run": True},
|
||||||
|
self.asset_import_service,
|
||||||
|
)
|
||||||
|
self.assertTrue(missing_image["ok"])
|
||||||
|
self.assertFalse(missing_image["data"]["manifest"]["valid"])
|
||||||
|
self.assertEqual(missing_image["data"]["manifest"]["errors"][0]["code"], "MATERIAL_IMAGE_MISSING")
|
||||||
|
missing_image_execution = import_asset_pack(
|
||||||
|
self.ctx,
|
||||||
|
{"package_uri": "storage://materials/missing-image-pack", "dry_run": False},
|
||||||
|
self.asset_import_service,
|
||||||
|
)
|
||||||
|
self.assertFalse(missing_image_execution["ok"])
|
||||||
|
self.assertEqual(missing_image_execution["error_code"], "VALIDATION_FAILED")
|
||||||
|
|
||||||
def test_media_signing_rejects_unsafe_or_missing_uri(self):
|
def test_media_signing_rejects_unsafe_or_missing_uri(self):
|
||||||
unsafe = sign_media(
|
unsafe = sign_media(
|
||||||
self.ctx,
|
self.ctx,
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用