wip

Author: Mr-Leshiy

rust/catalyst-signed-doc-spec/src/lib.rs

@@ -13,7 +13,7 @@ use std::{collections::HashMap, fmt::Display};
 
 use build_info as build_info_lib;
 
-use crate::{copyright::Copyright, headers::Headers, metadata::Metadata};
+use crate::{copyright::Copyright, headers::Headers, metadata::Metadata, signers::Signers};
 
 build_info_lib::build_info!(pub(crate) fn build_info);
 
@@ -65,6 +65,7 @@ pub struct DocSpec {
     pub doc_type: String,
     pub headers: Headers,
     pub metadata: Metadata,
+    pub signers: Signers,
 }
 
 impl CatalystSignedDocSpec {

rust/signed_doc/src/validator/mod.rs

@@ -57,7 +57,7 @@ fn proposal_rule() -> Rules {
         section: SectionRule::NotSpecified,
         content: ContentRule::NotNil,
         kid: SignatureKidRule {
-            exp: &[RoleId::Proposer],
+            allowed_roles: vec![RoleId::Proposer],
         },
         signature: SignatureRule { mutlisig: false },
         original_author: OriginalAuthorRule,
@@ -103,7 +103,7 @@ fn proposal_comment_rule() -> Rules {
         },
         content: ContentRule::NotNil,
         kid: SignatureKidRule {
-            exp: &[RoleId::Role0],
+            allowed_roles: vec![RoleId::Role0],
         },
         signature: SignatureRule { mutlisig: false },
         original_author: OriginalAuthorRule,
@@ -155,7 +155,7 @@ fn proposal_submission_action_rule() -> Rules {
         section: SectionRule::NotSpecified,
         content: ContentRule::StaticSchema(ContentSchema::Json(proposal_action_json_schema)),
         kid: SignatureKidRule {
-            exp: &[RoleId::Proposer],
+            allowed_roles: vec![RoleId::Proposer],
         },
         signature: SignatureRule { mutlisig: false },
         original_author: OriginalAuthorRule,

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

@@ -129,7 +129,7 @@ impl Rules {
                 reply: ReplyRule::NotSpecified,
                 section: SectionRule::NotSpecified,
                 content: ContentRule::Nil,
-                kid: SignatureKidRule { exp: &[] },
+                kid: SignatureKidRule::new(&doc_spec.signers.roles),
                 signature: SignatureRule { mutlisig: false },
                 original_author: OriginalAuthorRule,
             };

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

@@ -1,5 +1,6 @@
 //! Catalyst Signed Document COSE signature `kid` (Catalyst Id) role validation
 
+use catalyst_signed_doc_spec::signers::roles::{Role, Roles};
 use catalyst_types::catalyst_id::role_index::RoleId;
 
 use crate::CatalystSignedDocument;
@@ -8,10 +9,26 @@ use crate::CatalystSignedDocument;
 #[derive(Debug)]
 pub(crate) struct SignatureKidRule {
     /// expected `RoleId` values for the `kid` field
-    pub(crate) exp: &'static [RoleId],
+    pub(crate) allowed_roles: Vec<RoleId>,
 }
 
 impl SignatureKidRule {
+    /// Generating `SignatureKidRule` from specs
+    pub(crate) fn new(spec: &Roles) -> Self {
+        let allowed_roles = spec
+            .user
+            .iter()
+            .map(|v| {
+                match v {
+                    Role::Registered => RoleId::Role0,
+                    Role::Proposer => RoleId::Proposer,
+                    Role::Representative => RoleId::DelegatedRepresentative,
+                }
+            })
+            .collect();
+        Self { allowed_roles }
+    }
+
     /// Field validation rule
     #[allow(clippy::unused_async)]
     pub(crate) async fn check(
@@ -20,12 +37,12 @@ impl SignatureKidRule {
     ) -> anyhow::Result<bool> {
         let contains_exp_role = doc.kids().iter().enumerate().all(|(i, kid)| {
             let (role_index, _) = kid.role_and_rotation();
-            let res = self.exp.contains(&role_index);
+            let res = self.allowed_roles.contains(&role_index);
             if !res {
                 doc.report().invalid_value(
                     "kid",
                     role_index.to_string().as_str(),
-                    format!("{:?}", self.exp).as_str(),
+                    format!("{:?}", self.allowed_roles).as_str(),
                     format!(
                         "Invalid Catalyst Signed Document signature at position [{i}] `kid` Catalyst Role value"
                     )
@@ -56,7 +73,7 @@ mod tests {
     #[tokio::test]
     async fn signature_kid_rule_test() {
         let mut rule = SignatureKidRule {
-            exp: &[RoleId::Role0, RoleId::DelegatedRepresentative],
+            allowed_roles: vec![RoleId::Role0, RoleId::DelegatedRepresentative],
         };
 
         let sk = ed25519_dalek::SigningKey::generate(&mut rand::rngs::OsRng);
@@ -75,7 +92,7 @@ mod tests {
 
         assert!(rule.check(&doc).await.unwrap());
 
-        rule.exp = &[RoleId::Proposer];
+        rule.allowed_roles = vec![RoleId::Proposer];
         assert!(!rule.check(&doc).await.unwrap());
     }
 }