diff --git a/oxa/Cargo.lock b/oxa/Cargo.lock index 353a5c1fc..794a50c44 100644 --- a/oxa/Cargo.lock +++ b/oxa/Cargo.lock @@ -327,6 +327,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "constant_time_eq" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9" +dependencies = [ + "rustversion", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1097,6 +1106,18 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77730ed34f01f4990cb2ea67fec715ecebc6fab9a6396cf83c5529b13f581bdc" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "num-bigint" version = "0.4.8" @@ -1183,6 +1204,7 @@ dependencies = [ "serde_json", "sha2", "signal-hook", + "zip", ] [[package]] @@ -1355,7 +1377,7 @@ dependencies = [ name = "oxa-proto" version = "0.2.0" dependencies = [ - "nix", + "nix 0.30.1", "serde_json", ] @@ -1481,7 +1503,7 @@ dependencies = [ "futures-util", "getrandom 0.3.4", "hmac", - "nix", + "nix 0.30.1", "num-traits", "oxa-engine", "oxa-proto", @@ -1498,7 +1520,7 @@ version = "0.2.0" dependencies = [ "async-io", "futures-lite", - "nix", + "nix 0.30.1", "oxa-engine", "oxa-fake", "oxa-proto", @@ -2379,6 +2401,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typed-path" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e" + [[package]] name = "typenum" version = "1.20.1" @@ -2972,6 +3000,20 @@ name = "zeroize" version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] [[package]] name = "zerotrie" @@ -3006,6 +3048,25 @@ dependencies = [ "syn 3.0.10", ] +[[package]] +name = "zip" +version = "9.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953a376f4930ed5af88e1e65948385f76866b45e7f75b21ac275327d0eeb9b46" +dependencies = [ + "constant_time_eq", + "crc32fast", + "flate2", + "getrandom 0.4.3", + "indexmap", + "libc", + "memchr", + "nix 0.32.0", + "typed-path", + "windows-sys 0.61.2", + "zeroize", +] + [[package]] name = "zlib-rs" version = "0.6.8" diff --git a/oxa/oxa-cli/Cargo.toml b/oxa/oxa-cli/Cargo.toml index 822043843..1ae35c97f 100644 --- a/oxa/oxa-cli/Cargo.toml +++ b/oxa/oxa-cli/Cargo.toml @@ -51,6 +51,7 @@ pulldown-cmark = { version = "0.13.6", default-features = false } [dev-dependencies] oxa-fake.workspace = true +zip = { version = "9.6.1", default-features = false, features = ["deflate-flate2-zlib-rs"] } [target.'cfg(target_os = "linux")'.dev-dependencies] oxa-orchestrator = { path = "../oxa-orchestrator", features = ["a2a"] } diff --git a/oxa/oxa-cli/tests/work_shadow.rs b/oxa/oxa-cli/tests/work_shadow.rs index a2496edf2..0d15e5bb4 100644 --- a/oxa/oxa-cli/tests/work_shadow.rs +++ b/oxa/oxa-cli/tests/work_shadow.rs @@ -989,7 +989,24 @@ fn real_shadow_cli_records_exact_queue_evidence_only_when_opted_in() { fn report_policy_records_only_archives_verified_for_all_required_failed_checks() { use serde_json::{json, Value}; use sha2::{Digest, Sha256}; + use std::io::{Cursor, Write}; + use zip::{write::SimpleFileOptions, CompressionMethod, ZipWriter}; let (env, mut detail) = fixture(); + fs::rename(env.tmp().join("gh"), env.tmp().join("gh-fixture")).unwrap(); + let gh = env.write( + "tmp/gh", + r#"#!/bin/sh +if [ "$1 $2 $3" = 'api --hostname github.com' ]; then + case "$#:$4:$5:$6:$7" in + '7:--include:graphql:-f:query=query{'*|'6:--method:GET:repos/example/repo/actions/'*':') + exec "$0-fixture" "$@" ;; + esac +fi +printf 'unexpected command\n' >> unexpected-github-command +exit 94 +"#, + ); + fs::set_permissions(gh, fs::Permissions::from_mode(0o700)).unwrap(); let second_head = "second-synthetic-head"; let group = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; let workflow_path = ".github/workflows/checks.yml"; @@ -1025,6 +1042,7 @@ fn report_policy_records_only_archives_verified_for_all_required_failed_checks() second["headRefOid"] = second_head.into(); second["timelineItems"]["nodes"][0]["id"] = "removal-2".into(); rows["p43"] = second; + let valid_queue = queue.clone(); write("queue.json", queue.clone()); write( "report-attempt.json", @@ -1054,9 +1072,24 @@ fn report_policy_records_only_archives_verified_for_all_required_failed_checks() ); fs::set_permissions(&policy, fs::Permissions::from_mode(0o600)).unwrap(); - let bytes = b"synthetic opaque report bytes"; - fs::write(env.work().join("report.zip"), bytes).unwrap(); - let digest = format!("{:x}", Sha256::digest(bytes)); + let mut archive = ZipWriter::new(Cursor::new(Vec::new())); + archive + .start_file( + "junit.xml", + SimpleFileOptions::default().compression_method(CompressionMethod::Deflated), + ) + .unwrap(); + archive + .write_all( + br#" + + synthetic output +"#, + ) + .unwrap(); + let bytes = archive.finish().unwrap().into_inner(); + fs::write(env.work().join("report.zip"), &bytes).unwrap(); + let digest = format!("{:x}", Sha256::digest(&bytes)); let listing = |sha256: &str| { json!({"total_count":1,"artifacts":[{"id":71,"name":"report-1", "size_in_bytes":bytes.len(),"digest":format!("sha256:{sha256}"),"expired":false, @@ -1081,6 +1114,7 @@ fn report_policy_records_only_archives_verified_for_all_required_failed_checks() let row = &sample["queue_rejections"][index]; assert_eq!(row["number"], number); assert_eq!(row["removal_event"], event); + assert_eq!(row["merge_group_head"], group); assert_eq!( row["verified_test_reports"], json!([{ @@ -1163,6 +1197,36 @@ fn report_policy_records_only_archives_verified_for_all_required_failed_checks() fs::read_to_string(env.work().join("report-reads")).unwrap(), "read\nread\nread\n" ); + + let mut wrong_suite = valid_queue; + let checks = &mut wrong_suite["data"]["repository"]["p43"]["timelineItems"]["nodes"][0]["beforeCommit"] + ["statusCheckRollup"]["contexts"]["nodes"]; + for check in checks.as_array_mut().unwrap() { + check["checkSuite"]["databaseId"] = 52.into(); + } + write("queue.json", wrong_suite); + let result = invoke(&env, &args); + assert!( + result.status.success(), + "{}", + String::from_utf8_lossy(&result.stderr) + ); + let text = fs::read_to_string(log_for(&env, "example/repo")).unwrap(); + let sample: Value = serde_json::from_str(text.lines().last().unwrap()).unwrap(); + assert_eq!( + sample["queue_rejections"][0]["verified_test_reports"][0]["archives"], + json!([{"id":71,"sha256":digest}]) + ); + let other = &sample["queue_rejections"][1]; + assert_eq!(other["merge_group_head"], group); + assert_eq!(other["removal_event"], "removal-2"); + assert_eq!(other["failed_required_check_runs"], json!([11, 12])); + assert!(other.get("verified_test_reports").is_none()); + assert_eq!( + fs::read_to_string(env.work().join("report-reads")).unwrap(), + "read\nread\nread\nread\n" + ); + assert!(!env.work().join("unexpected-github-command").exists()); } #[test]