From 74ba4fcdbc71af1a51bc2aef2a0e173422636da6 Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Wed, 16 Sep 2026 11:41:03 +0800 Subject: [PATCH 1/2] build(rvps): ignore prost-generated source from rustfmt Add rvps/rustfmt.toml so rustfmt does not reformat src/rvps_api/reference.rs (@generated by prost-build). Each prost-build regen diverges from rustfmt's style, so reformatting the committed file produces noisy diffs. `ignore` is an unstable rustfmt option that takes effect under the nightly rustfmt used in CI (.github/workflows/rust-check.yml) and is a no-op (with a warning) on stable. Assisted-by: Claude:glm-5.2 --- rvps/rustfmt.toml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 rvps/rustfmt.toml diff --git a/rvps/rustfmt.toml b/rvps/rustfmt.toml new file mode 100644 index 0000000..3538ef1 --- /dev/null +++ b/rvps/rustfmt.toml @@ -0,0 +1,9 @@ +# Exclude prost-generated sources from formatting: each prost-build regen would +# re-diverge from rustfmt's style, producing noisy diffs. rustfmt's `ignore` is an +# unstable option — it takes effect under the nightly rustfmt used in CI +# (see .github/workflows/rust-check.yml) and is a no-op (with a warning) on stable. +# Add new @generated paths here as they appear. +unstable_features = true +ignore = [ + "src/rvps_api/reference.rs", +] From 30936748154175f08484dc448832a1b2a3c86c8b Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Wed, 16 Sep 2026 11:41:38 +0800 Subject: [PATCH 2/2] feat(rekor): migrate v2 uploads and verifications from dsse to hashedrekord log2025-1.rekor.sigstore.dev (Rekor v2) now rejects the deprecated dsseRequestV002 entry type with "invalid type, must be hashedrekord", breaking make test-dep-as and any flow that writes a DSSE entry to the v2 log. Per Rekor's deprecation note ("use the hash of the DSSE PAE"), post a hashedRekordRequestV002 entry whose digest is sha256(DSSE PAE) and whose signature is the existing DSSE signature (ECDSA-SHA256 over the PAE equals a signature over sha256(PAE)). No re-signing or trust-model change; the DSSE envelope and its verification are unchanged. - rv-release-tool upload_rekor_v2 and as-signer-transparency upload_rekor_v2: post hashedRekordRequestV002 (digest = sha256(PAE), reuse the DSSE signature, same SPKI public key). - as-signer-transparency: embed rekor.pae_sha256 (= sha256(PAE)) in the signer_transparency bundle and set request_type to hashedRekordRequestV002, so the verifier can bind the entry without reconstructing the PAE bytes (the bundle carries the parsed payload, not the raw signed bytes). - rvps verify_rekor_v2_consistency (lib.rs and release_manifest.rs): add a hashedrekord branch that reconstructs the PAE from the dsseEnvelope's payloadType + payload and compares sha256(PAE) to the entry's hashedRekordV002.data.digest. The legacy dsse branch is kept. - New dsse_pae helper in rvps/src/lib.rs. Tests: verify_rekor_v2_consistency hashedrekord accept/reject in both lib.rs and release_manifest.rs, plus a real-fixture test against a genuine log2025-1 hashedrekord/0.0.2 entry (rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json); both uploads verified live against log2025-1 (HTTP 201, hashedrekord/0.0.2). Assisted-by: Claude:glm-5.2 --- rvps/src/lib.rs | 135 ++++++++++++++++-- rvps/src/rv_list/release_manifest.rs | 133 +++++++++++++++-- .../rekor_v2_hashedrekord_bundle.json | 54 +++++++ .../as-signer-transparency | 36 +++-- tools/slsa/rv-release-tool | 46 +++--- 5 files changed, 342 insertions(+), 62 deletions(-) create mode 100644 rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json diff --git a/rvps/src/lib.rs b/rvps/src/lib.rs index 89f024a..602df88 100644 --- a/rvps/src/lib.rs +++ b/rvps/src/lib.rs @@ -529,6 +529,22 @@ fn dsse_payload_statement(value: &Value) -> Result> { Ok(Some(statement)) } +/// DSSE Pre-Auth Encoding (PAE): `DSSEv1 payloadType payload`. +/// Needed to verify a Rekor v2 `hashedrekord` entry, which records `sha256(PAE)` +/// rather than `sha256(payload)`. +pub(crate) fn dsse_pae(payload_type: &[u8], payload: &[u8]) -> Vec { + let mut out = Vec::with_capacity(payload_type.len() + payload.len() + 32); + out.extend_from_slice(b"DSSEv1 "); + out.extend_from_slice(payload_type.len().to_string().as_bytes()); + out.push(b' '); + out.extend_from_slice(payload_type); + out.push(b' '); + out.extend_from_slice(payload.len().to_string().as_bytes()); + out.push(b' '); + out.extend_from_slice(payload); + out +} + fn verify_rekor_v2_consistency(value: &Value) -> Result<()> { let dsse = value .get("dsseEnvelope") @@ -551,7 +567,7 @@ fn verify_rekor_v2_consistency(value: &Value) -> Result<()> { let payload_bytes = base64::engine::general_purpose::STANDARD .decode(payload_b64) .context("decode dsseEnvelope.payload for Rekor v2 verification")?; - let payload_sha256 = sha2::Sha256::digest(payload_bytes); + let payload_sha256 = sha2::Sha256::digest(&payload_bytes); let payload_sha256_b64 = base64::engine::general_purpose::STANDARD.encode(payload_sha256); let canonicalized_body_b64 = tlog_entry @@ -570,20 +586,48 @@ fn verify_rekor_v2_consistency(value: &Value) -> Result<()> { .and_then(|v| v.as_str()) .unwrap_or_default() .to_ascii_lowercase(); - if kind != "dsse" { - bail!("Rekor v2 canonicalizedBody kind `{kind}` is not dsse"); - } - - let rekor_payload_digest = canonicalized_json - .pointer("/spec/dsseV002/data/digest") - .or_else(|| canonicalized_json.pointer("/spec/dsseV002/payloadHash/digest")) - .and_then(|v| v.as_str()) - .ok_or_else(|| anyhow::anyhow!("Rekor v2 canonicalizedBody missing dsse payload digest"))?; - - if rekor_payload_digest != payload_sha256_b64 { - bail!( - "Rekor v2 digest mismatch: rekor=`{rekor_payload_digest}`, payload_sha256_b64=`{payload_sha256_b64}`" - ); + match kind.as_str() { + // Legacy DSSE v2 entry: records sha256(payload). + "dsse" => { + let rekor_payload_digest = canonicalized_json + .pointer("/spec/dsseV002/data/digest") + .or_else(|| canonicalized_json.pointer("/spec/dsseV002/payloadHash/digest")) + .and_then(|v| v.as_str()) + .ok_or_else(|| anyhow::anyhow!("Rekor v2 dsse body missing payload digest"))?; + if rekor_payload_digest != payload_sha256_b64 { + bail!( + "Rekor v2 dsse digest mismatch: rekor=`{rekor_payload_digest}`, payload_sha256_b64=`{payload_sha256_b64}`" + ); + } + } + // hashedrekord v2 entry (log2025-1 now only accepts this for new entries): + // records sha256(DSSE PAE), not sha256(payload). Reconstruct the PAE from + // the dsseEnvelope's payloadType + payload and compare. + "hashedrekord" => { + let rekor_digest = canonicalized_json + .pointer("/spec/hashedRekordV002/data/digest") + .and_then(|v| v.as_str()) + .ok_or_else(|| anyhow::anyhow!("Rekor v2 hashedrekord body missing data.digest"))?; + let payload_type = dsse + .get("payloadType") + .and_then(|v| v.as_str()) + .ok_or_else(|| { + anyhow::anyhow!( + "dsseEnvelope.payloadType missing for hashedrekord verification" + ) + })?; + let pae = dsse_pae(payload_type.as_bytes(), &payload_bytes); + let pae_sha256_b64 = + base64::engine::general_purpose::STANDARD.encode(sha2::Sha256::digest(&pae)); + if rekor_digest != pae_sha256_b64 { + bail!( + "Rekor v2 hashedrekord digest mismatch: rekor=`{rekor_digest}`, pae_sha256_b64=`{pae_sha256_b64}`" + ); + } + } + other => { + bail!("Rekor v2 canonicalizedBody kind `{other}` is neither dsse nor hashedrekord"); + } } Ok(()) @@ -635,6 +679,67 @@ mod tests { assert!(docs[0].contains("predicateType")); } + // log2025-1 now only accepts hashedrekord for new entries; the entry records + // sha256(DSSE PAE), so verify_rekor_v2_consistency must reconstruct the PAE + // from the dsseEnvelope's payloadType + payload and compare. + #[test] + fn verify_rekor_v2_consistency_accepts_hashedrekord() { + let payload = br#"{"_type":"x"}"#; + let payload_type = "application/vnd.trustee.rv.release+json"; + let payload_b64 = base64::engine::general_purpose::STANDARD.encode(payload); + let pae = dsse_pae(payload_type.as_bytes(), payload); + let pae_sha256_b64 = + base64::engine::general_purpose::STANDARD.encode(sha2::Sha256::digest(&pae)); + let canonicalized_body = base64::engine::general_purpose::STANDARD.encode( + serde_json::json!({ + "kind": "hashedrekord", + "apiVersion": "0.0.2", + "spec": { "hashedRekordV002": { "data": { "algorithm": "SHA2_256", "digest": pae_sha256_b64 } } } + }) + .to_string() + .as_bytes(), + ); + let value = serde_json::json!({ + "dsseEnvelope": { "payload": payload_b64, "payloadType": payload_type, "signatures": [{"sig":"x"}] }, + "rekorEntryV2": { "canonicalizedBody": canonicalized_body } + }); + assert!(verify_rekor_v2_consistency(&value).is_ok()); + } + + #[test] + fn verify_rekor_v2_consistency_rejects_hashedrekord_mismatch() { + let payload = br#"{"_type":"x"}"#; + let payload_type = "application/vnd.trustee.rv.release+json"; + let payload_b64 = base64::engine::general_purpose::STANDARD.encode(payload); + let canonicalized_body = base64::engine::general_purpose::STANDARD.encode( + serde_json::json!({ + "kind": "hashedrekord", + "spec": { "hashedRekordV002": { "data": { "algorithm": "SHA2_256", "digest": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" } } } + }) + .to_string() + .as_bytes(), + ); + let value = serde_json::json!({ + "dsseEnvelope": { "payload": payload_b64, "payloadType": payload_type, "signatures": [{"sig":"x"}] }, + "rekorEntryV2": { "canonicalizedBody": canonicalized_body } + }); + assert!(verify_rekor_v2_consistency(&value).is_err()); + } + + // Real bundle produced by rv-release-tool against log2025-1 (a genuine + // hashedrekord/0.0.2 transparency-log entry). The entry's + // hashedRekordV002.data.digest must equal sha256(DSSE PAE) reconstructed + // from the bundle's dsseEnvelope. + #[test] + fn verify_rekor_v2_consistency_accepts_real_hashedrekord_bundle() { + let raw = include_str!("../tests/fixtures/rekor_v2_hashedrekord_bundle.json"); + let value: Value = serde_json::from_str(raw).expect("parse real fixture"); + assert!( + verify_rekor_v2_consistency(&value).is_ok(), + "real hashedrekord bundle from log2025-1 must verify" + ); + } + fn in_memory_rvps() -> Rvps { Rvps::new(Config { storage: ReferenceValueStorageConfig::InMemory(in_memory::Config::default()), diff --git a/rvps/src/rv_list/release_manifest.rs b/rvps/src/rv_list/release_manifest.rs index a95d3a6..ab90b54 100644 --- a/rvps/src/rv_list/release_manifest.rs +++ b/rvps/src/rv_list/release_manifest.rs @@ -269,20 +269,54 @@ fn verify_rekor_v2_consistency(value: &Value) -> Result<()> { .and_then(|v| v.as_str()) .unwrap_or_default() .to_ascii_lowercase(); - if kind != "dsse" { - bail!("Rekor v2 canonicalizedBody kind `{kind}` is not dsse"); - } - - let rekor_payload_digest = canonicalized_json - .pointer("/spec/dsseV002/data/digest") - .or_else(|| canonicalized_json.pointer("/spec/dsseV002/payloadHash/digest")) - .and_then(|v| v.as_str()) - .ok_or_else(|| anyhow!("Rekor v2 canonicalizedBody missing dsse payload digest"))?; - - if rekor_payload_digest != payload_sha256_b64 { - bail!( - "Rekor v2 digest mismatch: rekor=`{rekor_payload_digest}`, payload_sha256_b64=`{payload_sha256_b64}`" - ); + match kind.as_str() { + "dsse" => { + let rekor_payload_digest = canonicalized_json + .pointer("/spec/dsseV002/data/digest") + .or_else(|| canonicalized_json.pointer("/spec/dsseV002/payloadHash/digest")) + .and_then(|v| v.as_str()) + .ok_or_else(|| anyhow!("Rekor v2 dsse body missing payload digest"))?; + if rekor_payload_digest != payload_sha256_b64 { + bail!( + "Rekor v2 dsse digest mismatch: rekor=`{rekor_payload_digest}`, payload_sha256_b64=`{payload_sha256_b64}`" + ); + } + } + // hashedrekord v2 entry (log2025-1 now only accepts this for new entries): + // records sha256(DSSE PAE), not sha256(payload). Reconstruct the PAE from + // the dsseEnvelope's payloadType + payload and compare. + "hashedrekord" => { + let rekor_digest = canonicalized_json + .pointer("/spec/hashedRekordV002/data/digest") + .and_then(|v| v.as_str()) + .ok_or_else(|| anyhow!("Rekor v2 hashedrekord body missing data.digest"))?; + let payload_b64 = dsse + .get("payload") + .and_then(|v| v.as_str()) + .ok_or_else(|| { + anyhow!("dsseEnvelope.payload missing for hashedrekord verification") + })?; + let payload_bytes = base64::engine::general_purpose::STANDARD + .decode(payload_b64) + .context("decode dsseEnvelope.payload for hashedrekord verification")?; + let payload_type = dsse + .get("payloadType") + .and_then(|v| v.as_str()) + .ok_or_else(|| { + anyhow!("dsseEnvelope.payloadType missing for hashedrekord verification") + })?; + let pae = crate::dsse_pae(payload_type.as_bytes(), &payload_bytes); + let pae_sha256_b64 = + base64::engine::general_purpose::STANDARD.encode(Sha256::digest(&pae)); + if rekor_digest != pae_sha256_b64 { + bail!( + "Rekor v2 hashedrekord digest mismatch: rekor=`{rekor_digest}`, pae_sha256_b64=`{pae_sha256_b64}`" + ); + } + } + other => { + bail!("Rekor v2 canonicalizedBody kind `{other}` is neither dsse nor hashedrekord"); + } } Ok(()) @@ -396,4 +430,75 @@ mod tests { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ); } + + // log2025-1 only accepts hashedrekord for new entries; the bundle's + // rekorEntryV2 then carries a hashedrekord body whose data.digest is + // sha256(DSSE PAE). verify_rekor_v2_consistency must reconstruct the PAE + // from the dsseEnvelope and accept a matching digest. + #[test] + fn parse_bundle_with_rekor_v2_hashedrekord() { + let manifest = r#"{"measurements":{"custom_name":{"algorithm":"sha256","value":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}},"schemaVersion":1}"#; + let payload = base64::engine::general_purpose::STANDARD.encode(manifest.as_bytes()); + let dsse = serde_json::json!({ + "payloadType": RV_RELEASE_PAYLOAD_TYPE, + "payload": payload, + "signatures": [{"sig": "abc"}] + }); + let pae = crate::dsse_pae(RV_RELEASE_PAYLOAD_TYPE.as_bytes(), manifest.as_bytes()); + let pae_sha256_b64 = base64::engine::general_purpose::STANDARD.encode(Sha256::digest(&pae)); + let body = serde_json::json!({ + "kind": "hashedrekord", + "apiVersion": "0.0.2", + "spec": { + "hashedRekordV002": { + "data": { "algorithm": "SHA2_256", "digest": pae_sha256_b64 } + } + } + }); + let body_b64 = base64::engine::general_purpose::STANDARD.encode(body.to_string()); + let bundle = serde_json::json!({ + "releasePayload": serde_json::from_str::(manifest).unwrap(), + "dsseEnvelope": dsse, + "rekorEntryV2": { "canonicalizedBody": body_b64 } + }); + + let docs = + parse_release_manifest_documents_from_material(bundle.to_string().as_bytes()).unwrap(); + let digests = extract_release_manifest_digests(&docs[0], "custom_name").unwrap(); + assert_eq!( + digests[0].1, + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ); + } + + #[test] + fn parse_bundle_rejects_hashedrekord_digest_mismatch() { + let manifest = r#"{"measurements":{"custom_name":{"algorithm":"sha256","value":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}},"schemaVersion":1}"#; + let payload = base64::engine::general_purpose::STANDARD.encode(manifest.as_bytes()); + let dsse = serde_json::json!({ + "payloadType": RV_RELEASE_PAYLOAD_TYPE, + "payload": payload, + "signatures": [{"sig": "abc"}] + }); + let body = serde_json::json!({ + "kind": "hashedrekord", + "spec": { + "hashedRekordV002": { + "data": { "algorithm": "SHA2_256", "digest": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" } + } + } + }); + let body_b64 = base64::engine::general_purpose::STANDARD.encode(body.to_string()); + let bundle = serde_json::json!({ + "releasePayload": serde_json::from_str::(manifest).unwrap(), + "dsseEnvelope": dsse, + "rekorEntryV2": { "canonicalizedBody": body_b64 } + }); + + let result = parse_release_manifest_documents_from_material(bundle.to_string().as_bytes()); + assert!( + result.is_err(), + "hashedrekord digest mismatch must fail release manifest parse" + ); + } } diff --git a/rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json b/rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json new file mode 100644 index 0000000..e06af4e --- /dev/null +++ b/rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json @@ -0,0 +1,54 @@ +{ + "dsseEnvelope": { + "payload": "eyJtZWFzdXJlbWVudHMiOnsicnZ0ZXN0Ijp7ImFsZ29yaXRobSI6InNoYTI1NiIsInZhbHVlIjoiYjhiMmZlNzlhY2RhYjVkNDEwYTUzY2Q2NzhjYzU1ZDg4MjU3MTJlZjkyYjJlYzFkZDVhNDY3MzA1YzI0OWY3MyJ9fSwic2NoZW1hVmVyc2lvbiI6MX0=", + "payloadType": "application/vnd.trustee.rv.release+json", + "signatures": [ + { + "sig": "MEUCIQDbOY32WTMZkKx4KpoSc8sc+LljQGEeiAweUu/GGxadfwIgDwwdybaSpLKKY87cH/IO5HEOLRmvTOdcGpLCEKFb8y8=" + } + ] + }, + "rekorEntryV2": { + "logIndex": "111826902", + "logId": { + "keyId": "zxGZFVvd0FEmjR8WrFwMdcAJ9vtaY/QXf44Y1wUeP6A=" + }, + "kindVersion": { + "kind": "hashedrekord", + "version": "0.0.2" + }, + "integratedTime": "0", + "inclusionPromise": null, + "inclusionProof": { + "logIndex": "111826902", + "rootHash": "+J9Yylj5/32lWXILQsQU91jAZLluViKenOpsK0RBzw4=", + "treeSize": "111827011", + "hashes": [ + "f6TF0RVc6T3QwHrZUGeK+gtUZ1XCbtEqfdpLc7sM/Y0=", + "Zh2zM82Lc+OGDC1wE8bV+lknxFl2z+skO3oIFp+F6S4=", + "5gGNomwvRPOkaAKzol+GiDXlfen4cI4z3KTnlJDyY/M=", + "Keejk/H8aZLiP0fHnl3BhtmlxLySE6p8cT7l3wgQzGU=", + "1EmmADaWv4NQpMIjMfBqFtYDHJ4EN+XxL/4a5POT5/o=", + "+57y5czTEDOYaLgMNfLD+yqAw+wursUBRl3T1OHcZhU=", + "Us+XPjK01NV/2JXF8LChkPNAgW755e4h7+FGCRQ6hsc=", + "ioMMYosrr/o2NiZsZ3EeZfInGEyVZrERRRyXBd1xgLM=", + "r+X/gompimcPpnWpbaynxdCZNTfBPINQPa+Y602a//Q=", + "6CW0yQMt0wP/PurMoyvhB3+wDFuEirGhhZl8XZQ0fdE=", + "p3pSahADFuVVs6yZ2dNwh1veKqpGjkS9MsDZ83zOm8U=", + "2GKG4IjXgLCfMWxOjdmgzVIptFmnGUREEmGx2MSTUNU=", + "taM/b3j8J6ui6FMTTmOsM+tqhid87t19IyIRLSyufaQ=", + "IUg1sGJyGbCHviZQicXEMRHrYLIoCwEtwELPkKdrCWM=", + "PukSxUSb7K9mtpl6I63w29mC7gNQq5ZwiDDxEF1GyxA=", + "hE4NQGAs0hqjwPj3QBg0CvlkLaEZPGC0zTdqKdS7jm8=", + "mqj8PK8F++qMYSLUGdLdTTVm0E1oULFNQA/uSht+igo=", + "4866n0jv/tvGy+h/6S+S3jx6NwVwYBbq5gPvTFu0W/Q=", + "DECASkV0PLAoTmCeGsJLmGUoDnCLklA8TLwgwSRKqR4=", + "sDYoZXiXRY28yAw+Ct6svsySOEvSboUP6XGd0w9Avn8=" + ], + "checkpoint": { + "envelope": "log2025-1.rekor.sigstore.dev\n111827011\n+J9Yylj5/32lWXILQsQU91jAZLluViKenOpsK0RBzw4=\n\n\u2014 log2025-1.rekor.sigstore.dev zxGZFTRSXah4AbH2hkRDOV32W8a6fBqfRZD3gckHT2Pp4shVUnlh8lnLparve+BEg9xiPml8rS0hLfxufsJFvStl0Ac=\n\u2014 witness.stagemole.eu Z/euoAAAAABqqhBPS0vjBck+rEV/nuOFF2TYZbbc/Qznm0bdJcFQqzNEyz6yL5vN0+eI29esuMW4P0m9LRwg8HHRsH7qpDM1gt7cCw==\n\u2014 staging.witness.transparency.goog/ring-any-bells LhqNyQAAAABqqhBPlXLRImyka9/wYwO0eLVDjlg0qQpisLnbO9sHq5glVrZUopNNHwgbsYPpf/HycUpv6TIMwZ7CslYjekkDk5OYBw==\n\u2014 witness.navigli.sunlight.geomys.org o+AP4gAAAABqqhBP5y91z9RXQ5PuPb76ZOWFwCInP55WsnJzhsvqwN7BwTkF5nqyPRjgzfZBAsNGbfReeTpsm2fqQxUbPOxowXOGAA==\n" + } + }, + "canonicalizedBody": "eyJhcGlWZXJzaW9uIjoiMC4wLjIiLCJraW5kIjoiaGFzaGVkcmVrb3JkIiwic3BlYyI6eyJoYXNoZWRSZWtvcmRWMDAyIjp7ImRhdGEiOnsiYWxnb3JpdGhtIjoiU0hBMl8yNTYiLCJkaWdlc3QiOiJnakVhZnpIQTFlU2pMREU5ZDBRa21meExGUFZITjdwNElmMnROb0EvaHdrPSJ9LCJzaWduYXR1cmUiOnsiY29udGVudCI6Ik1FVUNJUURiT1kzMldUTVprS3g0S3BvU2M4c2MrTGxqUUdFZWlBd2VVdS9HR3hhZGZ3SWdEd3dkeWJhU3BMS0tZODdjSC9JTzVIRU9MUm12VE9kY0dwTENFS0ZiOHk4PSIsInZlcmlmaWVyIjp7ImtleURldGFpbHMiOiJQS0lYX0VDRFNBX1AyNTZfU0hBXzI1NiIsInB1YmxpY0tleSI6eyJyYXdCeXRlcyI6Ik1Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTFuaCt4WFZEUUVtcG9Ya1NxTVE0RWQyUUI2dXVOVFNaVFY2UG1HakYxazRha1p0MzQ2cHpoOUhwcExQdFBNcThrdjBBT25TRXV6SDFxVVlKQk5SZ25RPT0ifX19fX19" + } +} diff --git a/tools/as-signer-transparency/as-signer-transparency b/tools/as-signer-transparency/as-signer-transparency index 52b9899..c7a878f 100755 --- a/tools/as-signer-transparency/as-signer-transparency +++ b/tools/as-signer-transparency/as-signer-transparency @@ -210,7 +210,7 @@ upload_rekor_v2() { local request_file="$5" local payload_type="application/vnd.trustee.as.signer-binding+json" - local pae_file sig_file pub_der_file payload_b64 sig_b64 pub_der_b64 + local pae_file sig_file pub_der_file sig_b64 pub_der_b64 pae_file="$(mktemp)" sig_file="$(mktemp)" pub_der_file="$(mktemp)" @@ -219,29 +219,29 @@ upload_rekor_v2() { openssl dgst -sha256 -sign "$key_path" -out "$sig_file" "$pae_file" openssl pkey -in "$key_path" -pubout -outform DER -out "$pub_der_file" - payload_b64="$(base64 -w0 "$payload_file")" sig_b64="$(base64 -w0 "$sig_file")" pub_der_b64="$(base64 -w0 "$pub_der_file")" + # Rekor v2 (log2025-1) rejects the deprecated dsseRequestV002; post a + # hashedRekordRequestV002 entry whose digest = sha256(DSSE PAE) and whose + # signature is the existing DSSE signature (ECDSA-SHA256 over the PAE == a + # signature over sha256(PAE)). No re-signing or trust-model change. + digest_b64="$(openssl dgst -sha256 -binary "$pae_file" | base64 -w0)" jq -n \ - --arg payload "$payload_b64" \ - --arg payloadType "$payload_type" \ + --arg digest "$digest_b64" \ --arg sig "$sig_b64" \ - --arg keyDetails "$key_details" \ --arg rawBytes "$pub_der_b64" \ + --arg keyDetails "$key_details" \ '{ - dsseRequestV002: { - envelope: { - payload: $payload, - payloadType: $payloadType, - signatures: [{ sig: $sig, keyid: "" }] - }, - verifiers: [ - { + hashedRekordRequestV002: { + digest: $digest, + signature: { + content: $sig, + verifier: { publicKey: { rawBytes: $rawBytes }, keyDetails: $keyDetails } - ] + } } }' > "$request_file" @@ -368,6 +368,10 @@ upload_rekor_v2 "$KEY_PATH" "$BINDING_PATH" "$KEY_DETAILS" "$REKOR_ENTRY_PATH" " PAYLOAD_SHA256="$(sha256_file "$BINDING_PATH")" PAYLOAD_SIZE="$(wc -c < "$BINDING_PATH" | tr -d ' ')" +# sha256(DSSE PAE) in base64 — the digest the hashedrekord entry records. Embedded +# so the verifier can bind the rekor entry to this binding without reconstructing +# the PAE bytes (the bundle carries the parsed payload, not the raw signed bytes). +PAE_SHA256_B64="$(jq -r '.hashedRekordRequestV002.digest' "$REKOR_REQUEST_PATH")" GENERATED_AT="$(date -u +%Y-%m-%dT%H:%M:%SZ)" jq -n \ @@ -379,6 +383,7 @@ jq -n \ --argjson payload_size "$PAYLOAD_SIZE" \ --arg rekor_url "$REKOR_URL" \ --arg key_details "$KEY_DETAILS" \ + --arg pae_sha256 "$PAE_SHA256_B64" \ --slurpfile payload "$BINDING_PATH" \ --slurpfile rekorEntryV2 "$REKOR_ENTRY_PATH" \ '{ @@ -394,8 +399,9 @@ jq -n \ rekor: { url: $rekor_url, api_version: "v2", - request_type: "dsseRequestV002", + request_type: "hashedRekordRequestV002", key_details: $key_details, + pae_sha256: $pae_sha256, rekorEntryV2: $rekorEntryV2[0] } }' > "$TRANSPARENCY_PATH" diff --git a/tools/slsa/rv-release-tool b/tools/slsa/rv-release-tool index c9a3e53..6fdd96a 100755 --- a/tools/slsa/rv-release-tool +++ b/tools/slsa/rv-release-tool @@ -290,35 +290,45 @@ upload_rekor_v2() { local output_file="$5" local req_file="$6" - local payload payload_type sig pub_der_b64 - payload=$(jq -r '.payload // empty' "$envelope") - payload_type=$(jq -r '.payloadType // empty' "$envelope") + # Rekor v2 (log2025-*.rekor.sigstore.dev) permanently rejects the deprecated + # dsseRequestV002 entry type with "invalid type, must be hashedrekord". The + # official migration (rekor-tiles deprecation note) is: post a + # hashedRekordRequestV002 entry whose digest = sha256(DSSE PAE) and whose + # signature is the existing DSSE signature. ECDSA/SHA-256 signs the digest, so + # the DSSE signature over the PAE is a valid signature over sha256(PAE); no + # re-signing or trust-model change is needed. + local pae_file="$out_dir/release-pae.bin" + if [ ! -f "$pae_file" ]; then + echo "缺少 DSSE PAE 文件: $pae_file(应由 sign_dsse_envelope 生成)" >&2 + return 1 + fi + + local sig sig=$(jq -r '.signatures[0].sig // empty' "$envelope") - if [[ -z "$payload" || -z "$payload_type" || -z "$sig" ]]; then - echo "DSSE envelope 缺少 payload/payloadType/signatures[0].sig" >&2 + if [ -z "$sig" ]; then + echo "DSSE envelope 缺少 signatures[0].sig" >&2 return 1 fi + local digest_b64 pub_der_b64 + digest_b64=$(openssl dgst -sha256 -binary "$pae_file" | base64 -w0) pub_der_b64=$(openssl pkey -pubin -in "$pubkey" -outform DER | base64 -w0) + jq -n \ - --arg payload "$payload" \ - --arg payloadType "$payload_type" \ + --arg digest "$digest_b64" \ --arg sig "$sig" \ - --arg keyDetails "$key_details" \ --arg rawBytes "$pub_der_b64" \ + --arg keyDetails "$key_details" \ '{ - dsseRequestV002: { - envelope: { - payload: $payload, - payloadType: $payloadType, - signatures: [{ sig: $sig, keyid: "" }] - }, - verifiers: [ - { + hashedRekordRequestV002: { + digest: $digest, + signature: { + content: $sig, + verifier: { publicKey: { rawBytes: $rawBytes }, keyDetails: $keyDetails } - ] + } } }' > "$req_file" @@ -329,7 +339,7 @@ upload_rekor_v2() { -H 'Content-Type: application/json' \ --data-binary @"$req_file") if [[ "$code" -lt 200 || "$code" -ge 300 ]]; then - echo "上传 Rekor v2 失败,HTTP $code,响应:" >&2 + echo "上传 Rekor v2 hashedrekord 失败,HTTP $code,响应:" >&2 cat "$output_file" >&2 || true return 1 fi