Fix TCF CA field types

Core fields VendorExpressConsent and VendorImpliedConsent are documented
to be of type OptimizedRange. However, The Java implementation uses the
same encoder/decoder as for TCF EU v2, which uses the OptimizedIntRange
type.
As consequence, some payloads generated by the iabgpp.com tool failed to
decode in this library.
This commit switches the TCF CA fields to use OptimizedIntRange.

Author: noirotm

iab_gpp/src/sections/tcfcav1.rs

@@ -41,9 +41,11 @@ pub struct Core {
     pub purpose_express_consents: IdSet,
     #[gpp(fixed_bitfield(24))]
     pub purpose_implied_consents: IdSet,
-    #[gpp(optimized_range)]
+    // BUG: specification says optimized_range
+    #[gpp(optimized_integer_range)]
     pub vendor_express_consents: IdSet,
-    #[gpp(optimized_range)]
+    // BUG: specification says optimized_range
+    #[gpp(optimized_integer_range)]
     pub vendor_implied_consents: IdSet,
     /// Introduced in TCF CA v1.1
     #[gpp(parse_with = parse_publisher_restrictions)]
@@ -180,4 +182,52 @@ mod tests {
     fn error(s: &str) -> SectionDecodeError {
         TcfCaV1::from_str(s).unwrap_err()
     }
+
+    #[test]
+    fn full_str() {
+        let actual =
+            TcfCaV1::from_str("BQMC4oAQMC4oAPoABABGB0CYAf8AAf8AAAqdA-AAUABwAFQALQAaABLACgAF0ANoAdwA_QCCAIQARQAnwBWgC3AGUANMAc4A7gCAQElASYAnYBPwDFAGaAM6AZ8A14B_AEngJyAT-Ao8BUQCpQFvALhAXQAvcBf4DBwGYANNAbUA3EBxoDxAHmgPkAgIBCQCNwEpYJgAmCBNUCa4E5gJ-AUmApYBU4FToHwACgAOAAqABaADQAJYAUAAugBtADuAH6AQQBCACKAE-AK0AW4AygBpgDnAHcAQCAkoCTAE7AJ-AYoAzQBnQDPgGvAP4Ak8BOQCfwFHgKiAVKAt4BcIC6AF7gL_AYOAzABpoDagG4gONAeIA80B8gEBAISARuAlLBMAEwQJqgTXAnMBPwCkwFLAKnAAAA.YAAAAAAAAAA").unwrap();
+        let expected = TcfCaV1 {
+            core: Core {
+                created: 1738195200,
+                last_updated: 1738195200,
+                cmp_id: 1000,
+                cmp_version: 1,
+                consent_screen: 0,
+                consent_language: "BG".to_string(),
+                vendor_list_version: 116,
+                policy_version: 2,
+                use_non_standard_stacks: false,
+                special_feature_express_consents: [1, 2].into(),
+                purpose_express_consents: [1, 2, 3, 4, 5, 6, 7, 8, 9].into(),
+                purpose_implied_consents: [1, 2, 3, 4, 5, 6, 7, 8, 9].into(),
+                vendor_express_consents: [
+                    10, 28, 42, 45, 52, 75, 80, 93, 109, 119, 126, 130, 131, 132, 138, 159, 173,
+                    183, 202, 211, 231, 238, 256, 293, 294, 315, 319, 394, 410, 413, 415, 431, 508,
+                    591, 626, 639, 655, 674, 677, 734, 737, 744, 759, 767, 775, 816, 845, 874, 881,
+                    909, 964, 973, 996, 1028, 1060, 1134, 1189, 1216, 1217, 1237, 1239, 1254, 1276,
+                    1318, 1324, 1358,
+                ]
+                .into(),
+                vendor_implied_consents: [
+                    10, 28, 42, 45, 52, 75, 80, 93, 109, 119, 126, 130, 131, 132, 138, 159, 173,
+                    183, 202, 211, 231, 238, 256, 293, 294, 315, 319, 394, 410, 413, 415, 431, 508,
+                    591, 626, 639, 655, 674, 677, 734, 737, 744, 759, 767, 775, 816, 845, 874, 881,
+                    909, 964, 973, 996, 1028, 1060, 1134, 1189, 1216, 1217, 1237, 1239, 1254, 1276,
+                    1318, 1324, 1358,
+                ]
+                .into(),
+                pub_restrictions: Default::default(),
+            },
+            disclosed_vendors: None,
+            publisher_purposes: Some(PublisherPurposes {
+                purpose_express_consents: Default::default(),
+                purpose_implied_consents: Default::default(),
+                custom_purpose_express_consents: Default::default(),
+                custom_purpose_implied_consents: Default::default(),
+            }),
+        };
+
+        assert_eq!(actual, expected);
+    }
 }

iab_gpp/src/v1/mod.rs

@@ -555,6 +555,34 @@ mod tests {
         assert!(matches!(r[0], Err(SectionDecodeError::Read { .. })));
     }
 
+    #[test]
+    fn very_large_string() {
+        let s = "DBACMYA~CQMC4oAQMC4oAPoABABGBaEAAP_gAP_gAAqIKxtX_G__bXlv-X736ftkeY1f99h77sQxBhbJs-4FzLvW_JwX32E7NE36tqYKmRIAu3TBIQNtHJjURVChaogVrTDsaEyUoTtKJ-BkiHMRY2dYCFxvm4tjeQCZ5vr_91d52R_t7dr-3dzyy5hnv3a9_-S1WJidK5-tHfv9bROb-_I-9_x-_4v4_N7pE2_eT1t_tWvt739-8tv_9__99__7_f______3_-_f__f____grG1f8b_9teW_5fvfp-2R5jV_32HvuxDEGFsmz7gXMu9b8nBffYTs0Tfq2pgqZEgC7dMEhA20cmNRFUKFqiBWtMOxoTJShO0on4GSIcxFjZ1gIXG-bi2N5AJnm-v_3V3nZH-3t2v7d3PLLmGe_dr3_5LVYmJ0rn60d-_1tE5v78j73_H7_i_j83ukTb95PW3-1a-3vf37y2__3__33__v9_______f_79__9____-AAA.QKxtX_G__bXlv-X736ftkeY1f99h77sQxBhbJs-4FzLvW_JwX32E7NE36tqYKmRIAu3TBIQNtHJjURVChaogVrTDsaEyUoTtKJ-BkiHMRY2dYCFxvm4tjeQCZ5vr_91d52R_t7dr-3dzyy5hnv3a9_-S1WJidK5-tHfv9bROb-_I-9_x-_4v4_N7pE2_eT1t_tWvt739-8tv_9__99__7_f______3_-_f__f____gAA.IKxtX_G__bXlv-X736ftkeY1f99h77sQxBhbJs-4FzLvW_JwX32E7NE36tqYKmRIAu3TBIQNtHJjURVChaogVrTDsaEyUoTtKJ-BkiHMRY2dYCFxvm4tjeQCZ5vr_91d52R_t7dr-3dzyy5hnv3a9_-S1WJidK5-tHfv9bROb-_I-9_x-_4v4_N7pE2_eT1t_tWvt739-8tv_9__99__7_f______3_-_f__f____gAA~BQMC4oAQMC4oAPoABABGB0CYAf8AAf8AAAqdA-AAUABwAFQALQAaABLACgAF0ANoAdwA_QCCAIQARQAnwBWgC3AGUANMAc4A7gCAQElASYAnYBPwDFAGaAM6AZ8A14B_AEngJyAT-Ao8BUQCpQFvALhAXQAvcBf4DBwGYANNAbUA3EBxoDxAHmgPkAgIBCQCNwEpYJgAmCBNUCa4E5gJ-AUmApYBU4FToHwACgAOAAqABaADQAJYAUAAugBtADuAH6AQQBCACKAE-AK0AW4AygBpgDnAHcAQCAkoCTAE7AJ-AYoAzQBnQDPgGvAP4Ak8BOQCfwFHgKiAVKAt4BcIC6AF7gL_AYOAzABpoDagG4gONAeIA80B8gEBAISARuAlLBMAEwQJqgTXAnMBPwCkwFLAKnAAAA.YAAAAAAAAAA";
+        let r = GPPString::from_str(s);
+        assert!(matches!(r, Ok(GPPString { .. })));
+
+        let gpp = r.unwrap();
+
+        assert_eq!(
+            gpp.section_ids,
+            vec![SectionId::TcfEuV2, SectionId::TcfCaV1]
+        );
+
+        let tcfeuv2 = gpp.decode_section(SectionId::TcfEuV2);
+        assert!(
+            matches!(tcfeuv2, Ok(Section::TcfEuV2(_))),
+            "got {:?}",
+            tcfeuv2
+        );
+
+        let tcfcav1 = gpp.decode_section(SectionId::TcfCaV1);
+        assert!(
+            matches!(tcfcav1, Ok(Section::TcfCaV1(_))),
+            "got {:?}",
+            tcfcav1
+        );
+    }
+
     macro_rules! assert_implements {
         ($type:ty, [$($trait:path),+]) => {
             {

iab_gpp_derive/src/from_data_reader.rs

@@ -46,6 +46,11 @@ pub fn derive_struct_from_data_reader(
 
         let attr = GPPFieldHelperAttribute::new(&field.attrs).expect("attribute parsing failed");
 
+        // debug next field
+        /*parse_statements.push(quote! {
+            println!("Parsing field: {}", stringify!(#name));
+        });*/
+
         // Handle where attribute
         if let Some(where_spec) = attr.where_spec {
             let name = where_spec.name;

iab_gpp_derive/src/lib.rs

@@ -12,6 +12,7 @@ mod from_data_reader;
 mod optional_segment_parser;
 mod struct_attr;
 
+/// Derive the FromDataReader trait
 #[proc_macro_derive(FromDataReader, attributes(gpp))]
 pub fn derive_from_data_reader(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);