Introduce Cip0134UriSet type

Author: stanislav-tkach

rust/rbac-registration/src/cardano/cip509/mod.rs

@@ -25,16 +25,21 @@ use validation::{
 use x509_chunks::X509Chunks;
 
 use super::transaction::witness::TxWitness;
-use crate::utils::{
-    decode_helper::{decode_bytes, decode_helper, decode_map_len},
-    general::{decode_utf8, decremented_index},
-    hashing::{blake2b_128, blake2b_256},
+use crate::{
+    cardano::cip509::rbac::Cip509RbacMetadata,
+    utils::{
+        decode_helper::{decode_bytes, decode_helper, decode_map_len},
+        general::{decode_utf8, decremented_index},
+        hashing::{blake2b_128, blake2b_256},
+    },
 };
 
 /// CIP509 label.
 pub const LABEL: u64 = 509;
 
 /// CIP509.
+///
+/// See `x509-envelope.cddl` for the details how this structure is encoded.
 #[derive(Debug, PartialEq, Clone, Default)]
 pub struct Cip509 {
     /// `UUIDv4` Purpose .
@@ -43,9 +48,13 @@ pub struct Cip509 {
     pub txn_inputs_hash: TxInputHash, // bytes .size 16
     /// Optional previous transaction ID.
     pub prv_tx_id: Option<Hash<32>>, // bytes .size 32
-    /// x509 chunks.
-    pub x509_chunks: X509Chunks, // chunk_type => [ + x509_chunk ]
+    /// Metadata.
+    ///
+    /// This field encoded in chunks (`chunk_type => [ + x509_chunk ]`). See
+    /// [`X509Chunks`] for more details.
+    pub metadata: Cip509RbacMetadata,
     /// Validation signature.
+    // TODO: FIXME: This probably should be a separate type and not just Vec.
     pub validation_signature: Vec<u8>, // bytes size (1..64)
 }
 
@@ -134,7 +143,7 @@ impl Decode<'_, ()> for Cip509 {
             } else {
                 // Handle the x509 chunks 10 11 12
                 let x509_chunks = X509Chunks::decode(d, ctx)?;
-                cip509_metadatum.x509_chunks = x509_chunks;
+                cip509_metadatum.metadata = x509_chunks.into();
             }
         }
         Ok(cip509_metadatum)
@@ -179,7 +188,7 @@ impl Cip509 {
         let mut is_valid_stake_public_key = true;
         let mut is_valid_payment_key = true;
         let mut is_valid_signing_key = true;
-        if let Some(role_set) = &self.x509_chunks.0.role_set {
+        if let Some(role_set) = &self.metadata.role_set {
             // Validate only role 0
             for role in role_set {
                 if role.role_number == 0 {

rust/rbac-registration/src/cardano/cip509/rbac/mod.rs

@@ -16,18 +16,25 @@ use role_data::RoleData;
 use strum_macros::FromRepr;
 
 use super::types::cert_key_hash::CertKeyHash;
-use crate::utils::decode_helper::{
-    decode_any, decode_array_len, decode_bytes, decode_helper, decode_map_len,
+use crate::{
+    cardano::cip509::utils::Cip0134UriSet,
+    utils::decode_helper::{
+        decode_any, decode_array_len, decode_bytes, decode_helper, decode_map_len,
+    },
 };
 
 /// Cip509 RBAC metadata.
 #[derive(Debug, PartialEq, Clone, Default)]
 pub struct Cip509RbacMetadata {
+    // TODO: FIXME: Discuss if we need `Option<Vec>`.
     /// Optional list of x509 certificates.
+    // TODO: FIXME: Parse X509DerCert?..
     pub x509_certs: Option<Vec<X509DerCert>>,
     /// Optional list of c509 certificates.
     /// The value can be either the c509 certificate or c509 metadatum reference.
     pub c509_certs: Option<Vec<C509Cert>>,
+    // TODO: FIXME:
+    pub fixme: Cip0134UriSet,
     /// Optional list of Public keys.
     pub pub_keys: Option<Vec<SimplePublicKeyType>>,
     /// Optional list of revocation list.
@@ -60,74 +67,35 @@ pub enum Cip509RbacMetadataInt {
     RoleSet = 100,
 }
 
-impl Cip509RbacMetadata {
-    /// Create a new instance of `Cip509RbacMetadata`.
-    pub(crate) fn new() -> Self {
-        Self {
-            x509_certs: None,
-            c509_certs: None,
-            pub_keys: None,
-            revocation_list: None,
-            role_set: None,
-            purpose_key_data: HashMap::new(),
-        }
-    }
-
-    /// Set the x509 certificates.
-    fn set_x509_certs(&mut self, x509_certs: Vec<X509DerCert>) {
-        self.x509_certs = Some(x509_certs);
-    }
-
-    /// Set the c509 certificates.
-    fn set_c509_certs(&mut self, c509_certs: Vec<C509Cert>) {
-        self.c509_certs = Some(c509_certs);
-    }
-
-    /// Set the public keys.
-    fn set_pub_keys(&mut self, pub_keys: Vec<SimplePublicKeyType>) {
-        self.pub_keys = Some(pub_keys);
-    }
-
-    /// Set the revocation list.
-    fn set_revocation_list(&mut self, revocation_list: Vec<CertKeyHash>) {
-        self.revocation_list = Some(revocation_list);
-    }
-
-    /// Set the role data set.
-    fn set_role_set(&mut self, role_set: Vec<RoleData>) {
-        self.role_set = Some(role_set);
-    }
-}
-
 impl Decode<'_, ()> for Cip509RbacMetadata {
     fn decode(d: &mut Decoder, ctx: &mut ()) -> Result<Self, decode::Error> {
         let map_len = decode_map_len(d, "Cip509RbacMetadata")?;
 
-        let mut x509_rbac_metadata = Cip509RbacMetadata::new();
+        let mut x509_rbac_metadata = Cip509RbacMetadata::default();
 
         for _ in 0..map_len {
             let key: u16 = decode_helper(d, "key in Cip509RbacMetadata", ctx)?;
             if let Some(key) = Cip509RbacMetadataInt::from_repr(key) {
                 match key {
                     Cip509RbacMetadataInt::X509Certs => {
                         let x509_certs = decode_array_rbac(d, "x509 certificate")?;
-                        x509_rbac_metadata.set_x509_certs(x509_certs);
+                        x509_rbac_metadata.x509_certs = Some(x509_certs);
                     },
                     Cip509RbacMetadataInt::C509Certs => {
                         let c509_certs = decode_array_rbac(d, "c509 certificate")?;
-                        x509_rbac_metadata.set_c509_certs(c509_certs);
+                        x509_rbac_metadata.c509_certs = Some(c509_certs);
                     },
                     Cip509RbacMetadataInt::PubKeys => {
                         let pub_keys = decode_array_rbac(d, "public keys")?;
-                        x509_rbac_metadata.set_pub_keys(pub_keys);
+                        x509_rbac_metadata.pub_keys = Some(pub_keys);
                     },
                     Cip509RbacMetadataInt::RevocationList => {
                         let revocation_list = decode_revocation_list(d)?;
-                        x509_rbac_metadata.set_revocation_list(revocation_list);
+                        x509_rbac_metadata.revocation_list = Some(revocation_list);
                     },
                     Cip509RbacMetadataInt::RoleSet => {
                         let role_set = decode_array_rbac(d, "role set")?;
-                        x509_rbac_metadata.set_role_set(role_set);
+                        x509_rbac_metadata.role_set = Some(role_set);
                     },
                 }
             } else {
@@ -139,6 +107,9 @@ impl Decode<'_, ()> for Cip509RbacMetadata {
                     .insert(key, decode_any(d, "purpose key")?);
             }
         }
+
+        // TODO: FIXME:
+        x509_rbac_metadata.fixme = Cip0134UriSet::new();
         Ok(x509_rbac_metadata)
     }
 }

rust/rbac-registration/src/cardano/cip509/utils/cip134/mod.rs

@@ -0,0 +1,7 @@
+//! Utilities for [CIP-134] (Cardano URIs - Address Representation).
+//!
+//! [CIP-134]: https://github.com/cardano-foundation/CIPs/tree/master/CIP-0134
+pub use self::{uri::Cip0134Uri, uri_set::Cip0134UriSet};
+
+mod uri;
+mod uri_set;

rust/rbac-registration/src/cardano/cip509/utils/cip134.rs renamed to rust/rbac-registration/src/cardano/cip509/utils/cip134/uri.rs

@@ -1,4 +1,4 @@
-//! Utility functions for CIP-0134 address.
+//! An URI in the CIP-0134 format.
 
 // Ignore URIs that are used in tests and doc-examples.
 // cSpell:ignoreRegExp web\+cardano:.+
@@ -13,7 +13,8 @@ use pallas::ledger::addresses::Address;
 /// See the [proposal] for more details.
 ///
 /// [proposal]: https://github.com/cardano-foundation/CIPs/pull/888
-#[derive(Debug)]
+#[derive(Debug, Eq, PartialEq)]
+#[allow(clippy::module_name_repetitions)]
 pub struct Cip0134Uri {
     /// A URI string.
     uri: String,