feat(tee): KBS 客户端 + 证明结构校验,OCI 打包与真机编排资产入仓
- 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。
This commit is contained in:
1 parent
783761cb26
commit
5dec915185
16 files changed
+2321
-2
No files matched your search
+124
-1
@@ -665,8 +665,10 @@ fn cmd_tee(args: &[String]) -> Result<(), String> {
|
||||
match args.first().map(String::as_str).unwrap_or("") {
|
||||
"paths" => cmd_tee_paths(),
|
||||
"plan" => cmd_tee_plan(&args[1..]),
|
||||
"verify" => cmd_tee_verify(&args[1..]),
|
||||
"kbs-get" => cmd_tee_kbs_get(&args[1..]),
|
||||
_ => Err(String::from(
|
||||
"用法: mpc tee paths | mpc tee plan --node FILE --session-id HEX --pubkey HEX",
|
||||
"用法: mpc tee paths | plan --node FILE | verify --report FILE --platform snp|csv|tdx|optee | kbs-get --endpoint HOST:PORT --repo R --kind K",
|
||||
)),
|
||||
}
|
||||
}
|
||||
@@ -783,6 +785,127 @@ fn cmd_tee_plan(args: &[String]) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn cmd_tee_verify(args: &[String]) -> Result<(), String> {
|
||||
let report_path = parse_flag(args, "--report").ok_or("缺少 --report(证明报告原始字节文件)")?;
|
||||
let report = std::fs::read(report_path).map_err(|e| format!("读报告 {report_path} 失败: {e}"))?;
|
||||
let platform = match parse_flag(args, "--platform").ok_or("缺少 --platform")? {
|
||||
"snp" | "sev-snp" => mpc_tee::PlatformKind::SevSnp,
|
||||
"csv" | "hygon" | "hygon-csv" => mpc_tee::PlatformKind::HygonCsv,
|
||||
"tdx" => mpc_tee::PlatformKind::Tdx,
|
||||
"optee" => mpc_tee::PlatformKind::Optee,
|
||||
other => return Err(format!("--platform {other:?} 只认 snp/csv/tdx/optee")),
|
||||
};
|
||||
let user_data = mpc_tee::platform::parse_hex::<64>(
|
||||
parse_flag(args, "--user-data").ok_or("缺少 --user-data(64 字节 / 128 位十六进制)")?,
|
||||
)
|
||||
.ok_or("user-data 不是 128 位十六进制")?;
|
||||
let cert_chain: Vec<Vec<u8>> = match parse_flag(args, "--certs") {
|
||||
Some(p) => vec![std::fs::read(p).map_err(|e| format!("读证书 {p} 失败: {e}"))?],
|
||||
None => Vec::new(),
|
||||
};
|
||||
let att = mpc_tee::Attestation {
|
||||
platform,
|
||||
user_data,
|
||||
report,
|
||||
cert_chain,
|
||||
};
|
||||
|
||||
let session_id = cli_parse_hex32(parse_flag(args, "--session-id").ok_or("缺少 --session-id")?)?;
|
||||
let site = parse_flag(args, "--site").ok_or("缺少 --site")?.to_string();
|
||||
let pubkey = cli_parse_hex32(parse_flag(args, "--pubkey").ok_or("缺少 --pubkey")?)?;
|
||||
let measurement =
|
||||
cli_parse_hex32(parse_flag(args, "--measurement").ok_or("缺少 --measurement(节点度量)")?)?;
|
||||
let binding = mpc_tee::session::SessionBinding::new(session_id, &site, pubkey, measurement);
|
||||
|
||||
let tcb: u32 = match parse_flag(args, "--tcb") {
|
||||
Some(v) => v.parse().map_err(|_| format!("--tcb {v:?} 不是整数"))?,
|
||||
None => 0,
|
||||
};
|
||||
let min_tcb: u32 = match parse_flag(args, "--min-tcb") {
|
||||
Some(v) => v.parse().map_err(|_| format!("--min-tcb {v:?} 不是整数"))?,
|
||||
None => 0,
|
||||
};
|
||||
let pin = match parse_flag(args, "--pin") {
|
||||
Some(v) => Some(cli_parse_hex32(v)?),
|
||||
None => None,
|
||||
};
|
||||
let verifier: Option<mpc_tee::verify::ExternalVerifier> = match parse_flag(args, "--verifier") {
|
||||
Some(prog) => {
|
||||
let mut v = mpc_tee::verify::ExternalVerifier::new(prog);
|
||||
let mut i = 0;
|
||||
while i < args.len() {
|
||||
if args[i].as_str() == "--verifier-arg" && i + 1 < args.len() {
|
||||
v = v.arg(args[i + 1].clone());
|
||||
i += 2;
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
Some(v)
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
|
||||
let result = mpc_tee::verify::verify_attestation(
|
||||
&att,
|
||||
&binding,
|
||||
platform,
|
||||
tcb,
|
||||
min_tcb,
|
||||
pin.as_ref(),
|
||||
verifier.as_ref().map(|x| x as &dyn mpc_tee::verify::ChipVerifier),
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
|
||||
let chip = match &result.chip {
|
||||
mpc_tee::verify::ChipVerdict::NotVerified => String::from("未验证"),
|
||||
mpc_tee::verify::ChipVerdict::VerifiedBy(n) => format!("已验证({n})"),
|
||||
mpc_tee::verify::ChipVerdict::Failed(_) => String::from("失败"),
|
||||
};
|
||||
let rows: Vec<(&str, report::Cell)> = vec![
|
||||
("structure_ok", report::Cell::txt(result.structure_ok.to_string())),
|
||||
("bound_ok", report::Cell::txt(result.bound_ok.to_string())),
|
||||
("chip", report::Cell::txt(chip)),
|
||||
("verdict", report::Cell::txt(result.verdict.clone())),
|
||||
];
|
||||
report::kv("证明校验结论", &rows);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn cmd_tee_kbs_get(args: &[String]) -> Result<(), String> {
|
||||
let endpoint = parse_flag(args, "--endpoint").ok_or("缺少 --endpoint(host:port,不带 scheme)")?;
|
||||
let repo = parse_flag(args, "--repo").ok_or("缺少 --repo")?.to_string();
|
||||
let kind = parse_flag(args, "--kind").ok_or("缺少 --kind")?.to_string();
|
||||
let token = parse_flag(args, "--token").map(|s| s.to_string());
|
||||
|
||||
let resource = match parse_flag(args, "--session-id") {
|
||||
Some(sid) => {
|
||||
let sid = cli_parse_hex32(sid)?;
|
||||
mpc_tee::kbs::ResourcePath::for_session(&repo, &kind, &sid).map_err(|e| e.to_string())?
|
||||
}
|
||||
None => {
|
||||
let tag = parse_flag(args, "--tag").ok_or("缺少 --tag 或 --session-id")?.to_string();
|
||||
mpc_tee::kbs::ResourcePath::new(repo, kind, tag).map_err(|e| e.to_string())?
|
||||
}
|
||||
};
|
||||
|
||||
let mut client = mpc_tee::kbs::KbsClient::new(endpoint).map_err(|e| e.to_string())?;
|
||||
if let Some(t) = token {
|
||||
client = client.with_token(t);
|
||||
}
|
||||
let bytes = client.get(&resource).map_err(|e| e.to_string())?;
|
||||
match parse_flag(args, "--out") {
|
||||
Some(p) => {
|
||||
std::fs::write(p, &bytes).map_err(|e| format!("写 {p} 失败: {e}"))?;
|
||||
println!("已写入 {p}({} 字节)", bytes.len());
|
||||
}
|
||||
None => {
|
||||
println!("{} 字节: {}", bytes.len(), cli_hex_bytes(&bytes));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn cli_parse_hex32(s: &str) -> Result<[u8; 32], String> {
|
||||
mpc_tee::platform::parse_hex::<32>(s)
|
||||
.ok_or_else(|| format!("{s:?} 不是 64 位十六进制"))
|
||||
|
||||
Reference in new issue
Block a user