feat: Claim v2

cawg_identity/Cargo.toml

@@ -27,7 +27,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 async-trait = "0.1.78"
 base64 = "0.22.1"
-c2pa = { path = "../sdk", version = "0.42.0", features = ["openssl", "unstable_api"] }
+c2pa = { path = "../sdk", version = "0.42.0", features = ["openssl"] }
 c2pa-crypto = { path = "../internal/crypto", version = "0.4.0" }
 chrono = { version = "0.4.38", features = ["serde"] }
 ciborium = "0.2.2"

cli/Cargo.toml

@@ -26,8 +26,7 @@ c2pa = { path = "../sdk", version = "0.42.0", features = [
 	"fetch_remote_manifests",
 	"file_io",
 	"add_thumbnails",
-	"pdf",
-	"unstable_api",
+	"pdf"
 ] }
 c2pa-crypto = { path = "../internal/crypto", version = "0.4.0" }
 clap = { version = "4.5.10", features = ["derive", "env"] }

cli/sample/test.json

@@ -1,9 +1,10 @@
 {
-  "alg": "ps256",
-  "private_key": "ps256.pem",
-  "sign_cert": "ps256.pub",
+  "claim_version": 1,
   "ta_url": "http://timestamp.digicert.com",
-  "claim_generator": "TestApp",
+  "claim_generator_info":[{
+    "name": "TestApp",
+    "version": "1.0.0"
+  }],
   "title": "My Title",
   "assertions": [
     {

cli/src/callback_signer.rs

@@ -107,8 +107,9 @@ impl CallbackSignerConfig {
     pub fn new(sign_config: &SignConfig, reserve_size: usize) -> anyhow::Result<Self> {
         let alg = sign_config
             .alg
-            .clone()
-            .and_then(|alg| alg.parse::<SigningAlg>().ok())
+            .as_deref()
+            .map_or_else(|| "es256".to_string(), |alg| alg.to_lowercase())
+            .parse::<SigningAlg>()
             .context("Invalid signing algorithm provided")?;
 
         let sign_cert_path = sign_config

cli/src/info.rs

@@ -24,7 +24,7 @@ pub fn info(path: &Path) -> Result<()> {
         }
     }
     let ingredient = c2pa::Ingredient::from_file_with_options(path, &Options {})?;
-    println!("Information for {}", ingredient.title());
+    println!("Information for {}", ingredient.title().unwrap_or_default());
     let mut is_cloud_manifest = false;
     //println!("instanceID = {}", ingredient.instance_id());
     if let Some(provenance) = ingredient.provenance() {

cli/src/main.rs

@@ -19,7 +19,7 @@
 /// in that file. If a manifest definition JSON file is specified,
 /// the claim will be added to any existing claims.
 use std::{
-    fs::{create_dir_all, remove_dir_all, File},
+    fs::{create_dir_all, remove_dir_all, remove_file, File},
     io::Write,
     path::{Path, PathBuf},
     str::FromStr,
@@ -469,7 +469,7 @@
     //     match args.output {
     //         Some(output) => {
     //             if output.exists() && !args.force {
-    //                 bail!("Output already exists, use -f/force to force write");
+    //                 bail!("Output already exists; use -f/force to force write");
     //             }
     //             if path != &output {
     //                 std::fs::copy(path, &output)?;
@@ -517,7 +517,7 @@
         } else {
             manifest.claim_generator_info.insert(1, tool_generator);
         }
-        println!("claim generator {:?}", manifest.claim_generator_info);
+
         // set manifest base path before ingredients so ingredients can override it
         if let Some(base) = base_path.as_ref() {
             builder.base_path = Some(base.clone());
@@ -596,8 +596,12 @@
                 if ext_normal(&output) != ext_normal(&args.path) {
                     bail!("Output type must match source type");
                 }
-                if output.exists() && !args.force {
-                    bail!("Output already exists, use -f/force to force write");
+                if output.exists() {
+                    if args.force {
+                        remove_file(&output)?;
+                    } else {
+                        bail!("Output already exists; use -f/force to force write");
+                    }
                 }
 
                 if output.file_name().is_none() {
@@ -607,11 +611,16 @@
                     bail!("Missing extension output");
                 }
 
-                #[allow(deprecated)] // todo: remove when we can
-                builder
+                let manifest_data = builder
                     .sign_file(signer.as_ref(), &args.path, &output)
                     .context("embedding manifest")?;
 
+                if args.sidecar {
+                    let sidecar = output.with_extension("c2pa");
+                    let mut file = File::create(&sidecar)?;
+                    file.write_all(&manifest_data)?;
+                }
+
                 // generate a report on the output file
                 let reader = Reader::from_file(&output).map_err(special_errs)?;
                 if args.detailed {
@@ -633,7 +642,7 @@
             if args.force {
                 remove_dir_all(&output)?;
             } else {
-                bail!("Output already exists, use -f/force to force write");
+                bail!("Output already exists; use -f/force to force write");
             }
         }
         create_dir_all(&output)?;
@@ -708,8 +717,8 @@
     #[test]
     fn test_manifest_config() {
         const SOURCE_PATH: &str = "tests/fixtures/earth_apollo17.jpg";
-        const OUTPUT_PATH: &str = "target/tmp/unit_out.jpg";
-        create_dir_all("target/tmp").expect("create_dir");
+        const OUTPUT_PATH: &str = "../target/tmp/unit_out.jpg";
+        create_dir_all("../target/tmp").expect("create_dir");
         std::fs::remove_file(OUTPUT_PATH).ok(); // remove output file if it exists
         let mut builder = Builder::from_json(CONFIG).expect("from_json");
 
@@ -719,7 +728,6 @@
             .signer()
             .expect("get_signer");
 
-        #[allow(deprecated)] // todo: remove when we can
         let _result = builder
             .sign_file(signer.as_ref(), SOURCE_PATH, OUTPUT_PATH)
             .expect("embed");

cli/src/tree.rs

@@ -30,23 +30,23 @@
         }
 
         for ingredient in manifest.ingredients().iter() {
+            let title = ingredient.title().unwrap_or("Untitled");
             if let Some(label) = ingredient.active_manifest() {
                 // create new node
                 let data = if name_only {
-                    format!("{}_{}", ingredient.title(), label)
+                    format!("{}_{}", title, label)
                 } else {
-                    format!("Asset:{}, Manifest:{}", ingredient.title(), label)
+                    format!("Asset:{}, Manifest:{}", title, label)
                 };
 
                 let new_token = current_token.append(tree, data);
 
                 populate_node(tree, reader, label, &new_token, name_only)?;
             } else {
-                let asset_name = ingredient.title();
                 let data = if name_only {
-                    asset_name.to_string()
+                    title.to_string()
                 } else {
-                    format!("Asset:{asset_name}")
+                    format!("Asset:{title}")
                 };
                 current_token.append(tree, data);
             }