change Content internal representation to Option<Vec<u8>>

Author: Mr-Leshiy

rust/signed_doc/src/builder.rs

@@ -34,7 +34,7 @@ pub struct SignaturesBuilder {
     /// metadata
     metadata: WithCborBytes<Metadata>,
     /// content
-    content: WithCborBytes<Content>,
+    content: Content,
     /// signatures
     signatures: Signatures,
 }
@@ -71,7 +71,7 @@ impl ContentBuilder {
     fn into_signatures_builder(self) -> anyhow::Result<SignaturesBuilder> {
         Ok(SignaturesBuilder {
             metadata: WithCborBytes::new(self.metadata, &mut ())?,
-            content: WithCborBytes::new(self.content, &mut ())?,
+            content: self.content,
             signatures: Signatures::default(),
         })
     }
@@ -176,7 +176,7 @@ fn build_signature(
     sign_fn: impl FnOnce(Vec<u8>) -> Vec<u8>,
     kid: CatalystId,
     metadata: &WithCborBytes<Metadata>,
-    content: &WithCborBytes<Content>,
+    content: &Content,
 ) -> anyhow::Result<Signature> {
     let data_to_sign = tbs_data(&kid, metadata, content)?;
     let sign_bytes = sign_fn(data_to_sign);

rust/signed_doc/src/content.rs

@@ -2,25 +2,19 @@
 
 /// Document Content bytes (COSE payload).
 #[derive(Debug, Clone, PartialEq, Default)]
-pub struct Content(Vec<u8>);
+pub struct Content(Option<Vec<u8>>);
 
 impl Content {
     /// Return content bytes.
     #[must_use]
     pub fn bytes(&self) -> &[u8] {
-        self.0.as_slice()
-    }
-
-    /// Return content byte size.
-    #[must_use]
-    pub fn size(&self) -> usize {
-        self.0.len()
+        self.0.as_ref().map(|v| v.as_slice()).unwrap_or(&[])
     }
 }
 
 impl From<Vec<u8>> for Content {
     fn from(value: Vec<u8>) -> Self {
-        Self(value)
+        Self(Some(value))
     }
 }
 
@@ -30,13 +24,16 @@ impl minicbor::Encode<()> for Content {
         e: &mut minicbor::Encoder<W>,
         _ctx: &mut (),
     ) -> Result<(), minicbor::encode::Error<W::Error>> {
-        if self.0.is_empty() {
-            e.null()?;
-        } else {
-            e.bytes(self.0.as_slice())?;
-        }
+        match &self.0 {
+            Some(bytes) => e.bytes(&bytes)?,
+            None => e.null()?,
+        };
         Ok(())
     }
+
+    fn is_nil(&self) -> bool {
+        self.0.is_none()
+    }
 }
 
 impl minicbor::Decode<'_, ()> for Content {
@@ -46,11 +43,11 @@ impl minicbor::Decode<'_, ()> for Content {
     ) -> Result<Self, minicbor::decode::Error> {
         let p = d.position();
         d.null()
-            .map(|()| Self(Vec::new()))
+            .map(|()| Self(None))
             // important to use `or_else` so it will lazy evaluated at the time when it is needed
             .or_else(|_| {
                 d.set_position(p);
-                d.bytes().map(Vec::from).map(Self)
+                d.bytes().map(Vec::from).map(Some).map(Self)
             })
     }
 }

rust/signed_doc/src/lib.rs

@@ -40,7 +40,7 @@ struct InnerCatalystSignedDocument {
     /// Document Metadata
     metadata: WithCborBytes<Metadata>,
     /// Document Content
-    content: WithCborBytes<Content>,
+    content: Content,
     /// Signatures
     signatures: Signatures,
     /// A comprehensive problem report, which could include a decoding errors along with
@@ -64,7 +64,6 @@ impl Display for CatalystSignedDocument {
         f: &mut Formatter<'_>,
     ) -> Result<(), std::fmt::Error> {
         self.inner.metadata.fmt(f)?;
-        writeln!(f, "Payload Size: {} bytes", self.inner.content.size())?;
         writeln!(f, "Signature Information")?;
         if self.inner.signatures.is_empty() {
             writeln!(f, "  This document is unsigned.")?;
@@ -114,7 +113,7 @@ impl CatalystSignedDocument {
 
     /// Return document content object.
     #[must_use]
-    pub(crate) fn content(&self) -> &WithCborBytes<Content> {
+    pub(crate) fn content(&self) -> &Content {
         &self.inner.content
     }
 
@@ -286,7 +285,7 @@ impl Decode<'_, CompatibilityPolicy> for CatalystSignedDocument {
                     );
                 }
 
-                let content = WithCborBytes::<Content>::decode(
+                let content = Content::decode(
                     &mut minicbor::Decoder::new(content_bytes.as_slice()),
                     &mut (),
                 )?;

rust/signed_doc/src/signature/mod.rs

@@ -72,7 +72,7 @@ impl Signatures {
 pub(crate) fn tbs_data(
     kid: &CatalystId,
     metadata: &WithCborBytes<Metadata>,
-    content: &WithCborBytes<Content>,
+    content: &Content,
 ) -> anyhow::Result<Vec<u8>> {
     let mut e = minicbor::Encoder::new(Vec::new());
 

rust/signed_doc/src/validator/rules/content.rs

@@ -2,6 +2,8 @@
 
 use std::fmt::Debug;
 
+use minicbor::Encode;
+
 use crate::{
     validator::{json_schema, rules::utils::content_json_schema_check},
     CatalystSignedDocument,
@@ -33,7 +35,6 @@ pub(crate) enum ContentRule {
     /// Document's content must be present and not CBOR `nil`
     NotNil,
     /// Document's content must be a CBOR `nil`
-    #[allow(dead_code)]
     Nil,
 }
 
@@ -53,14 +54,14 @@ impl ContentRule {
             }
         }
         if let Self::NotNil = self {
-            if doc.content().size() == 0 {
+            if doc.content().is_nil() {
                 doc.report()
                     .functional_validation("Document must have a NOT CBOR `nil` content", CONTEXT);
                 return Ok(false);
             }
         }
         if let Self::Nil = self {
-            if doc.content().size() != 0 {
+            if !doc.content().is_nil() {
                 doc.report()
                     .functional_validation("Document must have a CBOR `nil` content", CONTEXT);
                 return Ok(false);