c2pa-rs

commit d9b077c8790e172d5bc9f23dc17f13df343160f1
parent 2d440a21313a35b5a8665e2556e33f52ba89edf7
Author: Gavin  Peacock <gpeacock@adobe.com>
Date:   Thu, 12 Oct 2023 19:59:06 -0700

Add ManifestStore::from_stream (#319)

* make ManifestStore new public.

* update schmars version

* Add ManifestStore::from_stream()

* Also update schemars dependency in export_schema crate

* Proofreading manifest.rs

* Proofreading manifest.rs

* Proofreading manifest_store.rs

* Proofreading manifest_store.rs
---------

Co-authored-by: Eric Scouten <scouten@adobe.com>
Diffstat:
M
export_schema/Cargo.toml
 | 
2
+-
M
sdk/Cargo.toml
 | 
2
+-
M
sdk/src/manifest.rs
 | 
6
++++--
M
sdk/src/manifest_store.rs
 | 
44
+++++++++++++++++++++++++++++++++++++++++---

4 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/export_schema/Cargo.toml b/export_schema/Cargo.toml
@@ -9,5 +9,5 @@ rust-version = "1.70.0"
 [dependencies]
 anyhow = "1.0.40"
 c2pa = { path = "../sdk", features = ["file_io", "json_schema"] }
-schemars = "0.8.12"
+schemars = "0.8.13"
 serde_json = "1.0.81"
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -89,7 +89,7 @@ png_pong = "0.8.2"
 range-set = "0.0.9"
 ring = "0.16.20"
 riff = "1.0.1"
-schemars = { version = "0.8.12", optional = true }
+schemars = { version = "0.8.13", optional = true }
 serde = { version = "1.0.137", features = ["derive"] }
 serde_bytes = "0.11.5"
 serde_cbor = "0.11.1"
diff --git a/sdk/src/manifest.rs b/sdk/src/manifest.rs
@@ -1023,7 +1023,8 @@ impl Manifest {
     }
 
     /// Embed a signed manifest into a stream using a supplied signer.
-    /// returns the bytes of the new asset
+    ///
+    /// Returns the bytes of the new asset
     #[deprecated(since = "0.27.2", note = "use embed_to_stream instead")]
     pub fn embed_stream(
         &mut self,
@@ -1041,7 +1042,8 @@ impl Manifest {
     }
 
     /// Embed a signed manifest into a stream using a supplied signer.
-    /// returns the bytes of c2pa_manifest that was embedded
+    ///
+    /// Returns the bytes of c2pa_manifest that was embedded.
     pub fn embed_to_stream(
         &mut self,
         format: &str,
diff --git a/sdk/src/manifest_store.rs b/sdk/src/manifest_store.rs
@@ -25,7 +25,7 @@ use crate::{
     store::Store,
     utils::base64,
     validation_status::{status_for_store, ValidationStatus},
-    Manifest, Result,
+    CAIRead, Manifest, Result,
 };
 
 #[derive(Serialize)]
@@ -44,7 +44,7 @@ pub struct ManifestStore {
 
 impl ManifestStore {
     /// allocates a new empty ManifestStore
-    pub(crate) fn new() -> Self {
+    pub fn new() -> Self {
         ManifestStore {
             active_manifest: None,
             manifests: HashMap::<String, Manifest>::new(),
@@ -149,7 +149,7 @@ impl ManifestStore {
         ))
     }
 
-    /// generate a Store from a format string and bytes
+    /// Generate a Store from a format string and bytes.
     pub fn from_bytes(format: &str, image_bytes: &[u8], verify: bool) -> Result<ManifestStore> {
         let mut validation_log = DetailedStatusTracker::new();
 
@@ -157,6 +157,27 @@ impl ManifestStore {
             .map(|store| Self::from_store(&store, &validation_log))
     }
 
+    /// Generate a Store from a format string and stream.
+    pub fn from_stream(
+        format: &str,
+        stream: &mut dyn CAIRead,
+        verify: bool,
+    ) -> Result<ManifestStore> {
+        let mut validation_log = DetailedStatusTracker::new();
+
+        let manifest_bytes = Store::load_jumbf_from_stream(format, stream)?;
+        let store = Store::from_jumbf(&manifest_bytes, &mut validation_log)?;
+        if verify {
+            // verify store and claims
+            Store::verify_store(
+                &store,
+                &mut ClaimAssetData::Stream(stream, format),
+                &mut validation_log,
+            )?;
+        }
+        Ok(Self::from_store(&store, &validation_log))
+    }
+
     #[cfg(feature = "file_io")]
     /// Loads a ManifestStore from a file
     /// Example:
@@ -498,4 +519,21 @@ mod tests {
         assert_eq!(manifest.issuer().unwrap(), "C2PA Test Signing Cert");
         assert!(manifest.time().is_some());
     }
+
+    #[test]
+    fn manifest_report_from_stream() {
+        let image_bytes: &[u8] = include_bytes!("../tests/fixtures/CA.jpg");
+        let mut stream = std::io::Cursor::new(image_bytes);
+        let manifest_store = ManifestStore::from_stream("image/jpeg", &mut stream, true).unwrap();
+        println!("{manifest_store}");
+
+        assert!(manifest_store.active_label().is_some());
+        assert!(manifest_store.get_active().is_some());
+        assert!(!manifest_store.manifests().is_empty());
+        assert!(manifest_store.validation_status().is_none());
+        let manifest = manifest_store.get_active().unwrap();
+        assert!(!manifest.ingredients().is_empty());
+        assert_eq!(manifest.issuer().unwrap(), "C2PA Test Signing Cert");
+        assert!(manifest.time().is_some());
+    }
 }