fix: Use Digitalsourcetype with Builder intents (#1586)

* fix: Take Digital source type into account

* fix: Take Digital source type into account

* fix: CLarify comment

* fix: Remove debug logs

* fix: FOrmat

* fix: Fix the API

* removes default and test file settings for
builder.actions.auto_created_actions,
auto_opened_actions and auto_palaced actions.
These are all now disabled and do not set digitalSourceType.
they are still tested with individual unit tests.
I set the default intent to edit in test_settings.toml.
ca_test.json known goods are updated.
If intent is set, it always takes precedent over auto_opened and auto_create.

* fix: Typos

---------

Co-authored-by: Gavin Peacock <[email protected]>

Author: tmathern

c2pa_c_ffi/src/c_api.rs

@@ -1847,7 +1847,7 @@ mod tests {
     }
 
     #[test]
-    fn builder_create_intent_and_sign() {
+    fn builder_create_intent_digital_creation_and_sign() {
         let source_image = include_bytes!(fixture_path!("IMG_0003.jpg"));
         let mut source_stream = TestC2paStream::from_bytes(source_image.to_vec());
         let dest_vec = Vec::new();
@@ -1888,10 +1888,79 @@ mod tests {
 
         let json = unsafe { c2pa_reader_json(reader) };
         assert!(!json.is_null());
+
+        let json_str = unsafe { CString::from_raw(json) };
+        let json_content = json_str.to_str().unwrap();
+
+        assert!(json_content.contains("c2pa.created"));
+        // Verify the digital source type was used
+        assert!(json_content.contains("digitalSourceType"));
+        assert!(json_content.contains("digitalCreation"));
+        // Verify there is only one c2pa.created action
+        assert_eq!(
+            json_content.matches("\"action\": \"c2pa.created\"").count(),
+            1
+        );
+
+        TestC2paStream::drop_c_stream(source_stream);
+        TestC2paStream::drop_c_stream(read_stream);
+        unsafe {
+            c2pa_manifest_bytes_free(manifest_bytes_ptr);
+            c2pa_builder_free(builder);
+            c2pa_signer_free(signer);
+            c2pa_reader_free(reader);
+        }
+    }
+
+    #[test]
+    fn builder_create_intent_empty_and_sign() {
+        let source_image = include_bytes!(fixture_path!("IMG_0003.jpg"));
+        let mut source_stream = TestC2paStream::from_bytes(source_image.to_vec());
+        let dest_vec = Vec::new();
+        let mut dest_stream = TestC2paStream::new(dest_vec).into_c_stream();
+
+        let (signer, builder) = setup_signer_and_builder_for_signing_tests();
+
+        // The create intent requires needs a digital source type
+        let result = unsafe {
+            c2pa_builder_set_intent(
+                builder,
+                C2paBuilderIntent::Create,
+                C2paDigitalSourceType::Empty,
+            )
+        };
+        assert_eq!(result, 0);
+
+        let format = CString::new("image/jpeg").unwrap();
+        let mut manifest_bytes_ptr = std::ptr::null();
+        let _ = unsafe {
+            c2pa_builder_sign(
+                builder,
+                format.as_ptr(),
+                &mut source_stream,
+                &mut dest_stream,
+                signer,
+                &mut manifest_bytes_ptr,
+            )
+        };
+
+        // Verify we can read the signed data back
+        let dest_test_stream = TestC2paStream::from_c_stream(dest_stream);
+        let mut read_stream = dest_test_stream.into_c_stream();
+        let format = CString::new("image/jpeg").unwrap();
+
+        let reader = unsafe { c2pa_reader_from_stream(format.as_ptr(), &mut read_stream) };
+        assert!(!reader.is_null());
+
+        let json = unsafe { c2pa_reader_json(reader) };
+        assert!(!json.is_null());
+
         let json_str = unsafe { CString::from_raw(json) };
         let json_content = json_str.to_str().unwrap();
 
         assert!(json_content.contains("c2pa.created"));
+        // Verify the digital source type we picked was used
+        assert!(json_content.contains("digitalsourcetype/empty"));
 
         TestC2paStream::drop_c_stream(source_stream);
         TestC2paStream::drop_c_stream(read_stream);
@@ -1919,7 +1988,7 @@ mod tests {
             c2pa_builder_set_intent(
                 builder,
                 C2paBuilderIntent::Edit,
-                C2paDigitalSourceType::DigitalCreation,
+                C2paDigitalSourceType::Empty,
             )
         };
         assert_eq!(result, 0);
@@ -1951,6 +2020,9 @@ mod tests {
         let json_content = json_str.to_str().unwrap();
 
         assert!(json_content.contains("c2pa.opened"));
+        // Verify the digital source type parameter was ignored for Edit intent
+        // and no "empty" source type appears in the JSON
+        assert!(!json_content.contains("digitalsourcetype/empty"));
 
         TestC2paStream::drop_c_stream(source_stream);
         TestC2paStream::drop_c_stream(read_stream);
@@ -2114,7 +2186,6 @@ mod tests {
         let json = unsafe { c2pa_reader_json(reader) };
         assert!(!json.is_null());
         let json_str = unsafe { CString::from_raw(json) };
-        println!("json: {}", json_str.to_str().unwrap());
         assert!(json_str.to_str().unwrap().contains("Silly Cats 929"));
         assert!(json_str
             .to_str()

cli/tests/fixtures/trust/cawg_sign_settings.toml

@@ -466,37 +466,37 @@ operating_system = "auto"
 #
 # This is a convenience setting and it can be disabled if the information
 # is provided manually.
-[builder.actions.auto_created_action]
+#[builder.actions.auto_created_action]
 # Whether to auto create the c2pa.created action.
-enabled = true
+#enabled = true
 # The source type field is required for the c2pa.created action.
 #
 # For more information, see `c2pa::assertions::actions::source_type`.
-source_type = "http://c2pa.org/digitalsourcetype/empty"
+#source_type = "http://c2pa.org/digitalsourcetype/empty"
 
 # Settings for configuring how c2pa.opened actions are auto created.
 #
 # This is a convenience setting and it can be disabled if the information
 # is provided manually.
-[builder.actions.auto_opened_action]
+#[builder.actions.auto_opened_action]
 # Whether to auto create the c2pa.opened action.
-enabled = true
+#enabled = true
 # For more information, see `c2pa::assertions::actions::source_type`.
 #
 # Note this field is optional for the c2pa.opened action.
-source_type = "http://c2pa.org/digitalsourcetype/empty"
+#source_type = "http://c2pa.org/digitalsourcetype/empty"
 
 # Settings for configuring how c2pa.placed actions are auto created.
 #
 # This is a convenience setting and it can be disabled if the information
 # is provided manually.
-[builder.actions.auto_placed_action]
+#[builder.actions.auto_placed_action]
 # Whether to auto create the c2pa.placed action.
-enabled = true
+#enabled = true
 # For more information, see `c2pa::assertions::actions::source_type`.
 #
 # Note this field is optional for the c2pa.placed action.
-source_type = "http://c2pa.org/digitalsourcetype/empty"
+#source_type = "http://c2pa.org/digitalsourcetype/empty"
 
 # Settings for automatic thumbnail generation.
 [builder.thumbnail]

docs/settings.md

@@ -125,18 +125,18 @@ The `builder` object specifies settings for the Builder API.
 | `builder.claim_generator_info` | Object | Default claim generator information. Used if the `Builder` hasn't specified one.<br/>See below. | N/A |
 | `builder.certificate_status_fetch` | String | Certificate status fetching scope | null |
 | `builder.certificate_status_should_override` | Boolean | Override OCSP with certificate status assertions | null |
-| `builder.intent` | object | Default builder intent. The value uses object notation and must be one of: `{"Create": "digitalCapture"}` <br/> `{"Create": "Edit"}` <br/> `{"Create": "Update"}`. | null |
+| `builder.intent` | object | Default builder intent. The value uses object notation and must be one of: `{"Create": "digitalCapture"}` <br/> `"Edit"` <br/> `"Update"`. | null |
 | `builder.created_assertion_labels` | Array | Array of base assertion labels you want to treated as `created`. When the builder encounters one of these, it will become a created assertion.  | null |
 | `builder.generate_c2pa_archive` | Boolean | Generate C2PA archive format | null |
 | `builder.actions` | Object | Action assertion configuration. |  |
 | `builder.actions.all_actions_included` | Boolean | Whether all actions are specified | null |
 | `builder.actions.templates` | Array | Action templates | null |
 | `builder.actions.actions` | Array | Predefined actions to add | null |
-| `builder.actions.auto_created_action.enabled` | Boolean | Enable automatic `c2pa.created` actions | true |
+| `builder.actions.auto_created_action.enabled` | Boolean | Enable automatic `c2pa.created` actions | false |
 | `builder.actions.auto_created_action.source_type` | String | Digital source type for created action | "empty" |
-| `builder.actions.auto_opened_action.enabled` | Boolean | Enable automatic `c2pa.opened` actions | true |
+| `builder.actions.auto_opened_action.enabled` | Boolean | Enable automatic `c2pa.opened` actions | false |
 | `builder.actions.auto_opened_action.source_type` | String | Digital source type for opened action | null |
-| `builder.actions.auto_placed_action.enabled` | Boolean | Enable automatic `c2pa.placed` actions | true |
+| `builder.actions.auto_placed_action.enabled` | Boolean | Enable automatic `c2pa.placed` actions | false |
 | `builder.actions.auto_placed_action.source_type` | String | Digital source type for placed action | null |
 | `builder.thumbnail` | Object | Automatic thumbnail generation settings. |  |
 | `builder.thumbnail.enabled` | Boolean | Enable automatic thumbnails | true |