Merge branch 'main' into fix/immutable-roll-forward

stevenj · web-flow · commit 2ef16a9eb9bc · 2025-03-24T21:09:53.000+07:00
diff --git a/rust/catalyst-types/src/hashes.rs b/rust/catalyst-types/src/hashes.rs
@@ -102,7 +102,7 @@ impl<const BYTES: usize> TryFrom<&[u8]> for Blake2bHash<BYTES> {
     type Error = Blake2bHashError;
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        if value.len() < BYTES {
+        if value.len() != BYTES {
             return Err(Blake2bHashError::InvalidLength {
                 expected: BYTES,
                 actual: value.len(),
@@ -213,5 +213,16 @@ mod tests {
         } else {
             panic!("Expected InvalidLength error");
         }
+
+        let invalid_data = vec![0u8; 50];
+        let result = Blake2b224Hash::try_from(&invalid_data);
+        assert!(result.is_err());
+
+        if let Err(Blake2bHashError::InvalidLength { expected, actual }) = result {
+            assert_eq!(expected, BLAKE_2B224_SIZE);
+            assert_eq!(actual, invalid_data.len());
+        } else {
+            panic!("Expected InvalidLength error");
+        }
     }
 }
diff --git a/rust/rbac-registration/src/cardano/cip509/rbac/certs/c509.rs b/rust/rbac-registration/src/cardano/cip509/rbac/certs/c509.rs
@@ -28,7 +28,10 @@ impl Decode<'_, ProblemReport> for C509Cert {
             minicbor::data::Type::Tag => {
                 let tag = decode_tag(d, "C509Cert")?;
                 match tag {
-                    t if t == KeyTag::Deleted.tag() => Ok(Self::Deleted),
+                    t if t == KeyTag::Deleted.tag() => {
+                        d.undefined()?;
+                        Ok(Self::Deleted)
+                    },
                     _ => Err(decode::Error::message("Unknown tag for C509Cert")),
                 }
             },
diff --git a/rust/rbac-registration/src/cardano/cip509/rbac/certs/x509.rs b/rust/rbac-registration/src/cardano/cip509/rbac/certs/x509.rs
@@ -26,7 +26,10 @@ impl Decode<'_, ProblemReport> for X509DerCert {
             minicbor::data::Type::Tag => {
                 let tag = decode_tag(d, "X509DerCert")?;
                 match tag {
-                    t if t == KeyTag::Deleted.tag() => Ok(Self::Deleted),
+                    t if t == KeyTag::Deleted.tag() => {
+                        d.undefined()?;
+                        Ok(Self::Deleted)
+                    },
                     _ => Err(decode::Error::message("Unknown tag for X509DerCert")),
                 }
             },
diff --git a/rust/rbac-registration/src/cardano/cip509/rbac/pub_key.rs b/rust/rbac-registration/src/cardano/cip509/rbac/pub_key.rs
@@ -25,7 +25,10 @@ impl Decode<'_, ProblemReport> for SimplePublicKeyType {
             minicbor::data::Type::Tag => {
                 let tag = decode_tag(d, "SimplePublicKeyType")?;
                 match tag {
-                    t if t == KeyTag::Deleted.tag() => Ok(Self::Deleted),
+                    t if t == KeyTag::Deleted.tag() => {
+                        d.undefined()?;
+                        Ok(Self::Deleted)
+                    },
                     t if t == KeyTag::Ed25519.tag() => {
                         let bytes = decode_bytes(d, "Ed25519 SimplePublicKeyType")?;
                         let mut ed25519 = [0u8; 32];
@@ -42,7 +45,11 @@ impl Decode<'_, ProblemReport> for SimplePublicKeyType {
                             )))
                         }
                     },
-                    _ => Err(decode::Error::message("Unknown tag for Self")),
+                    _ => {
+                        Err(decode::Error::message(
+                            "Unknown tag for SimplePublicKeyType",
+                        ))
+                    },
                 }
             },
             minicbor::data::Type::Undefined => {
diff --git a/rust/rbac-registration/src/cardano/cip509/rbac/role_data.rs b/rust/rbac-registration/src/cardano/cip509/rbac/role_data.rs
@@ -137,14 +137,14 @@ impl Decode<'_, ProblemReport> for CborRoleData {
 
 /// Decodes a signing key.
 fn decode_signing_key(
-    d: &mut Decoder, context: &str, report: &ProblemReport,
+    d: &mut Decoder, context: &str, report: &mut ProblemReport,
 ) -> Result<Option<KeyLocalRef>, ()> {
     if let Err(e) = decode_array_len(d, "RoleSigningKey") {
         report.other(&format!("{e:?}"), context);
         return Err(());
     }
 
-    match KeyLocalRef::decode(d, &mut ()) {
+    match KeyLocalRef::decode(d, report) {
         Ok(v) => Ok(Some(v)),
         Err(e) => {
             report.other(
@@ -158,14 +158,14 @@ fn decode_signing_key(
 
 /// Decodes an encryption key.
 fn decode_encryption_key(
-    d: &mut Decoder, context: &str, report: &ProblemReport,
+    d: &mut Decoder, context: &str, report: &mut ProblemReport,
 ) -> Result<Option<KeyLocalRef>, ()> {
     if let Err(e) = decode_array_len(d, "RoleEncryptionKey") {
         report.other(&format!("{e:?}"), context);
         return Err(());
     }
 
-    match KeyLocalRef::decode(d, &mut ()) {
+    match KeyLocalRef::decode(d, report) {
         Ok(v) => Ok(Some(v)),
         Err(e) => {
             report.other(
diff --git a/rust/rbac-registration/src/cardano/cip509/rbac/tag.rs b/rust/rbac-registration/src/cardano/cip509/rbac/tag.rs
@@ -7,15 +7,16 @@ pub(crate) enum KeyTag {
     /// Deleted Key tag 31.
     Deleted,
     /// Ed25519 Key tag 32773.
+    /// <https://cips.cardano.org/cip/CIP-0115>
     Ed25519,
 }
 
 impl KeyTag {
     /// Get the tag value.
     pub(crate) fn tag(self) -> Tag {
         match self {
-            KeyTag::Deleted => Tag::new(0x31),
-            KeyTag::Ed25519 => Tag::new(0x8005),
+            KeyTag::Deleted => Tag::new(31),
+            KeyTag::Ed25519 => Tag::new(32773),
         }
     }
 }
diff --git a/rust/rbac-registration/src/cardano/cip509/types/key_local_ref.rs b/rust/rbac-registration/src/cardano/cip509/types/key_local_ref.rs
@@ -1,22 +1,23 @@
 //! A local key reference.
 
+use catalyst_types::problem_report::ProblemReport;
 use cbork_utils::decode_helper::decode_helper;
 use minicbor::{decode, Decode, Decoder};
 use strum_macros::FromRepr;
 
 use crate::cardano::cip509::rbac::Cip509RbacMetadataInt;
 
 /// Local key reference.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Copy)]
 pub struct KeyLocalRef {
     /// Local reference.
     pub local_ref: LocalRefInt,
     /// Key offset.
-    pub key_offset: u64,
+    pub key_offset: usize,
 }
 
 /// Enum of local reference with its associated unsigned integer value.
-#[derive(FromRepr, Debug, PartialEq, Clone, Eq, Hash)]
+#[derive(FromRepr, Debug, PartialEq, Clone, Copy, Eq, Hash)]
 #[repr(u8)]
 pub enum LocalRefInt {
     /// x509 certificates.
@@ -27,11 +28,23 @@ pub enum LocalRefInt {
     PubKeys = Cip509RbacMetadataInt::PubKeys as u8, // 30
 }
 
-impl Decode<'_, ()> for KeyLocalRef {
-    fn decode(d: &mut Decoder, ctx: &mut ()) -> Result<Self, decode::Error> {
-        let local_ref = LocalRefInt::from_repr(decode_helper(d, "LocalRef in KeyLocalRef", ctx)?)
-            .ok_or(decode::Error::message("Invalid local reference"))?;
-        let key_offset: u64 = decode_helper(d, "KeyOffset in KeyLocalRef", ctx)?;
+impl Decode<'_, ProblemReport> for KeyLocalRef {
+    fn decode(d: &mut Decoder, report: &mut ProblemReport) -> Result<Self, decode::Error> {
+        let local_ref =
+            LocalRefInt::from_repr(decode_helper(d, "LocalRef in KeyLocalRef", &mut ())?)
+                .ok_or(decode::Error::message("Invalid local reference"))?;
+        let key_offset: u64 = decode_helper(d, "KeyOffset in KeyLocalRef", &mut ())?;
+        let key_offset = if let Ok(v) = usize::try_from(key_offset) {
+            v
+        } else {
+            report.invalid_value(
+                "key_offset",
+                &format!("{key_offset}"),
+                &format!("Value must be less than {}", usize::MAX),
+                "KeyLocalRef decoding",
+            );
+            0
+        };
         Ok(Self {
             local_ref,
             key_offset,
diff --git a/rust/rbac-registration/src/cardano/cip509/types/role_number.rs b/rust/rbac-registration/src/cardano/cip509/types/role_number.rs
@@ -14,3 +14,9 @@ impl From<u8> for RoleNumber {
         Self(value)
     }
 }
+
+impl From<RoleNumber> for u8 {
+    fn from(value: RoleNumber) -> Self {
+        value.0
+    }
+}
diff --git a/rust/rbac-registration/src/registration/cardano/mod.rs b/rust/rbac-registration/src/registration/cardano/mod.rs
@@ -432,7 +432,7 @@ fn update_role_data(
                 .role_data
                 .get(&number)
                 .and_then(|pd| pd.data().signing_key())
-                .cloned();
+                .copied();
             data.set_signing_key(signing_key);
         }
 
@@ -442,7 +442,7 @@ fn update_role_data(
                 .role_data
                 .get(&number)
                 .and_then(|pd| pd.data().encryption_key())
-                .cloned();
+                .copied();
             data.set_encryption_key(encryption_key);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,16 @@ pub(crate) enum KeyTag {`
`7`	`7`	`/// Deleted Key tag 31.`
`8`	`8`	`Deleted,`
`9`	`9`	`/// Ed25519 Key tag 32773.`
	`10`	`+ /// <https://cips.cardano.org/cip/CIP-0115>`
`10`	`11`	`Ed25519,`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`impl KeyTag {`
`14`	`15`	`/// Get the tag value.`
`15`	`16`	`pub(crate) fn tag(self) -> Tag {`
`16`	`17`	`match self {`
`17`		`- KeyTag::Deleted => Tag::new(0x31),`
`18`		`- KeyTag::Ed25519 => Tag::new(0x8005),`
	`18`	`+ KeyTag::Deleted => Tag::new(31),`
	`19`	`+ KeyTag::Ed25519 => Tag::new(32773),`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,9 @@ impl From<u8> for RoleNumber {`
`14`	`14`	`Self(value)`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+impl From<RoleNumber> for u8 {`
	`19`	`+ fn from(value: RoleNumber) -> Self {`
	`20`	`+ value.0`
	`21`	`+ }`
	`22`	`+}`