- mpc-tee 新增 kbs.rs(最小 HTTP/1.1 KBS 客户端 + fail-closed 校验 + KbsKeySource 替代内置 PSK)、verify.rs(SNP 报告结构解析 + 可插拔外部芯片验签器 + verify_attestation 显式区分「芯片签名未验证」)。 - mpc-cli 新增 mpc tee verify / mpc tee kbs-get 子命令。 - catalog.rs 补 verify/kbs 模块到 TEE 直接调度段并加回归断言(清单铁律)。 - deploy/tee 新增 oci/(分层镜像构建)、kbs/(serve stub)、guest/(init)、real-machine/(跨机双 guest 编排);docs/TEE_OCI_PATH.md 记录 Kata 实测复核(仅 AMD 有、海光无且不支持 CSV,不引入)与 e2b 远程调度接口参考。 - 影响:密钥经 KBS 注入(不再内置明文 PSK),证明结论如实区分结构与芯片验签;远程调度走 OCI digest + 框架选节点,不引入 Kata/e2b 依赖。 - 测试:./tools/ci.sh 四道全绿;mpc-tee 单测 73→86。
128 lines
4.9 KiB
Python
128 lines
4.9 KiB
Python
#!/usr/bin/env python3
|
||
"""真机侧启动器:消费框架原生 qemu argv,只补部署层参数。
|
||
|
||
框架(`mpc tee plan --argv`)负责平台中立且已被真机校正过的启动规格;
|
||
这里只补宿主相关的东西:串口、guest 角色、会话/镜像度量/KBC 参数、
|
||
socket 网卡、NUMA 内存后端。**不覆盖 -machine / -object / -bios / -cpu / -smp**
|
||
—— 那些都是框架能力表的职责,真机差异已经在 2026-11-06 校正过。
|
||
|
||
环境变量(全部由调用方注入,仓库内不落任何凭据或密钥):
|
||
MPC_TEE_MPC_BIN guest 内静态 mpc 二进制在宿主上的路径(默认 mpc)
|
||
MPC_TEE_MANIFEST OCI manifest digest,64 位十六进制(必填)
|
||
MPC_TEE_KBC guest 内 KBC 模式(默认 offline_fs_kbc::null)
|
||
MPC_TEE_MIN_TCB TCB 门槛(默认 3)
|
||
MPC_NETDEV_ARGS role != none 时必填,qemu 网卡参数(socket netdev)
|
||
|
||
用法:run-guest.py NODE_FILE SESSION_ID PUBKEY ROLE [VARIANT]
|
||
兼容 Python 3.6(海光 Anolis 8.10)。
|
||
"""
|
||
import json
|
||
import os
|
||
import shlex
|
||
import subprocess
|
||
import sys
|
||
|
||
HEX = set("0123456789abcdef")
|
||
|
||
|
||
def die(msg):
|
||
sys.stderr.write("run-guest: %s\n" % msg)
|
||
sys.exit(2)
|
||
|
||
|
||
def drop_pair(argv, flag, pred):
|
||
while True:
|
||
for i, a in enumerate(argv):
|
||
if a == flag and i + 1 < len(argv) and pred(argv[i + 1]):
|
||
del argv[i:i + 2]
|
||
break
|
||
else:
|
||
return
|
||
|
||
|
||
def main():
|
||
if len(sys.argv) < 5:
|
||
die("用法: run-guest.py NODE SESSION PUBKEY ROLE [VARIANT]")
|
||
mpc = os.environ.get("MPC_TEE_MPC_BIN", "mpc")
|
||
node_path, sid, pk, role = sys.argv[1:5]
|
||
variant = sys.argv[5] if len(sys.argv) > 5 else None
|
||
manifest = os.environ.get("MPC_TEE_MANIFEST", "").strip().lower()
|
||
kbc = os.environ.get("MPC_TEE_KBC", "offline_fs_kbc::null").strip()
|
||
min_tcb = os.environ.get("MPC_TEE_MIN_TCB", "3")
|
||
|
||
if len(manifest) != 64 or not set(manifest) <= HEX:
|
||
die("MPC_TEE_MANIFEST 必须是 64 位十六进制(由 oci-image.py build 输出)")
|
||
if len(sid) != 64 or not set(sid.lower()) <= HEX:
|
||
die("SESSION_ID 必须是 64 位十六进制")
|
||
if len(pk) != 64 or not set(pk.lower()) <= HEX:
|
||
die("PUBKEY 必须是 64 位十六进制")
|
||
if " " in kbc or not kbc:
|
||
die("MPC_TEE_KBC 不能含空格或为空")
|
||
if role not in ("alice", "bob", "none"):
|
||
die("ROLE 只能是 alice / bob / none")
|
||
|
||
cmd = [mpc, "--report", "json", "tee", "plan", "--node", node_path,
|
||
"--session-id", sid, "--pubkey", pk,
|
||
"--min-tcb", min_tcb, "--argv"]
|
||
if variant:
|
||
cmd += ["--variant", variant]
|
||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
||
universal_newlines=True)
|
||
plan_out, plan_err = p.communicate()
|
||
if p.returncode != 0:
|
||
sys.stderr.write("tee plan 失败 rc=%d\n%s\n%s\n" %
|
||
(p.returncode, plan_out, plan_err))
|
||
sys.exit(2)
|
||
|
||
argv = None
|
||
for line in plan_out.splitlines():
|
||
try:
|
||
obj = json.loads(line)
|
||
except ValueError:
|
||
continue
|
||
for k, v in obj.get("rows", []):
|
||
if k == "argv_json":
|
||
argv = json.loads(v)
|
||
if not argv:
|
||
sys.stderr.write("没拿到 argv_json\n%s" % plan_out)
|
||
sys.exit(2)
|
||
|
||
print("=== framework argv (%d args) ===" % len(argv))
|
||
print(" ".join(argv))
|
||
sys.stdout.flush()
|
||
|
||
# 1) 部署层追加的内核参数:镜像度量与 KBC 由调度侧钉进 guest。
|
||
# framework 原有的 mpc.tee.user_data / site / aa_kbc_params 不动。
|
||
i = argv.index("-append") + 1
|
||
argv[i] += (" console=ttyS0 earlyprintk=serial"
|
||
" mpc.role=%s mpc.tee.session=%s"
|
||
" mpc.tee.manifest=%s mpc.tee.kbs=%s" %
|
||
(role, sid, manifest, kbc))
|
||
|
||
# 2) 真机自带的静态 qemu 没编 slirp,框架给的 user netdev 用不了;
|
||
# 跨 guest 链路改由部署层注入 socket netdev(核心 crate 不写死网络后端)。
|
||
drop_pair(argv, "-netdev", lambda v: v.startswith("user,"))
|
||
drop_pair(argv, "-device",
|
||
lambda v: v.startswith("virtio-net-pci,netdev=mpcnet0"))
|
||
if role == "none":
|
||
print("=== role=none: 自检 guest 不挂网卡 ===")
|
||
else:
|
||
extra = os.environ.get("MPC_NETDEV_ARGS")
|
||
if not extra:
|
||
die("跨 guest 会话需要 MPC_NETDEV_ARGS(部署层注入 socket 网卡)")
|
||
argv += shlex.split(extra)
|
||
print("=== deploy netdev: %s ===" % extra)
|
||
|
||
# 3) 机密 guest 需要显式 NUMA 内存后端;关机即退出 qemu。
|
||
argv += ["-object", "memory-backend-ram,id=dimm1,size=2048M",
|
||
"-numa", "node,memdev=dimm1", "-no-reboot"]
|
||
|
||
print("=== deployed argv (%d args) ===" % len(argv))
|
||
print(" ".join(argv))
|
||
sys.stdout.flush()
|
||
os.execvp(argv[0], argv)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
main()
|