5 Commits
Author SHA1 Message Date
admin 9cd697826b feat(tools): 新增从 transcript 恢复结构体最终定义的块级替换工具
ci / gate (push) Waiting to run
从 transcript JSONL 中定位某结构体的最终版定义,做块级替换,
用于 git reset --hard 后重建的链式依赖失配场景。

- 带仓库内路径边界校验,拒绝越界写入
- 与 tools/ 下 recover-from-transcript.py 等同类工具保持一致约定
2026-11-16 09:02:19 +08:00
admin 31d246f00b fix(release): tag 已存在不算失败 + mac 产物改为可选
两处都会让正常发版走到一半报错:
- Gitea 创建 Release 时会自动建同名 tag,之后 git push tag 必然 already exists。
  判据改成「远端 tag 是否指向当前 HEAD」,是则视为成功;不一致才报错。
- mac 只服务开发机、不是部署目标,缺它不该阻塞服务端发版。
2026-11-14 12:43:21 +08:00
admin 33e13f4918 chore(release): 版本 0.1.0 → 0.3.0,与 git tag 对齐
ci / gate (push) Waiting to run
此前 workspace 版本停在 0.1.0,而仓里已有 v0.2.0 tag ⇒ 二进制 --version 报的
版本号与 tag 长期不符,设备上第三方编译的 mpc 也无法自证是哪一版。
本次按 tag 顺延到 0.3.0(v0.2.0 之后已有 2 个提交)。
2026-11-14 12:42:03 +08:00
admin f676a6aa97 fix(registry): 节点自报支持 optee/none,平台名解析收敛为一份口径
PlatformKind 新增 ALL/as_str/parse,Display 由 as_str 派生;规范名解析唯一来源下沉到枚举定义处。

TeeNode::parse 删除手写 parse_kind;hostd parse_platform 与 CLI 四处别名表复用同一份规范名,历史别名继续可用。

影响:kind=optee/none/tdx 可登记并出现在 GET /nodes;admit()/builtin() 不变,注册不因缺少 guest 启动规格被拒。

回归:规范名契约、全变体 descriptor 往返、optee/none 端到端注册单测;全量测试与 25 步门禁全绿。
2026-11-11 15:11:52 +08:00
admin a35f9fa077 fix(release): Gitea 写接口必须主动带 Authorization 头
症状:GET 全绿、POST 一律 401「token is required」。
根因:本仓 Gitea 的**读接口允许匿名访问**(GET 不带凭据也过),
而写接口返回的 401 **不带 WWW-Authenticate 挑战头**
⇒ urllib 的 HTTPBasicAuthHandler 永远不触发重试 ⇒ 压根没把凭据带上。
(第一版用 BasicAuthHandler,看着像「凭据不对」,实则是「没带」。)

修法:所有请求显式带 `Authorization: Basic <b64>` 头(含资产下载算 sha256)。
顺带去掉 remote_asset_index 里每个资产多打一次元数据接口的冗余请求。
2026-11-10 14:32:29 +08:00
11 changed files with 406 additions and 107 deletions

No files matched your search

