feat(opa): 链上撤销状态位读取落契约,未接入即 fail-closed 拒
- opa.rs 新增 RevocationViewSource{CallerSupplied,ChainRead} + ChainRevocationReader
+ UnconfiguredRevocationReader + resolve_revocation;decide 撤销来源二选一
- 链读后端未接入时声明 chain 必拒(REVOCATION_CHAIN_UNVERIFIED),
绝不默认 revoked=false 放行;撤销仍 fail-closed 且无缓存
- CLI 支持 --revocation chain,输出区分 chain-read / 本地桩两种来源标注
- 第 17 条判据扩到 41 真闭环 + 22 零依赖,新增链读 fail-closed 负向
- CLAUDE.md / INTEGRATION_ANALYSIS.md / MEMORY.md 同步撤销来源与诚实边界
This commit is contained in:
1 parent
d6330862d9
commit
ccf74fc3cd
7 files changed
+172
-26
No files matched your search
@@ -249,9 +249,12 @@ SM2 签名走系统 OpenSSL 的 EVP 接口(`openssl` crate 链接系统库,
|
||||
`opa build` 产物做 SM2 真签 + SM3 hash pin,真 `opa eval` 判定,decision 幂等落
|
||||
outbox。★ `undefined` 输出(`{}`)必须拒绝,**不许当默认 deny**(策略没加载 ≠
|
||||
策略拒绝);input 缺 `source` 在调 OPA **之前**拒;合规判定 fail-closed 且**无缓存**;
|
||||
撤销视图每次显式给、新鲜度有 TTL。★ 诚实边界:OPA 跑在宿主/控制面**不在 guest
|
||||
内**,撤销视图是本地桩(链上状态位读取未落地),decision 未签名未上链。
|
||||
第 17 条 40 判据 + 18 条零依赖自测,成功也只输出 `OPA_GUEST_NOT_VERIFIED` /
|
||||
撤销来源分两类:调用方本地桩(每次显式给、新鲜度有 TTL)或 `--revocation chain`
|
||||
声明走链上撤销状态位读取(`ChainRevocationReader` + `UnconfiguredRevocationReader`)。
|
||||
★ 链读后端**未接入 ⇒ 声明 chain 即 fail-closed 拒**(`REVOCATION_CHAIN_UNVERIFIED`),
|
||||
**绝不默认 `revoked=false` 放行**。★ 诚实边界:OPA 跑在宿主/控制面**不在 guest
|
||||
内**,撤销链读后端未接入,decision 未签名未上链。
|
||||
第 17 条 41 判据 + 22 条零依赖自测,成功也只输出 `OPA_GUEST_NOT_VERIFIED` /
|
||||
`CHAIN_NOT_VERIFIED`。软件签名器生产策略仍必拒。
|
||||
|
||||
**★ `mpc` 二进制有两种 profile,别混**(2026-11-07):`mpc-cli` 同时是宿主 CLI
|
||||
|
||||
@@ -331,6 +331,65 @@ impl RevocationView {
|
||||
}
|
||||
}
|
||||
|
||||
/// 撤销来源。**本轮把「链上状态位读取」作为一等 source 落进来**,与调用方
|
||||
/// 本地桩分离:调用方本地桩仍是显式来源,但框架现在也认 `ChainRead`
|
||||
/// —— 从链上 `PolicyBundleRecord.revoked` 读取撤销状态位。
|
||||
///
|
||||
/// ★ 诚实边界:当前链读后端是 `UnconfiguredRevocationReader`,链端点未接入,
|
||||
/// 所以 `ChainRead` 必然 `NotConfigured` 拒(**绝不返回 `revoked=false`
|
||||
/// 假装没被撤销**)。真链接入后换成 `ChainRevocationReader` 的已配置实现,
|
||||
/// 判定逻辑不变。
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum RevocationViewSource {
|
||||
/// 调用方每次显式提供本地桩(无链环境 / 测试用)。
|
||||
CallerSupplied(RevocationView),
|
||||
/// 从链上读取撤销状态位。当前后端未接入 → fail-closed 拒。
|
||||
ChainRead,
|
||||
}
|
||||
|
||||
/// 链上撤销状态位读取契约。`PolicyBundleRecord` 已携带 `revoked`,本 trait
|
||||
/// 是「按 bundle 查它是否被链上撤销」的唯一抽象,便于以后接真链实现。
|
||||
pub trait ChainRevocationReader {
|
||||
fn read_revocation(&self, bundle_id: &str) -> Result<bool, ChainError>;
|
||||
}
|
||||
|
||||
/// 当前真实后端:链端点未接入。**任何读取都 fail-closed 拒**,不留
|
||||
/// 「默认没撤销」的退路(那等于在撤销生效后继续放宽)。
|
||||
pub struct UnconfiguredRevocationReader;
|
||||
|
||||
impl ChainRevocationReader for UnconfiguredRevocationReader {
|
||||
fn read_revocation(&self, _bundle_id: &str) -> Result<bool, ChainError> {
|
||||
Err(ChainError::NotConfigured(String::from(
|
||||
"链上撤销状态位读取未接入,撤销未验证 = 拒绝判定 (REVOCATION_CHAIN_UNVERIFIED)",
|
||||
)))
|
||||
}
|
||||
}
|
||||
|
||||
/// 把撤销来源解析成这一次判定要用的 `RevocationView`。
|
||||
///
|
||||
/// - `CallerSupplied` 直接用调用方给的视图(后续 `validate` 仍跑);
|
||||
/// - `ChainRead` 调 reader 真读链上状态位;reader 未接入时返回
|
||||
/// `NotConfigured`,**不会**降级成 `revoked=false`。`checked_at` 用本次
|
||||
/// `now`,因为是「本次查询」。
|
||||
pub fn resolve_revocation(
|
||||
source: &RevocationViewSource,
|
||||
expected_bundle_id: &str,
|
||||
now: u64,
|
||||
reader: &dyn ChainRevocationReader,
|
||||
) -> Result<RevocationView, ChainError> {
|
||||
match source {
|
||||
RevocationViewSource::CallerSupplied(v) => Ok(v.clone()),
|
||||
RevocationViewSource::ChainRead => {
|
||||
let revoked = reader.read_revocation(expected_bundle_id)?;
|
||||
Ok(RevocationView {
|
||||
bundle_id: String::from(expected_bundle_id),
|
||||
revoked,
|
||||
checked_at: now,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 每条 input 必须有非空 `source`。**在调 OPA 之前**做,
|
||||
/// 不靠 Rego 里的 `default allow = false` 兜底 —— 那是策略的事,
|
||||
/// 框架的硬要求必须在框架里判。
|
||||
@@ -535,7 +594,7 @@ impl Decision {
|
||||
|
||||
pub struct DecideRequest<'a> {
|
||||
pub manifest_text: &'a str,
|
||||
pub revocation_text: &'a str,
|
||||
pub revocation: RevocationViewSource,
|
||||
pub bundle_path: &'a Path,
|
||||
pub input_path: &'a Path,
|
||||
pub query: &'a str,
|
||||
@@ -557,7 +616,9 @@ pub fn decide(req: &DecideRequest<'_>) -> Result<Decision, ChainError> {
|
||||
manifest.expires_at, req.now
|
||||
)));
|
||||
}
|
||||
let rev = RevocationView::from_json(req.revocation_text)?;
|
||||
// 3:撤销来源解析(链读未接入时 fail-closed 拒,绝不默认 revoked=false)
|
||||
let revocation_reader = UnconfiguredRevocationReader;
|
||||
let rev = resolve_revocation(&req.revocation, &manifest.bundle_id, req.now, &revocation_reader)?;
|
||||
rev.validate(&manifest.bundle_id, req.now)?; // 3
|
||||
|
||||
let input_text = std::fs::read_to_string(req.input_path)
|
||||
@@ -653,6 +714,34 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn chain_read_revocation_is_fail_closed_when_unconfigured() {
|
||||
let src = RevocationViewSource::ChainRead;
|
||||
let reader = UnconfiguredRevocationReader;
|
||||
match resolve_revocation(&src, "b1", 110, &reader) {
|
||||
Err(ChainError::NotConfigured(m)) => {
|
||||
assert!(m.contains("REVOCATION_CHAIN_UNVERIFIED"), "必须点名未接入: {m}")
|
||||
}
|
||||
other => panic!(
|
||||
"链读未接入必须 fail-closed 拒,不能返回 revoked=false,得到 {other:?}"
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn caller_supplied_revocation_still_resolves_and_validates() {
|
||||
let v = RevocationView {
|
||||
bundle_id: String::from("b1"),
|
||||
revoked: false,
|
||||
checked_at: 100,
|
||||
};
|
||||
let src = RevocationViewSource::CallerSupplied(v);
|
||||
let reader = UnconfiguredRevocationReader;
|
||||
let out = resolve_revocation(&src, "b1", 110, &reader).unwrap();
|
||||
assert!(!out.revoked);
|
||||
out.validate("b1", 110).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decision_id_is_deterministic_and_tracks_allow() {
|
||||
let a = decision_id_for(&[1u8; 32], &[2u8; 32], true);
|
||||
|
||||
@@ -19,7 +19,9 @@ use mpc_chain::admission::{chain_admit, MemberCache};
|
||||
use mpc_chain::objects::{
|
||||
object_digest, ChainObject, ComputeOrder, Member, PolicyBundleRecord, Receipt,
|
||||
};
|
||||
use mpc_chain::opa::{decide, sign_bundle, DecideRequest, OpaRunner};
|
||||
use mpc_chain::opa::{
|
||||
decide, sign_bundle, DecideRequest, OpaRunner, RevocationView, RevocationViewSource,
|
||||
};
|
||||
use mpc_chain::outbox::{EnqueueOutcome, Outbox};
|
||||
use mpc_chain::policy::{governance_boundary, HardRuleSet, OpaPolicyBundle};
|
||||
use mpc_chain::rpc::{ChainClient, HttpChainClient};
|
||||
@@ -81,11 +83,13 @@ const CHAIN_USAGE: &str = "用法:
|
||||
--bundle PATH --key PATH --id STR --issuer STR --expires N
|
||||
--policy production-module|development-software --out PATH
|
||||
mpc chain opa decide 验签 → 有效期/撤销 → 真 opa eval → decision 落 outbox
|
||||
--bundle PATH --manifest PATH --input PATH --revocation PATH
|
||||
--bundle PATH --manifest PATH --input PATH --revocation PATH|chain
|
||||
--query STR --now N --outbox PATH --order-id STR
|
||||
|
||||
★ opa 只在宿主/控制面 spawn 外部二进制,**不在 guest 内执行**;
|
||||
撤销视图由调用方每次显式给(链上状态位读取未落地);
|
||||
撤销来源两种:--revocation PATH 给调用方本地桩,或 --revocation chain 声明
|
||||
走链上撤销状态位读取(**链读后端未接入 ⇒ fail-closed 拒**,绝不默认
|
||||
revoked=false 放行);
|
||||
decision 只是 outbox 存证,不是已签名交易、也没有上链。
|
||||
|
||||
★ --transport 必须显式给:stub 只允许桩自测,tlcp 是生产路径。
|
||||
@@ -650,10 +654,25 @@ fn cmd_opa_decide(args: &[String]) -> Result<(), String> {
|
||||
// 缺 opa 二进制必须在这里明确报错,不许降级成「默认拒绝」蒙过去。
|
||||
let runner = OpaRunner::resolve().map_err(|e| e.to_string())?;
|
||||
let manifest_text = read(req(&o, "--manifest")?)?;
|
||||
let revocation_text = read(req(&o, "--revocation")?)?;
|
||||
// 撤销来源:显式 `--revocation chain` 声明走链上读取(当前后端未接入,
|
||||
// decide 会 fail-closed 拒);否则必须是本地桩文件路径。缺参由 req 必填报错。
|
||||
let revocation_arg = req(&o, "--revocation")?;
|
||||
let revocation = if revocation_arg == "chain" {
|
||||
RevocationViewSource::ChainRead
|
||||
} else {
|
||||
let text = read(revocation_arg)?;
|
||||
RevocationViewSource::CallerSupplied(
|
||||
RevocationView::from_json(&text).map_err(|e| e.to_string())?,
|
||||
)
|
||||
};
|
||||
// 先取标注再移动(revocation 会被 move 进 DecideRequest)。
|
||||
let rev_src_label = match &revocation {
|
||||
RevocationViewSource::ChainRead => "chain-read",
|
||||
RevocationViewSource::CallerSupplied(_) => "caller-supplied-local-view-not-chain-read",
|
||||
};
|
||||
let r = DecideRequest {
|
||||
manifest_text: &manifest_text,
|
||||
revocation_text: &revocation_text,
|
||||
revocation,
|
||||
bundle_path: Path::new(req(&o, "--bundle")?),
|
||||
input_path: Path::new(req(&o, "--input")?),
|
||||
query,
|
||||
@@ -676,7 +695,7 @@ fn cmd_opa_decide(args: &[String]) -> Result<(), String> {
|
||||
out.pop(); // 去掉结尾的 },补上本层的诚实标注字段
|
||||
let bin = runner.binary.display().to_string();
|
||||
println!(
|
||||
"{},\"query\":\"{}\",\"outbox\":\"{}\",\"opaBinary\":\"{}\",\"opaInGuest\":false,\"revocationSource\":\"caller-supplied-local-view-not-chain-read\",\"chainRecorded\":false,\"decisionStoredAs\":\"outbox-pending-not-signed-tx\",\"warning\":\"{}\"}}",
|
||||
"{},\"query\":\"{}\",\"outbox\":\"{}\",\"opaBinary\":\"{}\",\"opaInGuest\":false,\"revocationSource\":\"{}\",\"chainRecorded\":false,\"decisionStoredAs\":\"outbox-pending-not-signed-tx\",\"warning\":\"{}\"}}",
|
||||
out,
|
||||
esc(query),
|
||||
match outcome {
|
||||
@@ -684,6 +703,7 @@ fn cmd_opa_decide(args: &[String]) -> Result<(), String> {
|
||||
EnqueueOutcome::AlreadyPresent => "already-present",
|
||||
},
|
||||
esc(&bin),
|
||||
rev_src_label,
|
||||
esc(OPA_HONESTY_WARNING)
|
||||
);
|
||||
Ok(())
|
||||
|
||||
@@ -260,7 +260,7 @@ let backend = probe_tlcp_environment().backend; // None / Tongsuo / GmSSL
|
||||
# GMSSL_TLCP_TUNNEL_SKIPPED),环境齐备也只 NEEDS_IMPL,绝不打印通过。
|
||||
|
||||
# --- 2026-11-07 追加:阶段 3 第一段 OPA bundle / decision(真跑,非形状) ---
|
||||
use mpc_chain::opa::{sign_bundle, verify_bundle, decide, parse_eval_allow, require_input_source, signing_bytes, decision_id_for, BundleManifest, RevocationView, Decision, DecideRequest, OpaRunner};
|
||||
use mpc_chain::opa::{sign_bundle, verify_bundle, decide, parse_eval_allow, require_input_source, signing_bytes, decision_id_for, BundleManifest, RevocationView, RevocationViewSource, resolve_revocation, ChainRevocationReader, UnconfiguredRevocationReader, Decision, DecideRequest, OpaRunner};
|
||||
use mpc_chain::opa::{MANIFEST_VERSION, DEFAULT_QUERY, REVOCATION_MAX_AGE_SECS};
|
||||
let m = sign_bundle(bundle_bytes, bundle_id, issued_by, expires_at, private_pem, policy)?;
|
||||
let hash = verify_bundle(&m, bundle_bytes)?; // ★ 被签内容从实际字节重算,不信清单自带 canonicalHex
|
||||
@@ -270,12 +270,15 @@ let d = decide(&req)?; // hash pin → SM2 验签 → 有效期/撤销 → inp
|
||||
# 绝不把 undefined 当「默认 deny」放过(策略没加载 ≠ 策略拒绝)。
|
||||
# 输出必须恰好一个 bool;非零退出 / errors / 多结果 / 非 bool 一律拒。
|
||||
# ★ input.source 必须在**调 OPA 之前**校验;合规判定 fail-closed 且**无缓存**。
|
||||
# ★ 撤销视图由调用方每次显式给本地桩,**链上撤销状态位读取未落地**;
|
||||
# bundleId 一致 / revoked=false / 新鲜度 TTL 内,缺一即拒。
|
||||
# ★ 撤销来源分两类:`RevocationViewSource::CallerSupplied`(调用方本地桩)与
|
||||
# `ChainRead`;链上撤销状态位读取已落契约(`ChainRevocationReader` +
|
||||
# `UnconfiguredRevocationReader`),但链端点未接入,**未配置即 fail-closed 拒**
|
||||
# (绝不默认 `revoked=false` 放行)。bundleId 一致 / revoked / 新鲜度 TTL 内缺一即拒。
|
||||
# ★ decision 含 decisionId + bundleHash + inputHash,确定性派生并进 outbox 幂等键;
|
||||
# 存证 fail-open,判定 fail-closed,两者不许混。
|
||||
# ★ 诚实边界:OPA 不在 guest 内执行(只 spawn 外部二进制)、撤销不是链读、
|
||||
# decision 未签名未上链。输出 OPA_DECISION_OK + OPA_GUEST_NOT_VERIFIED +
|
||||
# ★ 诚实边界:OPA 不在 guest 内执行(只 spawn 外部二进制)、撤销链读后端未接入
|
||||
# (声明 chain 即 fail-closed 拒)、decision 未签名未上链。输出 OPA_DECISION_OK +
|
||||
# OPA_GUEST_NOT_VERIFIED +
|
||||
# CHAIN_NOT_VERIFIED,缺 OPA 必显式 OPA_DECISION_SKIPPED + 逐项缺失,
|
||||
# **绝不宣称阶段 3 已完成**。
|
||||
# ★ 主门禁第 17 条 = 40 条真闭环判据 + 18 条零依赖 --self-test;
|
||||
@@ -743,7 +746,7 @@ mod tests {
|
||||
#[test]
|
||||
fn catalog_documents_stage3_opa_facts() {
|
||||
for key in [
|
||||
"use mpc_chain::opa::{sign_bundle, verify_bundle, decide, parse_eval_allow, require_input_source, signing_bytes, decision_id_for, BundleManifest, RevocationView, Decision, DecideRequest, OpaRunner}",
|
||||
"use mpc_chain::opa::{sign_bundle, verify_bundle, decide, parse_eval_allow, require_input_source, signing_bytes, decision_id_for, BundleManifest, RevocationView, RevocationViewSource, resolve_revocation, ChainRevocationReader, UnconfiguredRevocationReader, Decision, DecideRequest, OpaRunner}",
|
||||
"use mpc_chain::opa::{MANIFEST_VERSION, DEFAULT_QUERY, REVOCATION_MAX_AGE_SECS}",
|
||||
"let m = sign_bundle(bundle_bytes, bundle_id, issued_by, expires_at, private_pem, policy)?;",
|
||||
"let hash = verify_bundle(&m, bundle_bytes)?;",
|
||||
@@ -758,11 +761,11 @@ mod tests {
|
||||
"undefined",
|
||||
"绝不把 undefined 当「默认 deny」放过",
|
||||
"OPA 不在 guest 内执行",
|
||||
"链上撤销状态位读取未落地",
|
||||
"判定 fail-closed 且**无缓存**",
|
||||
"OPA_DECISION_SKIPPED",
|
||||
"OPA_GUEST_NOT_VERIFIED",
|
||||
"CHAIN_NOT_VERIFIED",
|
||||
"链上撤销状态位读取已落契约",
|
||||
"主门禁第 17 条",
|
||||
"每条负向带期望拒绝特征",
|
||||
"绝不宣称阶段 3 已完成",
|
||||
@@ -778,6 +781,8 @@ mod tests {
|
||||
"pub fn signing_bytes", "pub fn decision_id_for",
|
||||
"pub struct BundleManifest", "pub struct RevocationView",
|
||||
"pub struct Decision", "pub struct DecideRequest", "pub struct OpaRunner",
|
||||
"pub enum RevocationViewSource", "pub fn resolve_revocation",
|
||||
"pub trait ChainRevocationReader", "pub struct UnconfiguredRevocationReader",
|
||||
"pub const MANIFEST_VERSION", "pub const DEFAULT_QUERY",
|
||||
"pub const REVOCATION_MAX_AGE_SECS",
|
||||
] {
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
| — | TARS(2026-11-07 拍板) | **先不上** | ssw-mpc 只依赖 `bcos-rpc` 的 HTTP 端点 |
|
||||
| — | OPA(2026-11-07 拍板) | **硬规则进合约,业务合规策略仍走 OPA** | 两者域分隔不同、字段互相禁止、不开 WASM;签发收口到控制面 |
|
||||
| — | guest 静态产物边界(2026-11-07 补) | **musl `mpc` 不许带宿主控制面** | `mpc-hostd` / `mpc-chain` 归 `control-plane` 可选依赖并按 target 排除;交叉编译必须 `--no-default-features`;主门禁第 4 条三层探针钉死(见 4.8 / 6) |
|
||||
| — | 阶段 3 第一段(2026-11-07 补) | **OPA 真判定闭环已落地,但阶段 3 未完成** | 真 `opa build` + SM2 真签 / SM3 hash pin + 真 `opa eval` + decision 幂等落 outbox(第 17 条);★ OPA **不在 guest 内**、撤销视图是本地桩(链上状态位未接)、decision 未签名未上链 |
|
||||
| — | 阶段 3 第一段(2026-11-07 补) | **OPA 真判定闭环已落地,但阶段 3 未完成** | 真 `opa build` + SM2 真签 / SM3 hash pin + 真 `opa eval` + decision 幂等落 outbox(第 17 条);★ OPA **不在 guest 内**、撤销链读后端未接入(声明 chain 即 fail-closed 拒)、decision 未签名未上链 |
|
||||
|
||||
---
|
||||
|
||||
@@ -708,11 +708,11 @@ outbox 必须**幂等**:同一 `order_id` + 同一 `decision_id` 重复提交
|
||||
| **0b** | OP-TEE 独立通道:`tools/ci-optee.sh` + 五条验证规则 + `ta_admit` | 零(复用 `build/build_optee.sh`) | 低(不碰主链路) | — |
|
||||
| **1** | 链路:EasyTier 进程化 + 三档 `--link-policy` + credential + `link` 上报 | 零(外部二进制) | 中(LGPL 合规、TUN 权限、relay 可见性) | 0a |
|
||||
| **2** | `mpc-chain`:**形状层 + OpenSSL 国密签名 + GmSSL 本机 TLCP 真握手 + Rust 侧 TLCP 进程通道环回实证已完成**(对象 / JSON-RPC / outbox / 准入 / SM2 真签名 / distid 对齐 / TLCP 契约 / 治理形状 / `TlcpTunnel` 进程通道);真实 `bcos-rpc` 的 TLCP 通道 / RLP / 国密模组 provider 待环境与硬件 | 中(`serde_json` + `reqwest` + `openssl`,仅 `mpc-chain`;**国密模组 / Tongsuo FFI 未落地**) | 高(国密不可逆、真实 TLCP 通道环境、CSV 验签待实测) | 0a |
|
||||
| **3** | 策略:OPA 进 guest + 控制面签发 bundle + decision 上链。**第一段已完成**(控制面真签 bundle + 真 `opa eval` 判定 + decision 幂等落 outbox,第 17 条);guest 内执行 / bundle 分发 / 链上撤销状态位读取 / 已签名交易上链**未落地** | 中(OPA 二进制 + bundle 分发) | 高(bundle 灰度与撤销、TCB 边界) | 2 |
|
||||
| **3** | 策略:OPA 进 guest + 控制面签发 bundle + decision 上链。**第一段已完成**(控制面真签 bundle + 真 `opa eval` 判定 + decision 幂等落 outbox,第 17 条);guest 内执行 / bundle 分发 / 链上撤销状态位读取**后端** / 已签名交易上链**未落地** | 中(OPA 二进制 + bundle 分发) | 高(bundle 灰度与撤销、TCB 边界) | 2 |
|
||||
| ~~4~~ | ~~Rego→WASM 上链~~ | — | — | **删除(决策 6)** |
|
||||
|
||||
**阶段状态(2026-11-08 追加 TLCP 进程通道后)**:**0a 已完成**(第 12 条)、**1 已完成**(第 13 条)、**2 形状层 + OpenSSL 国密签名 + GmSSL 本机 TLCP 真握手 + Rust 侧 TLCP 进程通道环回实证已完成**(第 14 / 15 / 16 / 18 条);**3 第一段已完成**(第 17 条:真 OPA bundle 签发 / 真判定 / decision 幂等存证);0b 的编排与判据已实现、**QEMU 实跑待有 SDK 的机器**。主门禁共 **18 条**。
|
||||
**★ 两段诚实边界都不许冲掉**:① **阶段 2 仍不含真实交易签名上链** —— FISCO 自有交易编码 / 国密模组 provider / 真实 `bcos-rpc` 的 TLCP 通道未落地(Rust 侧 TLCP 进程通道环回实证已落地,但服务端是 echo 不是真节点),见 4.8 与 `tools/fisco-realnode-probe.py`;② **阶段 3 只完成第一段** —— OPA 仍在宿主 / 控制面 spawn,**不在 guest 内执行**,撤销视图是调用方每次提供的本地桩(链上状态位读取未接入),decision 只入 outbox、未签名未上链;合约部署与 OPA bundle 的 guest 分发仍未做。成功输出为 `OPA_DECISION_OK` + `OPA_GUEST_NOT_VERIFIED` + `CHAIN_NOT_VERIFIED`,**不是「阶段 3 已完成」**。
|
||||
**★ 两段诚实边界都不许冲掉**:① **阶段 2 仍不含真实交易签名上链** —— FISCO 自有交易编码 / 国密模组 provider / 真实 `bcos-rpc` 的 TLCP 通道未落地(Rust 侧 TLCP 进程通道环回实证已落地,但服务端是 echo 不是真节点),见 4.8 与 `tools/fisco-realnode-probe.py`;② **阶段 3 只完成第一段** —— OPA 仍在宿主 / 控制面 spawn,**不在 guest 内执行**,撤销来源分两类(调用方本地桩 / `--revocation chain` 声明链读),**链读后端未接入 ⇒ 声明 chain 即 fail-closed 拒**(绝不默认 `revoked=false` 放行),decision 只入 outbox、未签名未上链;合约部署与 OPA bundle 的 guest 分发仍未做。成功输出为 `OPA_DECISION_OK` + `OPA_GUEST_NOT_VERIFIED` + `CHAIN_NOT_VERIFIED`,**不是「阶段 3 已完成」**。
|
||||
|
||||
**★ 第 4 条门禁本轮补上 guest 产物边界**:`mpc-chain` 引 `openssl` 后 musl 静态产物链接失败,
|
||||
暴露的是「宿主控制面被编进 guest」而不是环境缺包。现按 feature + target 切分,
|
||||
@@ -791,7 +791,9 @@ GmSSL 套件名白名单),均用桩跑完整链路。
|
||||
改 bundle 后顺手改清单即可绕过。判据用「改 bundleId」单独测这一层。
|
||||
|
||||
**★ 诚实边界**:OPA 跑在宿主 / 控制面(只 `spawn` 外部二进制,**不在 guest 内**),
|
||||
撤销视图是调用方每次提供的本地桩(链上状态位读取未落地、新鲜度 TTL 30s),
|
||||
撤销来源两类:调用方本地桩(新鲜度 TTL 30s)或 `--revocation chain` 声明走链上
|
||||
撤销状态位读取(`ChainRevocationReader` 契约已落,**后端未接入 ⇒ fail-closed 拒**,
|
||||
绝不默认 `revoked=false` 放行),
|
||||
decision 只是 outbox 存证(**未签名、未上链**),软件签名器生产策略仍必拒。
|
||||
判定 fail-closed **且无缓存**,存证 fail-open,两者不许混。
|
||||
|
||||
@@ -858,7 +860,7 @@ decision 只是 outbox 存证(**未签名、未上链**),软件签名器
|
||||
**已拍板(2026-11-07)**
|
||||
|
||||
11. **Pro 版先不上 TARS**。ssw-mpc 只依赖 `bcos-rpc` 的 HTTP 端点,TARS 留给运维团队自建(4.2)。
|
||||
12. **硬规则进合约,业务合规策略仍走 OPA**。两者域分隔不同(`TEE_CHAIN_HARD_RULE` / `TEE_OPA_BUNDLE`)、字段互相禁止(`HardRuleSet` 拒 `wasm` / `rego`,`OpaPolicyBundle` 拒 `min_tcb` 等硬规则字段)、不开 WASM;策略签发收口到站点端控制面。第 15 条落对象形状与边界守卫;**第 17 条落阶段 3 第一段**(真 bundle 签发 / 真 `opa eval` / decision 幂等存证),但 OPA 仍不在 guest 内、撤销不是链读、decision 未签名未上链,合约部署与 bundle 分发仍未做。
|
||||
12. **硬规则进合约,业务合规策略仍走 OPA**。两者域分隔不同(`TEE_CHAIN_HARD_RULE` / `TEE_OPA_BUNDLE`)、字段互相禁止(`HardRuleSet` 拒 `wasm` / `rego`,`OpaPolicyBundle` 拒 `min_tcb` 等硬规则字段)、不开 WASM;策略签发收口到站点端控制面。第 15 条落对象形状与边界守卫;**第 17 条落阶段 3 第一段**(真 bundle 签发 / 真 `opa eval` / decision 幂等存证),但 OPA 仍不在 guest 内、撤销链读后端未接入(声明 chain 即 fail-closed 拒)、decision 未签名未上链,合约部署与 bundle 分发仍未做。
|
||||
|
||||
---
|
||||
|
||||
@@ -891,7 +893,7 @@ decision 只是 outbox 存证(**未签名、未上链**),软件签名器
|
||||
- `tools/selftest-chain.py`(**进主门禁第 14 条**;50 条判据,Python 假 `bcos-rpc`;每条负向带期望特征;含 `.no_proxy()` 与国密链提交方法回归探针)
|
||||
- `tools/selftest-chain-gm.py`(**第 15 条**;36 条判据;系统 openssl CLI 独立验签、生产策略拒软件签名器、GmSSL 套件名白名单、环境齐备也 `ready=false`)
|
||||
- `tools/selftest-tlcp-gmssl.py` / `tools/selftest-ta-key-tier.py` / `tools/fisco-realnode-probe.py`(**第 16 条**;真 TLCP 握手 19 / 三级密钥 16 / 真机契约 12 + 两份零依赖 `--self-test`;缺环境一律显式 `*_SKIPPED` + 逐项缺失,绝不静默通过)
|
||||
- `crates/mpc-chain/src/opa.rs`(**阶段 3 第一段**:`sign_bundle` / `verify_bundle`(SM3 hash pin + SM2 真验签,被签内容重算)/ `RevocationView`(本地桩、TTL 新鲜度)/ `require_input_source`(调 OPA 前判)/ `OpaRunner`(只 spawn 外部 `opa`,带超时与 `wait` 收割)/ `parse_eval_allow`(undefined `{}` 必拒)/ `Decision`(确定性 `decision_id` 兼 outbox 幂等键);**OPA 不在 guest 内、撤销不是链读、decision 未签名未上链**)
|
||||
- `crates/mpc-chain/src/opa.rs`(**阶段 3 第一段**:`sign_bundle` / `verify_bundle`(SM3 hash pin + SM2 真验签,被签内容重算)/ `RevocationView`(本地桩、TTL 新鲜度)/ `RevocationViewSource` + `ChainRevocationReader` + `UnconfiguredRevocationReader` + `resolve_revocation`(**链上撤销状态位读取契约已落,后端未接入即 fail-closed 拒**)/ `require_input_source`(调 OPA 前判)/ `OpaRunner`(只 spawn 外部 `opa`,带超时与 `wait` 收割)/ `parse_eval_allow`(undefined `{}` 必拒)/ `Decision`(确定性 `decision_id` 兼 outbox 幂等键);**OPA 不在 guest 内、撤销链读后端未接入、decision 未签名未上链**)
|
||||
- `tools/selftest-chain-opa.py`(**第 17 条**;40 条真闭环判据 + 18 条零依赖 `--self-test`;真 `opa build` / 真 `opa eval` / 系统 openssl 独立验签;16 条负向每条带期望拒绝特征并排除「未知参数」探针 bug;缺 OPA 显式 `OPA_DECISION_SKIPPED`,成功也只报 `OPA_GUEST_NOT_VERIFIED` + `CHAIN_NOT_VERIFIED`)
|
||||
- `crates/mpc-core/src/domain.rs`(`TEE_LINK_BIND` / `TEE_CHAIN_OBJECT` / `TEE_OPA_SIGNED_BUNDLE` / `TEE_OPA_DECISION` 域分隔常量;改一个字节 = 已登记摘要或幂等键全部对不上)
|
||||
- `crates/mpc-tee/src/session.rs:75`(`user_data` 两段 sha256 拆分)
|
||||
|
||||
@@ -336,6 +336,9 @@ if [ "$FAST" -eq 0 ]; then
|
||||
# 不是 Python 复刻的策略判定。undefined 输出当拒绝,不当默认 deny。
|
||||
# ★ 成功也只打印 OPA_DECISION_OK + OPA_GUEST_NOT_VERIFIED +
|
||||
# CHAIN_NOT_VERIFIED,绝不宣称「阶段 3 已完成」。
|
||||
# ★ 撤销来源二选一:本地桩 或 --revocation chain(链读后端未接入 ⇒
|
||||
# 必须 fail-closed 拒,期望特征 REVOCATION_CHAIN_UNVERIFIED,
|
||||
# 绝不默认 revoked=false 放行)。
|
||||
step "17/18 阶段 3 OPA bundle 签发 / 真判定 / decision 存证自测"
|
||||
python3 tools/selftest-chain-opa.py --self-test
|
||||
python3 tools/selftest-chain-opa.py
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
|
||||
★ 诚实边界(不许被这条自测冲掉):
|
||||
- OPA 跑在宿主 / 控制面,**不在 guest 内**(脚本输出 opaInGuest=false);
|
||||
- 撤销视图是调用方每次提供的本地桩,**链上状态位读取未落地**;
|
||||
- 撤销来源有两种:调用方本地桩(正常路径)或 `--revocation chain`
|
||||
声明走链上状态位读取;**链读后端未接入 ⇒ 声明 chain 即 fail-closed 拒**
|
||||
(绝不默认 revoked=false 放行,见 REVOCATION_CHAIN_UNVERIFIED);
|
||||
- decision 只进 outbox,**不是已签名交易、也没有上链**;
|
||||
- 软件 SM2 签名器私钥可导出、密评不可过,生产策略必须拒绝它。
|
||||
成功时打印 `OPA_DECISION_OK` + `OPA_GUEST_NOT_VERIFIED` + `CHAIN_NOT_VERIFIED`。
|
||||
@@ -78,6 +80,7 @@ EXPECTED_FEATURES = {
|
||||
"opahidden": "PATH 里没有 opa",
|
||||
"missing_revocation_param": "缺少必填参数 --revocation",
|
||||
"production_signer": "生产策略只接受硬件国密模组",
|
||||
"revocation_chain": "REVOCATION_CHAIN_UNVERIFIED",
|
||||
}
|
||||
|
||||
PASS_N = 0
|
||||
@@ -161,6 +164,10 @@ def self_test():
|
||||
check("★ 判据覆盖 undefined 假绿 / hash pin / 验签 / 撤销 / 来源 / 生产策略",
|
||||
all(k in EXPECTED_FEATURES for k in
|
||||
("undefined", "tampered", "badsig", "revoked", "nosrc", "production_signer")))
|
||||
check("★ 判据覆盖链上撤销状态位读取(未接入必须 fail-closed 拒)",
|
||||
"revocation_chain" in EXPECTED_FEATURES
|
||||
and "REVOCATION_CHAIN_UNVERIFIED" in EXPECTED_FEATURES["revocation_chain"],
|
||||
EXPECTED_FEATURES.get("revocation_chain"))
|
||||
|
||||
src = Path(__file__).read_text()
|
||||
check("探针源码仍含 OPA_DECISION_SKIPPED 输出(防静默跳过回归)",
|
||||
@@ -181,6 +188,19 @@ def self_test():
|
||||
"require_input_source" in opa_rs and "OPA 之前" in opa_rs)
|
||||
check("opa.rs 验签用的是重算规范字节(不信清单自带 canonicalHex)",
|
||||
"重算" in opa_rs and "canonicalHex" in opa_rs)
|
||||
check("★ opa.rs 有链上撤销状态位读取契约(来源二选一 + 未接入即拒)",
|
||||
"RevocationViewSource" in opa_rs and "ChainRevocationReader" in opa_rs
|
||||
and "resolve_revocation" in opa_rs
|
||||
and "REVOCATION_CHAIN_UNVERIFIED" in opa_rs)
|
||||
check("★ opa.rs 链读未接入时绝不返回 revoked=false(fail-closed)",
|
||||
"UnconfiguredRevocationReader" in opa_rs
|
||||
and "ChainError::NotConfigured" in opa_rs
|
||||
and "绝不返回 `revoked=false`" in opa_rs)
|
||||
cli_rs = (REPO / "crates/mpc-cli/src/chain.rs").read_text()
|
||||
check("★ CLI 支持 --revocation chain(链读声明)并区分来源标注",
|
||||
"RevocationViewSource::ChainRead" in cli_rs
|
||||
and "caller-supplied-local-view-not-chain-read" in cli_rs
|
||||
and '"chain-read"' in cli_rs)
|
||||
domain = (REPO / "crates/mpc-core/src/domain.rs").read_text()
|
||||
check("domain.rs 有阶段 3 两个独立域分隔常量",
|
||||
"TEE_OPA_SIGNED_BUNDLE" in domain and "TEE_OPA_DECISION" in domain)
|
||||
@@ -412,6 +432,9 @@ def run_real():
|
||||
("badquery", {"--query": "data.mpc.governance.allow["}, None),
|
||||
("opahidden", {}, hidden_env),
|
||||
("missing_revocation_param", {}, None),
|
||||
# ★ 声明走链上撤销状态位读取:链读后端未接入 ⇒ 必须 fail-closed 拒,
|
||||
# 绝不返回 revoked=false 放行。
|
||||
("revocation_chain", {"--revocation": "chain"}, None),
|
||||
]
|
||||
for name, over, env_ in negative:
|
||||
args = decide_args(w, name, over,
|
||||
@@ -445,7 +468,8 @@ def finish(label):
|
||||
return 1
|
||||
print("OPA_DECISION_OK")
|
||||
print("OPA_GUEST_NOT_VERIFIED: OPA 跑在宿主/控制面,guest 内执行与 bundle 分发未落地")
|
||||
print("CHAIN_NOT_VERIFIED: 撤销状态位链读未接入,decision 仅入 outbox,未签名未上链")
|
||||
print("CHAIN_NOT_VERIFIED: 撤销状态位链读后端未接入(声明 chain 即 fail-closed 拒),"
|
||||
"decision 仅入 outbox,未签名未上链")
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user