Merge branch 'main' into claude/gallant-bell-4bo4oy-b-example-profiles

Signed-off-by: Jonathan D.A. Jewell <6759885+hyperpolymath@users.noreply.github.com>

Author: hyperpolymath

Cargo.lock

@@ -18,6 +18,9 @@ anyhow = "1.0"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+# JCS (RFC 8785) for JSON artefacts: the estate tool behind JSON-POLICY rule
+# J-1. Not on crates.io, so pinned to a full commit SHA.
+ijson-jcs = { git = "https://github.com/hyperpolymath/ijson-jcs", rev = "3a9a4ee326a968a32b2f152b4faec243a2d00765" }
 # Pure safe-Rust YAML (replaces serde_yaml + unsafe-libyaml, RUSTSEC-2024-0449).
 serde-saphyr = "2.0"
 regex = "1.10"

Cargo.toml

@@ -257,7 +257,7 @@ pub fn write_report(report: &AbductReport, path: &Path) -> Result<()> {
         fs::create_dir_all(parent)
             .with_context(|| format!("creating report parent directory {}", parent.display()))?;
     }
-    let json = serde_json::to_string_pretty(report).context("serializing abduct report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing abduct report")?;
     fs::write(path, json).with_context(|| format!("writing report {}", path.display()))?;
     Ok(())
 }

src/abduct/mod.rs

@@ -227,7 +227,7 @@ pub fn write_report(report: &AdjudicateReport, path: &Path) -> Result<()> {
         fs::create_dir_all(parent)
             .with_context(|| format!("creating report parent directory {}", parent.display()))?;
     }
-    let json = serde_json::to_string_pretty(report).context("serializing adjudicate report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing adjudicate report")?;
     fs::write(path, json).with_context(|| format!("writing report {}", path.display()))?;
     Ok(())
 }

src/adjudicate/mod.rs

@@ -408,7 +408,7 @@ pub fn write_report(report: &AggregateReport, path: &Path) -> Result<()> {
             fs::create_dir_all(parent).with_context(|| format!("creating {}", parent.display()))?;
         }
     }
-    let json = serde_json::to_string_pretty(report).context("serializing aggregate report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing aggregate report")?;
     fs::write(path, json).with_context(|| format!("writing {}", path.display()))?;
     Ok(())
 }

src/aggregate/mod.rs

@@ -249,7 +249,7 @@ pub fn write_report(report: &AmuckReport, path: &Path) -> Result<()> {
         fs::create_dir_all(parent)
             .with_context(|| format!("creating report parent directory {}", parent.display()))?;
     }
-    let json = serde_json::to_string_pretty(report).context("serializing amuck report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing amuck report")?;
     fs::write(path, json).with_context(|| format!("writing report {}", path.display()))?;
     Ok(())
 }

src/amuck/mod.rs

@@ -288,7 +288,7 @@ pub fn write_report(report: &AssayReport, path: &Path) -> Result<()> {
             fs::create_dir_all(parent).with_context(|| format!("creating {}", parent.display()))?;
         }
     }
-    let json = serde_json::to_string_pretty(report).context("serializing assay report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing assay report")?;
     fs::write(path, json).with_context(|| format!("writing {}", path.display()))?;
     Ok(())
 }

src/assay/mod.rs

@@ -534,7 +534,7 @@ pub fn write_report(report: &AssemblylineReport, path: &Path) -> Result<()> {
     if let Some(parent) = path.parent() {
         fs::create_dir_all(parent)?;
     }
-    let json = serde_json::to_string_pretty(report)?;
+    let json = crate::json::to_canonical_string(report)?;
     fs::write(path, json)?;
     Ok(())
 }

src/assemblyline.rs

@@ -279,7 +279,7 @@ pub fn write_report(report: &AxialReport, path: &Path) -> Result<()> {
         fs::create_dir_all(parent)
             .with_context(|| format!("creating report parent directory {}", parent.display()))?;
     }
-    let json = serde_json::to_string_pretty(report).context("serializing axial report")?;
+    let json = crate::json::to_canonical_string(report).context("serializing axial report")?;
     fs::write(path, json).with_context(|| format!("writing report {}", path.display()))?;
     Ok(())
 }

src/axial/mod.rs

@@ -109,7 +109,7 @@ impl MitigationRegistry {
         if let Some(parent) = path.parent() {
             std::fs::create_dir_all(parent)?;
         }
-        let content = serde_json::to_string_pretty(self)?;
+        let content = crate::json::to_canonical_string(self)?;
         std::fs::write(&path, content)?;
         Ok(())
     }