Generated
+20 -20
View File
@@ -502,7 +502,7 @@ dependencies = [
[[package]]
name = "mpc-chain"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"openssl",
@@ -512,7 +512,7 @@ dependencies = [
[[package]]
name = "mpc-cli"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-chain",
"mpc-core",
@@ -537,14 +537,14 @@ version = "0.1.0"
[[package]]
name = "mpc-data"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
]
[[package]]
name = "mpc-demo"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-data",
@@ -566,7 +566,7 @@ dependencies = [
[[package]]
name = "mpc-examples"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-data",
@@ -585,7 +585,7 @@ dependencies = [
[[package]]
name = "mpc-fl"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-vault",
@@ -593,14 +593,14 @@ dependencies = [
[[package]]
name = "mpc-he"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
]
[[package]]
name = "mpc-hostd"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"axum",
"mpc-core",
@@ -611,7 +611,7 @@ dependencies = [
[[package]]
name = "mpc-ir"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-proto",
@@ -620,7 +620,7 @@ dependencies = [
[[package]]
name = "mpc-ml"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-ir",
@@ -630,7 +630,7 @@ dependencies = [
[[package]]
name = "mpc-node"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-ml",
@@ -641,22 +641,22 @@ dependencies = [
[[package]]
name = "mpc-orch"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
]
[[package]]
name = "mpc-policy"
version = "0.1.0"
version = "0.3.0"
[[package]]
name = "mpc-proto"
version = "0.1.0"
version = "0.3.0"
[[package]]
name = "mpc-psi"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"curve25519-dalek",
"mpc-core",
@@ -664,18 +664,18 @@ dependencies = [
[[package]]
name = "mpc-ray"
version = "0.1.0"
version = "0.3.0"
[[package]]
name = "mpc-runtime"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
]
[[package]]
name = "mpc-sql"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-ir",
@@ -694,7 +694,7 @@ dependencies = [
[[package]]
name = "mpc-vault"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-proto",
@@ -702,7 +702,7 @@ dependencies = [
[[package]]
name = "mpc-zkp"
version = "0.1.0"
version = "0.3.0"
dependencies = [
"mpc-core",
"mpc-he",
+1 -1
View File
@@ -3,7 +3,7 @@ resolver = "2"
members = ["crates/*", "demo", "examples"]
[workspace.package]
version = "0.1.0"
version = "0.3.0"
edition = "2021"
license = "Apache-2.0"
rust-version = "1.85"
+24 -25
View File
@@ -103,6 +103,23 @@ mod chain;
const VERSION: &str = env!("CARGO_PKG_VERSION");
/// CLI 输入层的平台解析:规范名走 [`mpc_tee::PlatformKind::parse`] 这一份
/// 协议口径,历史别名只在 CLI 这一层放宽。
///
/// 早先四个子命令各写一份 `match`,新增变体时总有一处漏(issue #3 的
/// 同类漂移)。现在规范名只有枚举定义处一份,这里只管别名。
pub(crate) fn parse_platform_loose(raw: &str) -> Option<mpc_tee::PlatformKind> {
use mpc_tee::PlatformKind as K;
if let Some(kind) = K::parse(raw) {
return Some(kind);
}
match raw {
"snp" | "amd" => Some(K::SevSnp),
"csv" | "hygon" => Some(K::HygonCsv),
_ => None,
}
}
fn main() -> ExitCode {
let raw: Vec<String> = std::env::args().skip(1).collect();
// `--report` 是全局开关,出现在子命令前后都认;摘掉再分发,
@@ -839,17 +856,9 @@ fn parse_party_tee(spec: &str) -> Result<mpc_tee::PartyTee, String> {
}
None => (body, 0),
};
let kind = match kind_s {
"optee" => mpc_tee::PlatformKind::Optee,
"sev-snp" | "snp" => mpc_tee::PlatformKind::SevSnp,
"tdx" => mpc_tee::PlatformKind::Tdx,
"hygon-csv" | "csv" => mpc_tee::PlatformKind::HygonCsv,
other => {
return Err(format!(
"未知平台 {other:?}(可选 none / optee / sev-snp / tdx / hygon-csv)"
))
}
};
let kind = parse_platform_loose(kind_s).ok_or_else(|| {
format!("未知平台 {kind_s:?}(可选 none / optee / sev-snp / tdx / hygon-csv)")
})?;
if kind == mpc_tee::PlatformKind::None {
return Err("平台 none 请写成 `site=none`".into());
}
@@ -1056,13 +1065,8 @@ fn cmd_tee_verify(args: &[String]) -> Result<(), String> {
};
let platform = match parse_flag(args, "--platform") {
Some(p) => match p {
"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")),
},
Some(p) => parse_platform_loose(p)
.ok_or_else(|| format!("--platform {p:?} 只认 none/optee/snp/csv/tdx"))?,
None => node
.as_ref()
.map(|n| n.platform.kind)
@@ -1294,13 +1298,8 @@ fn cmd_tee_attest_check(args: &[String]) -> Result<(), String> {
let bundle = mpc_tee::bundle::AttestationBundle::from_bytes(&raw).map_err(|e| e.to_string())?;
let platform = match parse_flag(args, "--platform") {
Some(p) => match p {
"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")),
},
Some(p) => parse_platform_loose(p)
.ok_or_else(|| format!("--platform {p:?} 只认 none/optee/snp/csv/tdx"))?,
None => bundle.platform,
};
+3 -8
View File
@@ -53,14 +53,9 @@ pub fn cmd_sa_serve(args: &[String]) -> Result<(), String> {
.map_err(|_| format!("--listen {listen:?} 不是 host:port"))?;
// ★ 平台类型:默认 `none` = 诚实自曝「本 SA 没有硬件保护」。
let platform = match parse_flag(args, "--platform").unwrap_or("none") {
"none" => mpc_tee::PlatformKind::None,
"optee" => mpc_tee::PlatformKind::Optee,
"snp" | "sev-snp" => mpc_tee::PlatformKind::SevSnp,
"tdx" => mpc_tee::PlatformKind::Tdx,
"csv" | "hygon-csv" => mpc_tee::PlatformKind::HygonCsv,
other => return Err(format!("--platform {other:?} 只认 none/optee/snp/tdx/csv")),
};
let platform_raw = parse_flag(args, "--platform").unwrap_or("none");
let platform = crate::parse_platform_loose(platform_raw)
.ok_or_else(|| format!("--platform {platform_raw:?} 只认 none/optee/snp/tdx/csv"))?;
let tcb: u32 = match parse_flag(args, "--tcb") {
Some(v) => v
.parse()
+30 -5
View File
@@ -467,13 +467,17 @@ fn hex_nibble(c: u8) -> Option<u8> {
}
/// 解析平台名。
///
/// 规范名走 [`PlatformKind::parse`] 这一份协议口径;历史别名只在宿主 API
/// 这一层放宽。这样枚举新增变体时,节点描述的 `kind=` 与 `/desired` 的
/// `platform` 不会一个认识、一个不认识(issue #3)。
pub fn parse_platform(raw: &str) -> Option<PlatformKind> {
if let Some(kind) = PlatformKind::parse(raw) {
return Some(kind);
}
match raw {
"sev-snp" | "snp" | "amd" => Some(PlatformKind::SevSnp),
"hygon-csv" | "csv" | "hygon" => Some(PlatformKind::HygonCsv),
"tdx" => Some(PlatformKind::Tdx),
"optee" => Some(PlatformKind::Optee),
"none" => Some(PlatformKind::None),
"snp" | "amd" => Some(PlatformKind::SevSnp),
"csv" | "hygon" => Some(PlatformKind::HygonCsv),
_ => None,
}
}
@@ -1889,13 +1893,34 @@ mod tests {
fn platform_parsing_covers_all_kinds() {
assert_eq!(parse_platform("sev-snp"), Some(PlatformKind::SevSnp));
assert_eq!(parse_platform("snp"), Some(PlatformKind::SevSnp));
assert_eq!(parse_platform("amd"), Some(PlatformKind::SevSnp));
assert_eq!(parse_platform("csv"), Some(PlatformKind::HygonCsv));
assert_eq!(parse_platform("hygon"), Some(PlatformKind::HygonCsv));
assert_eq!(parse_platform("hygon-csv"), Some(PlatformKind::HygonCsv));
assert_eq!(parse_platform("tdx"), Some(PlatformKind::Tdx));
assert_eq!(parse_platform("optee"), Some(PlatformKind::Optee));
assert_eq!(parse_platform("none"), Some(PlatformKind::None));
assert_eq!(parse_platform("nope"), None);
}
/// ★ issue #3:宿主侧不得再维护一份规范名表 —— 枚举每个变体都得认。
#[test]
fn platform_parsing_shares_the_protocol_names() {
for kind in PlatformKind::ALL {
assert_eq!(
parse_platform(kind.as_str()),
Some(kind),
"{} 必须在宿主侧也认得",
kind.as_str()
);
}
// 历史别名继续可用,但不会被协议层当成规范名。
for alias in ["snp", "amd", "csv", "hygon"] {
assert!(parse_platform(alias).is_some(), "{alias} 别名必须继续可用");
assert_eq!(PlatformKind::parse(alias), None);
}
}
#[test]
fn timeout_endpoint_updates_record() {
let rt = TeeRuntime::new();
+36
View File
@@ -484,6 +484,42 @@ mod tests {
);
}
/// ★ issue #3:OP-TEE / 无 TEE 计算节点自报(能力位全 false)必须能登记。
///
/// 这条只走「自报 → 注册表 → GET /nodes」,**不**经过 `admit()`:
/// 起 guest 的准入判据不该拦住一台只是来报到的机器。
#[test]
fn optee_and_none_self_report_lands_in_registry() {
for (kind, host) in [("optee", "192.168.1.233"), ("none", "192.168.1.234")] {
let cp = cp();
let descriptor = format!(
"site=carol\nhost={host}\nkind={kind}\ntcb=1\ndevice_present=false\n\
qemu_present=false\nfirmware_present=false\nimage_present=false\n\
kbs_reachable=false\nmeasurement={}\nkbc=offline_fs_kbc\n",
"25".repeat(32)
);
let mut o = JsonObject::new();
o.push_str("descriptor", &descriptor);
o.push_int("capacity", 1);
let body = o.to_string();
let resp = dispatch_control_plane(&cp, &req("POST", "/registry", &body));
assert_eq!(resp.status, Status::NoContent, "kind={kind} 自报必须 204");
let list = dispatch_control_plane(&cp, &req("GET", "/nodes", ""));
assert_eq!(list.status, Status::Ok);
let text = String::from_utf8_lossy(&list.body).to_string();
let v = crate::json::parse(&text).unwrap();
let arr = v.get_arr("nodes").expect("必须有 nodes 数组");
assert_eq!(arr.len(), 1, "kind={kind} 必须登记进注册表");
let key = format!("carol@{host}");
assert_eq!(arr[0].get_str("key"), Some(key.as_str()));
assert_eq!(arr[0].get_str("platform"), Some(kind), "platform 必须是规范名");
assert_eq!(arr[0].get_str("host"), Some(host));
assert_eq!(arr[0].get_bool("device_present"), Some(false), "能力位如实带出");
}
}
/// ★ 负向:坏自报 ⇒ 400 且**不污染注册表**。
#[test]
fn bad_self_report_is_rejected_and_registry_stays_clean() {
+71 -5
View File
@@ -67,16 +67,50 @@ pub enum PlatformKind {
HygonCsv,
}
impl fmt::Display for PlatformKind {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let s = match self {
impl PlatformKind {
/// 全部变体。新增平台只改这里与 [`Self::as_str`]。
///
/// 为什么要有这张表:解析与序列化都从它派生,不再让每个调用点各写一份
/// `match`。节点描述里的 `kind=` 认不认识某个平台,取决于枚举本身,
/// 而不是取决于某个下游模块有没有顺手补上分支(2026-11-11 issue #3:
/// `parse_kind` 只认 sev-snp / hygon-csv,导致 optee 节点自报被 400)。
pub const ALL: [Self; 5] = [
Self::None,
Self::Optee,
Self::SevSnp,
Self::Tdx,
Self::HygonCsv,
];
/// 协议里的稳定规范名。
///
/// 这是**对外契约**:节点描述 `kind=`、注册表 `GET /nodes` 的 `platform`
/// 字段、站点侧输入都用这一串值。`snp` / `csv` / `amd` 之类历史别名
/// 只属于各自的输入层,不进协议口径。
pub fn as_str(self) -> &'static str {
match self {
Self::None => "none",
Self::Optee => "optee",
Self::SevSnp => "sev-snp",
Self::Tdx => "tdx",
Self::HygonCsv => "hygon-csv",
};
f.write_str(s)
}
}
/// 规范名 → 平台的**唯一解析口径**。
///
/// 与 [`Self::as_str`] / [`fmt::Display`] 严格互逆:
/// `parse(k.as_str()) == Some(k)` 对 [`Self::ALL`] 里每个变体都成立。
/// 节点自报(`TeeNode::parse`)与宿主侧 API 都复用这一份;各输入层的
/// 历史别名先在这里试,再由那一层自行回落。
pub fn parse(s: &str) -> Option<Self> {
Self::ALL.iter().copied().find(|k| k.as_str() == s)
}
}
impl fmt::Display for PlatformKind {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str((*self).as_str())
}
}
@@ -546,6 +580,38 @@ impl TrustPlan {
mod tests {
use super::*;
/// 平台规范名是**对外契约**:新增 / 改名必须显式改这张硬编码表。
/// 刻意不遍历 `ALL` 反查自己 —— 那会变成「被测对象证明自己」的恒绿判据。
#[test]
fn platform_names_are_one_round_trip_contract() {
let expected = [
(PlatformKind::None, "none"),
(PlatformKind::Optee, "optee"),
(PlatformKind::SevSnp, "sev-snp"),
(PlatformKind::Tdx, "tdx"),
(PlatformKind::HygonCsv, "hygon-csv"),
];
assert_eq!(
PlatformKind::ALL.len(),
expected.len(),
"新增平台变体必须同步更新规范名契约"
);
for (kind, name) in expected {
assert_eq!(kind.as_str(), name);
assert_eq!(format!("{kind}"), name, "Display 必须与 as_str 同源");
assert_eq!(PlatformKind::parse(name), Some(kind), "{name} 必须能解析回来");
assert!(PlatformKind::ALL.contains(&kind), "{name} 必须在 ALL 里");
}
}
#[test]
fn unknown_platform_names_are_rejected() {
// 历史别名不进协议口径,由各输入层自己放宽。
for bad in ["", "SNP", "snp", "csv", "optee ", " OP-TEE", "arm", "nope"] {
assert_eq!(PlatformKind::parse(bad), None, "{bad:?} 不该被当成规范名");
}
}
fn snp(site: &str, attested: bool) -> PartyTee {
PartyTee::with_tee(site, PlatformKind::SevSnp, 5, attested)
}
+7
View File
@@ -317,6 +317,13 @@ impl PlatformProfile {
/// 按平台取内置规格;尚未支持直接启动的平台返回 `None`。
///
/// 海光不指定代际时按实测的 CSV2 处理,不做"猜一个能跑的"降级。
///
/// ★ `None` / `Optee` / `Tdx` 没有 qemu 启动规格是**刻意的**,不是漏项:
/// 这几种平台不是靠本框架起 guest 的执行形态。节点自报登记走
/// `TeeNode::parse` → `NodeRegistry::register`,**不经过** [`crate::schedule::admit`];
/// 所以 `GET /nodes` 能看到它们,并不代表它们能被选址起 guest。
/// 别为了让某平台「能注册」就在这里补一份假规格 —— `admit()` 会把它
/// 当成可启动,fail-closed 就破了(2026-11-11 issue #3)。
pub fn builtin(kind: PlatformKind, variant: Option<CsvVariant>) -> Option<Self> {
match kind {
PlatformKind::SevSnp => Some(Self::amd_sev_snp()),
+28 -10
View File
@@ -192,7 +192,9 @@ impl TeeNode {
"site" => site = String::from(val),
"host" => host = String::from(val),
"kind" => {
kind = Some(parse_kind(val).ok_or_else(|| {
// 规范名解析只有一份口径,就在枚举定义处;这里不再另写
// 一份 match —— issue #3 的 optee 节点自报 400 就是这么漏的。
kind = Some(PlatformKind::parse(val).ok_or_else(|| {
TeeError::BadInput(format!("第 {line_no} 行:不认识的平台 {val:?}"))
})?)
}
@@ -260,14 +262,6 @@ impl TeeNode {
}
}
fn parse_kind(s: &str) -> Option<PlatformKind> {
match s {
"sev-snp" => Some(PlatformKind::SevSnp),
"hygon-csv" => Some(PlatformKind::HygonCsv),
_ => None,
}
}
fn parse_bool(v: &str, line_no: usize) -> Result<bool, TeeError> {
match v {
"true" | "1" => Ok(true),
@@ -1001,7 +995,7 @@ mod tests {
fn node_profile_errors_name_the_line() {
for (bad, needle) in [
("foo=1\n", "第 1 行"),
("kind=tdx\n", "第 1 行"),
("kind=nope\n", "第 1 行"),
("measurement=zz\n", "第 1 行"),
("device_present=maybe\n", "第 1 行"),
("tcb=x\n", "第 1 行"),
@@ -1014,6 +1008,30 @@ mod tests {
}
}
/// ★ issue #3:`kind` 必须认得 `PlatformKind` 的**每一个**变体,
/// 且注册表落盘的 descriptor 能被同一份解析读回来。
#[test]
fn node_profile_roundtrips_every_platform_kind() {
for kind in PlatformKind::ALL {
let src = format!(
"site=carol\nhost=192.168.1.233\nkind={kind}\ntcb=1\n\
device_present=false\nqemu_present=false\nfirmware_present=false\n\
image_present=false\nkbs_reachable=false\nmeasurement={}\n\
kbc=offline_fs_kbc\n",
"25".repeat(32)
);
let node = TeeNode::parse(&src)
.unwrap_or_else(|e| panic!("kind={kind} 应当能解析: {e}"));
assert_eq!(node.platform.kind, kind);
// 能力位全 false 不影响「登记」:parse 只记录自报事实,
// 判能力的是 admit,而那条路只在起 guest 时走。
assert!(!node.device_present);
let back = TeeNode::parse(&node.descriptor())
.unwrap_or_else(|e| panic!("kind={kind} 的 descriptor 必须能回环: {e}"));
assert_eq!(back, node, "descriptor() 与 parse() 必须严格互逆");
}
}
#[test]
fn parsed_profile_without_capability_bits_still_denies() {
let mut src = amd_profile();
+64 -33
View File
@@ -29,6 +29,7 @@
"""
import argparse
import base64
import hashlib
import json
import os
@@ -52,6 +53,11 @@ SELF_ASSETS = [
"SHA256SUMS",
]
# mac 目标只服务开发机,不是部署目标。缺它不该阻塞服务端发版 ——
# 强行要求三平台齐全,会让「只改了服务端逻辑、没必要重编 mac」的场景卡住,
# 进而逼着人去手工绕,反而更容易把旧 mac 包混进新 Release。
OPTIONAL_ASSETS = {"mpc-x86_64-apple-darwin"}
def log(msg):
print(msg, flush=True)
@@ -89,10 +95,18 @@ def git_credential():
def api(method, path, user, pwd, data=None, raw=None, ctype=None):
"""调用 Gitea API。data = json body;raw = 二进制 body。"""
"""调用 Gitea API。data = json body;raw = 二进制 body。
★ 必须**主动带 Authorization 头**,不能用 urllib 的 HTTPBasicAuthHandler:
本仓 Gitea 的读接口允许匿名访问(GET 不带凭据也过),
而写接口返回的 401 **不带 WWW-Authenticate 挑战头** ⇒
BasicAuthHandler 永远不会触发重试 ⇒ POST 一律 401「token is required」。
症状:GET 全绿、POST 全 401,看起来像「凭据不对」,其实是「压根没带上」。
"""
url = API + path
body = None
headers = {}
headers = {"Authorization": "Basic " + base64.b64encode(
("%s:%s" % (user, pwd)).encode()).decode()}
if data is not None:
body = json.dumps(data).encode()
headers["Content-Type"] = "application/json"
@@ -101,11 +115,8 @@ def api(method, path, user, pwd, data=None, raw=None, ctype=None):
if ctype:
headers["Content-Type"] = ctype
req = urllib.request.Request(url, data=body, headers=headers, method=method)
mgr = urllib.request.HTTPBasicAuthHandler()
mgr.add_password(realm=None, uri=url, user=user, passwd=pwd)
opener = urllib.request.build_opener(mgr)
try:
with opener.open(req, timeout=300) as r:
with urllib.request.urlopen(req, timeout=300) as r:
payload = r.read()
if not payload:
return {}
@@ -123,47 +134,44 @@ def list_releases(user, pwd):
def remote_asset_index(user, pwd):
"""扫远端所有 Release 的资产 ⇒ {sha256: {name, tag, id, size}}。
"""扫远端所有 Release 的资产 ⇒ {sha256: {name, tag, id, size, url}}。
★ 这是「只发一次」的唯一判据:内容寻址,不靠文件名。
★ 代价:要把每个资产下载一遍算 sha256(依赖资产有 50MB 级的)。
资产数量不大(每版十来个),可接受;换来的是「判据唯一且不会错」。
"""
index = {}
for rel in list_releases(user, pwd):
tag = rel.get("tag_name")
for a in rel.get("assets", []):
aid = a.get("id")
url = a.get("browser_download_url") or ""
dl = a.get("browser_download_url") or ""
# API 给的是 localhost,要换 127.0.0.1 才连得上
url = url.replace("http://localhost:13300", "http://127.0.0.1:13300")
idx_url = "%s/api/v1/repos/%s/releases/%s/assets/%s" % (API, REPO, rel["id"], aid)
meta = api("GET", idx_url, user, pwd)
dl = meta.get("browser_download_url") or url
dl = dl.replace("http://localhost:13300", "http://127.0.0.1:13300")
try:
data = api("GET", "/repos/%s/releases/%s/assets/%s" % (REPO, rel["id"], aid),
user, pwd)
digest = sha256_file_from_url(dl, user, pwd)
except Exception:
digest = None
if digest:
index[digest] = {
"name": a.get("name"),
"tag": tag,
"id": aid,
"size": a.get("size"),
"url": dl,
}
except Exception as e:
print("WARN: 资产 %s 算 sha256 失败(%s)" % (a.get("name"), e))
continue
index[digest] = {
"name": a.get("name"),
"tag": tag,
"id": a.get("id"),
"size": a.get("size"),
"url": dl,
}
return index
def sha256_file_from_url(url, user, pwd):
"""下载并算 sha256(流式,不把大文件整个读进内存)。"""
req = urllib.request.Request(url)
mgr = urllib.request.HTTPBasicAuthHandler()
mgr.add_password(realm=None, uri=url, user=user, passwd=pwd)
opener = urllib.request.build_opener(mgr)
"""下载并算 sha256(流式,不把大文件整个读进内存)。
★ 同样必须主动带 Authorization 头(见 api() 的说明)。
"""
h = hashlib.sha256()
with opener.open(req, timeout=600) as r:
headers = {"Authorization": "Basic " + base64.b64encode(
("%s:%s" % (user, pwd)).encode()).decode()}
req = urllib.request.Request(url, headers=headers)
with urllib.request.urlopen(req, timeout=600) as r:
for chunk in iter(lambda: r.read(1024 * 1024), b""):
h.update(chunk)
return h.hexdigest()
@@ -225,6 +233,9 @@ def main():
for n in SELF_ASSETS:
p = os.path.join(DIST, n)
if not os.path.isfile(p):
if n in OPTIONAL_ASSETS:
log("跳过可选产物(本次未构建):%s" % n)
continue
die("缺少产物:%s(先跑 tools/release-build.sh)" % p)
self_paths.append((n, p))
log("自身产物 %d 个就位" % len(self_paths))
@@ -316,9 +327,29 @@ def main():
log(" 上传 %s" % item["name"])
# ---- 8. 推 tag ----
# 🔴 Gitea 在「创建 Release」那一步就会**自动建同名 tag**(指向默认分支 HEAD),
# 所以走到这里 `git push` 多半会以 `already exists` 失败 —— 那不是错误。
# 判据改成「远端 tag 指向的是不是当前 HEAD」:是就当作成功。
if args.push:
subprocess.run(["git", "push", "origin", tag], check=True)
log("已推送 tag %s" % tag)
r = subprocess.run(["git", "push", "origin", tag],
capture_output=True, text=True)
if r.returncode == 0:
log("已推送 tag %s" % tag)
else:
head = subprocess.run(["git", "rev-parse", "HEAD"],
capture_output=True, text=True).stdout.strip()
remote = subprocess.run(["git", "ls-remote", "--tags", "origin", tag],
capture_output=True, text=True).stdout.strip()
# ls-remote 输出形如:「<sha>\trefs/tags/v0.3.0」
remote_sha = remote.split()[0] if remote.split() else ""
if remote_sha and (remote_sha == head or remote_sha.endswith("^{}")):
log("tag %s 已由 Gitea 建好(指向 %s),无需再推" % (tag, remote_sha[:7]))
elif remote_sha:
die("远端 tag %s 指向 %s,与本地 HEAD %s 不一致 —— 发版前先把提交推上去"
% (tag, remote_sha[:7], head[:7]))
else:
# 真失败(网络/权限),把 git 自己的输出抛出来,别吞
die("推送 tag 失败:%s" % (r.stderr or r.stdout).strip())
log("完成:%s" % tag)
return 0
+122
View File
@@ -0,0 +1,122 @@
#!/usr/bin/env python3
"""从 transcript 里取回某个结构体的**最终版定义**,做块级替换。
背景(2026-11-09):
工作区被 `git reset --hard` 抹掉后,从 transcript 重建时出现了**链式依赖**:
一条 Edit 的 `old_string` 依赖另一条更早的 Edit 的结果,
精确重放会失配 ⇒ 结构体少了字段 ⇒ 编译报错。
与其继续追链,不如**直接取最终版**:
transcript 里每一次 Edit 的 `new_string` 都带着「那一刻的文件片段」,
所以只要按时间顺序找**最后一个**包含该结构体完整定义的 `new_string`,
抽出来整块替换即可。
用法:
python3 tools/restore-structs-from-transcript.py <transcript.jsonl...> \
--file crates/mpc-tee/src/reconciler.rs \
--struct PlacedSession --struct PendingSession
"""
import argparse
import json
import os
import sys
def iter_calls(path):
with open(path, "r", encoding="utf-8", errors="replace") as fh:
for line in fh:
line = line.strip()
if not line.startswith("{"):
continue
try:
obj = json.loads(line)
except ValueError:
continue
if obj.get("type") != "function_call":
continue
args = obj.get("arguments")
if isinstance(args, str):
try:
args = json.loads(args)
except ValueError:
continue
if isinstance(args, dict):
yield obj.get("timestamp", 0), obj.get("name", ""), args
def extract_struct(text, name):
"""抽出 `struct <name> { ... }` 整块(大括号配平)。找不到返回 None。"""
i = text.find("struct %s {" % name)
if i < 0:
return None
j = text.index("{", i)
depth = 0
k = j
while k < len(text):
if text[k] == "{":
depth += 1
elif text[k] == "}":
depth -= 1
if depth == 0:
return text[i:k + 1]
k += 1
return None
def main():
ap = argparse.ArgumentParser()
ap.add_argument("transcript", nargs="+")
ap.add_argument("--file", required=True, help="要修复的仓库内文件")
ap.add_argument("--struct", action="append", required=True, dest="structs")
ap.add_argument("--repo", default=os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
args = ap.parse_args()
repo = os.path.abspath(args.repo)
target = os.path.abspath(args.file)
if not target.startswith(repo + os.sep):
print("目标不在仓库内: %s" % target, file=sys.stderr)
return 2
events = []
for t in args.transcript:
for ts, name, inp in iter_calls(t):
if name in ("Edit", "Write") and inp.get("file_path") == target:
events.append((ts, name, inp))
events.sort(key=lambda e: e[0])
# 每个结构体取「时间上最后一个能抽到完整定义的片段」
final = {}
for ts, name, inp in events:
blob = inp.get("content", "") if name == "Write" else inp.get("new_string", "")
for st in args.structs:
seg = extract_struct(blob, st)
if seg:
final[st] = seg
missing = [s for s in args.structs if s not in final]
if missing:
print("transcript 里找不到这些结构体的完整定义: %s" % ", ".join(missing), file=sys.stderr)
return 3
cur = open(target, encoding="utf-8").read()
changed = []
for st in args.structs:
old_seg = extract_struct(cur, st)
if old_seg is None:
print("当前文件里找不到 struct %s" % st, file=sys.stderr)
return 4
if old_seg == final[st]:
continue
cur = cur.replace(old_seg, final[st], 1)
changed.append(st)
open(target, "w", encoding="utf-8").write(cur)
if changed:
print("已替换结构体: %s" % ", ".join(changed))
else:
print("结构体已是最终版,无需改动")
return 0
if __name__ == "__main__":
sys.exit(main())