Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions rvps/rustfmt.toml
Original file line number Diff line number Diff line change
@@ -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",
]
135 changes: 120 additions & 15 deletions rvps/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,22 @@ fn dsse_payload_statement(value: &Value) -> Result<Option<String>> {
Ok(Some(statement))
}

/// DSSE Pre-Auth Encoding (PAE): `DSSEv1 <len payloadType> payloadType <len payload> 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<u8> {
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")
Expand All @@ -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
Expand All @@ -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(())
Expand Down Expand Up @@ -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()),
Expand Down
133 changes: 119 additions & 14 deletions rvps/src/rv_list/release_manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand Down Expand Up @@ -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::<Value>(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::<Value>(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"
);
}
}
54 changes: 54 additions & 0 deletions rvps/tests/fixtures/rekor_v2_hashedrekord_bundle.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading
Loading