feat(studio-3d): 阶段 5 —— 发布保护（签名/可选加密/平台锁定）与性能长时报告
- What: 新增 `scene3d/protect.py`（封套 v2：Ed25519 签名 + 可选 AES-256-GCM，nonce/salt 每包唯一、 元数据作 AAD、明文摘要进签名、KeyProvider 只问 get_content_key）与 `record/visualization3d.py` （session.json 的 visualization3d 块：写入版本化、读取时缺块=不支持）；`package.py` 支持 v2 （payload=plain 仅签名 / aes-gcm 签名+加密）并继续读 v1，新增解压比上限与"写入后自读回"校验； `contracts.py` 新增 PlatformLock/PlatformInfo/check_platform_lock、Sealing、platform_mismatch 诊断码； `Scene3DView` 在装配前查 OS/架构、拿到 capabilities 后查图形半区，违反即撤下场景并在面板显示原因； 工具 `compile_scene.py` 新增 --sign-key/--write-verify-key/--encrypt-key-id/--key-file/--lock-from-probe， `validate_scene.py` 新增 --key-file/--key-id/--verify-key/--require-signature（发布门禁）， 新增 `bench_scene.py`（p50/p95 分阶段 + --cpu-only + --vertices N + --package）与 `soak_scene.py`（RSS 四分位速率 + 队列上界 + 抽稀采样）；两份报告落到 docs/architecture/。 - Why: 规格 §5.2 的保护目标是"提高复制成本"而不是"防提取"，所以要的是签名（来源）+ 可选认证加密（机密性） + 密钥隔离，而不是自制加密或把 ZIP 当加密；§12 的"包保护/性能/长时"三行需要可复现的数字与判定标准， 而不是一次性的观感。平台锁定还必须只降级三维：锁定不通过时二维照常。 - Verification: shared 全量通过（新增 test_scene3d_protect.py 35 项：封套往返/篡改/密钥/锁定/记录块/ compile→validate 端到端发布流程；test_scene3d_package.py 20 项含 v1↔v2 兼容）；apps/studio 全量通过 （test_scene3d_view.py 30 项含锁定拒绝与 session.json 块）；ui_check 566 项 0 失败；locale_check 0 缺失； 真实资产端到端：1032 顶点编译出 signed+sealed+locked 包（56 927 B 密文），validate --require-signature 退出 0， 改一个字节退出 2；性能报告（perf-report-windows-dev.json）：1032 顶点 compose p50 0.50 ms（30 fps 上限内）， 20022 顶点/39480 三角形 compose p50 6.15 ms（约 33 ms 帧的 18%），采集线程 submit p95 < 0.4 ms（合成器被人为放慢到 50 ms）； 长时报告（soak-report-windows-dev.json）：无窗口 10 min/60 fps 尾段 0.354 MB/min，GUI 4 min/30 fps 尾段 0.809 MB/min， 队列上界（mailbox=1、单飞行合成）两者均成立。过程中修掉：GUI 进程里的合成器计时被 GIL/vsync 污染（98.8 ms vs 真值 6.1 ms）、 跨线程读 last_stats 撕裂、key id 无 provider 时会静默写明文包、soak 工具自身记时间列表会无界增长、RSS 读取失败伪装成零增长、 平台锁定不是终态诊断。 - Not in this change: ARM 板卡的能力报告与 2 小时门禁运行（按用户要求暂缓；命令与判定标准已写入阶段 5 文档）； GPU 显存随时间的测量（无可移植 API，报告说明渲染器缓冲估计恒定且更新路径不新建 GPU 对象）； `cryptography` 在此环境无法联网安装，本机验收用的是本机已有的 cp310 构建（pyproject 里已声明为可选 extra `protected-assets`）。
This commit is contained in:
ykcheungab
@@ -291,11 +291,11 @@ def test_an_envelope_from_the_future_or_another_tool_is_refused(package, tmp_pat
|
||||
assert "envelope version" in excinfo.value.diagnostic.message
|
||||
|
||||
|
||||
def test_an_encrypted_envelope_says_so_instead_of_failing_obscurely(package, tmp_path):
|
||||
"""Stage 5 will open these; until then the message has to be honest."""
|
||||
def test_an_envelope_that_claims_an_unknown_payload_kind_is_refused(package, tmp_path):
|
||||
"""An unknown payload is a refusal with its own reason, not a numpy error later."""
|
||||
def encrypt(members):
|
||||
envelope = json.loads(members["envelope.json"])
|
||||
envelope["payload"] = "aead"
|
||||
envelope["payload"] = "rot13"
|
||||
envelope["key_id"] = "customer-1"
|
||||
members["envelope.json"] = json.dumps(envelope).encode()
|
||||
return members
|
||||
@@ -305,20 +305,66 @@ def test_an_encrypted_envelope_says_so_instead_of_failing_obscurely(package, tmp
|
||||
read_package(broken)
|
||||
item = excinfo.value.diagnostic
|
||||
assert item.code == "asset_auth_failed"
|
||||
assert "plain packages only" in item.message
|
||||
assert "rot13" in item.message
|
||||
|
||||
|
||||
def test_a_key_provider_is_refused_while_packages_are_plain(package, scene):
|
||||
def test_an_encrypted_payload_needs_a_key_provider_and_a_verification_key(scene, tmp_path):
|
||||
"""The two ways a sealed package can be unreadable here, named separately.
|
||||
|
||||
Both are *licensing* states, not corruption: the message has to let an operator
|
||||
tell "this machine has no key for it" from "these bytes were changed".
|
||||
"""
|
||||
crypto = pytest.importorskip(
|
||||
"cryptography", reason="sealing needs the crypto backend"
|
||||
)
|
||||
del crypto
|
||||
from orisys_app_shared.scene3d.contracts import Sealing
|
||||
from orisys_app_shared.scene3d import protect as protect_module
|
||||
|
||||
private = protect_module.generate_signing_key()
|
||||
public = protect_module.public_key_pem(private)
|
||||
provider = protect_module.MappingKeyProvider({"customer-1": "11" * 32})
|
||||
sealed = tmp_path / "sealed.oryscene"
|
||||
write_package(
|
||||
scene,
|
||||
sealed,
|
||||
sealing=Sealing(
|
||||
key_id="customer-1",
|
||||
provider=provider,
|
||||
signing_key_pem=private,
|
||||
signing_key_reference="build-key",
|
||||
verify_key_pem=public,
|
||||
),
|
||||
)
|
||||
|
||||
with pytest.raises(ThreeDError) as no_key:
|
||||
read_package(sealed, verify_key_pem=public)
|
||||
assert "key provider" in no_key.value.diagnostic.message
|
||||
|
||||
with pytest.raises(ThreeDError) as no_verify:
|
||||
read_package(sealed, keys=provider)
|
||||
assert "verification key" in no_verify.value.diagnostic.message
|
||||
|
||||
contents = read_package(sealed, keys=provider, verify_key_pem=public)
|
||||
assert contents.arrays["sensing/positions.npy"].shape[0] > 0
|
||||
|
||||
|
||||
def test_a_key_provider_is_unused_by_a_plain_package(package, scene):
|
||||
"""A provider is not an error on a plain package: it is simply not needed.
|
||||
|
||||
Refusing here would break the one call site that hands the same provider to every
|
||||
load, which is how a client with a mix of sealed and plain packages is written.
|
||||
"""
|
||||
|
||||
class Keys:
|
||||
def get_content_key(self, key_id: str) -> bytes: # pragma: no cover - not used
|
||||
return b"secret"
|
||||
raise AssertionError("a plain package must not ask for a key")
|
||||
|
||||
expected = ExpectedGeometry(
|
||||
"finger", "rev-a", scene.geometry_id, scene.field_domain_id, scene.shape_hw
|
||||
)
|
||||
with pytest.raises(ThreeDError) as excinfo:
|
||||
PackagedAssetLoader().load(package, expected, Keys())
|
||||
assert "key provider" in excinfo.value.diagnostic.message
|
||||
assets = PackagedAssetLoader().load(package, expected, Keys())
|
||||
assert assets.geometry_id == scene.geometry_id
|
||||
|
||||
|
||||
def test_the_manifest_carries_what_a_release_needs(package):
|
||||
@@ -364,6 +410,9 @@ def test_the_envelope_names_the_magic_and_the_payload_state(package):
|
||||
with zipfile.ZipFile(package) as archive:
|
||||
envelope = json.loads(archive.read("envelope.json"))
|
||||
assert envelope["magic"] == MAGIC
|
||||
# An unsealed write stays at version 1: it is the package every release before
|
||||
# stage 5 produced, and bumping it would make old readers refuse a plain file.
|
||||
assert envelope["envelope_version"] == 1
|
||||
assert envelope["payload"] == "plain"
|
||||
assert envelope["entry_count"] == len(read_package(package).arrays)
|
||||
assert "signature" not in envelope, "a plain package must not look signed"
|
||||
|
||||
Reference in New Issue
Block a user