added new Section struct

Author: Mr-Leshiy

rust/signed_doc/src/lib.rs

@@ -19,8 +19,7 @@ use catalyst_types::problem_report::ProblemReport;
 pub use catalyst_types::uuid::{Uuid, UuidV4, UuidV7};
 pub use content::Content;
 use coset::{CborSerializable, Header};
-use metadata::{ContentEncoding, ContentType};
-pub use metadata::{DocumentRef, ExtraFields, Metadata};
+pub use metadata::{ContentEncoding, ContentType, DocumentRef, ExtraFields, Metadata, Section};
 use minicbor::{decode, encode, Decode, Decoder, Encode};
 use providers::VerifyingKeyProvider;
 pub use signature::{IdUri, Signatures};

rust/signed_doc/src/metadata/document_ref.rs

@@ -26,17 +26,6 @@ impl Display for DocumentRef {
     }
 }
 
-impl DocumentRef {
-    /// Determine if internal `UUID`s are valid.
-    #[must_use]
-    pub fn is_valid(&self) -> bool {
-        match self.ver {
-            Some(ver) => self.id.is_valid() && ver.is_valid() && ver >= self.id,
-            None => self.id.is_valid(),
-        }
-    }
-}
-
 impl TryFrom<DocumentRef> for Value {
     type Error = anyhow::Error;
 

rust/signed_doc/src/metadata/mod.rs

@@ -6,6 +6,7 @@ mod content_encoding;
 mod content_type;
 mod document_ref;
 mod extra_fields;
+mod section;
 
 use algorithm::Algorithm;
 use catalyst_types::{
@@ -17,6 +18,7 @@ pub use content_type::ContentType;
 use coset::{iana::CoapContentFormat, CborSerializable};
 pub use document_ref::DocumentRef;
 pub use extra_fields::ExtraFields;
+pub use section::Section;
 
 /// `content_encoding` field COSE key value
 const CONTENT_ENCODING_KEY: &str = "Content-Encoding";

rust/signed_doc/src/metadata/section.rs

@@ -0,0 +1,58 @@
+//! Catalyst Signed Document `section` field type defition.
+
+use std::{fmt::Display, str::FromStr};
+
+use coset::cbor::Value;
+use serde::{Deserialize, Serialize};
+
+/// 'section' field type defition, which is a JSON path string
+#[derive(Clone, Debug, PartialEq)]
+pub struct Section(jsonpath_rust::JsonPath<serde_json::Value>);
+
+impl Display for Section {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl Serialize for Section {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where S: serde::Serializer {
+        self.to_string().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for Section {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where D: serde::Deserializer<'de> {
+        let str = String::deserialize(deserializer)?;
+        Ok(Self::from_str(&str).map_err(|e| serde::de::Error::custom(e))?)
+    }
+}
+
+impl FromStr for Section {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self(
+            jsonpath_rust::JsonPath::<serde_json::Value>::from_str(&s)?,
+        ))
+    }
+}
+
+impl From<Section> for Value {
+    fn from(value: Section) -> Self {
+        Value::Text(value.to_string())
+    }
+}
+
+impl TryFrom<&Value> for Section {
+    type Error = anyhow::Error;
+
+    fn try_from(val: &Value) -> anyhow::Result<Self> {
+        let str = val
+            .as_text()
+            .ok_or(anyhow::anyhow!("Not a cbor string type"))?;
+        Ok(Self::from_str(str)?)
+    }
+}

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

@@ -19,10 +19,11 @@ where Provider: 'static + CatalystSignedDocumentProvider
         &'a self, doc: &'a CatalystSignedDocument, _provider: &'a Provider,
     ) -> BoxFuture<'a, anyhow::Result<bool>> {
         async {
-            if doc.doc_content_type()? != self.exp {
+            let content_type = doc.doc_content_type()?;
+            if content_type != self.exp {
                 doc.report().invalid_value(
                     "content-type",
-                    doc.doc_content_type()?.to_string().as_str(),
+                    content_type.to_string().as_str(),
                     self.exp.to_string().as_str(),
                     "Invalid Document content-type value",
                 );