introduce RsaParseError

Author: diegomrsantos

anchor/common/ssv_types/src/lib.rs

@@ -2,7 +2,7 @@ pub use cluster::{Cluster, ClusterId, ClusterMember, ValidatorIndex, ValidatorMe
 pub use committee::{CommitteeId, CommitteeInfo};
 pub use operator::{Operator, OperatorId};
 pub use share::Share;
-pub use util::parse_rsa;
+pub use util::{RsaParseError, parse_rsa};
 mod cluster;
 mod committee;
 pub mod consensus;

anchor/common/ssv_types/src/operator.rs

@@ -5,7 +5,7 @@ use openssl::{pkey::Public, rsa::Rsa};
 use ssz_derive::{Decode, Encode};
 use types::Address;
 
-use crate::util::parse_rsa;
+use crate::{RsaParseError, util::parse_rsa};
 
 /// Unique identifier for an Operator.
 #[derive(
@@ -41,7 +41,11 @@ pub struct Operator {
 
 impl Operator {
     /// Creates a new operator from its OperatorId and PEM-encoded public key string
-    pub fn new(pem_data: &str, operator_id: OperatorId, owner: Address) -> Result<Self, String> {
+    pub fn new(
+        pem_data: &str,
+        operator_id: OperatorId,
+        owner: Address,
+    ) -> Result<Self, RsaParseError> {
         let rsa_pubkey = parse_rsa(pem_data)?;
         Ok(Self::new_with_pubkey(rsa_pubkey, operator_id, owner))
     }

anchor/common/ssv_types/src/util.rs

@@ -1,16 +1,36 @@
 use base64::prelude::*;
 use openssl::{pkey::Public, rsa::Rsa};
+use thiserror::Error;
+
+/// Errors that can occur during RSA key parsing
+#[derive(Error, Debug, Clone)]
+pub enum RsaParseError {
+    #[error("Unable to decode base64 PEM data: {0}")]
+    Base64Decode(#[from] base64::DecodeError),
+
+    #[error("Unable to convert decoded PEM data into a string: {0}")]
+    Utf8Conversion(#[from] std::string::FromUtf8Error),
+
+    #[error("Failed to parse RSA public key: {source}")]
+    RsaParsing {
+        #[source]
+        source: openssl::error::ErrorStack,
+    },
+}
+
+impl From<RsaParseError> for String {
+    fn from(error: RsaParseError) -> Self {
+        error.to_string()
+    }
+}
 
 // Parse from a RSA public key string into the associated RSA representation
-pub fn parse_rsa(pem_data: &str) -> Result<Rsa<Public>, String> {
+pub fn parse_rsa(pem_data: &str) -> Result<Rsa<Public>, RsaParseError> {
     // First decode the base64 data
-    let pem_decoded = BASE64_STANDARD
-        .decode(pem_data)
-        .map_err(|e| format!("Unable to decode base64 pem data: {e}"))?;
+    let pem_decoded = BASE64_STANDARD.decode(pem_data)?;
 
     // Convert the decoded data to a string
-    let mut pem_string = String::from_utf8(pem_decoded)
-        .map_err(|e| format!("Unable to convert decoded pem data into a string: {e}"))?;
+    let mut pem_string = String::from_utf8(pem_decoded)?;
 
     // Fix the header - replace PKCS1 header with PKCS8 header
     pem_string = pem_string
@@ -22,7 +42,7 @@ pub fn parse_rsa(pem_data: &str) -> Result<Rsa<Public>, String> {
 
     // Parse the PEM string into an RSA public key using PKCS8 format
     let rsa_pubkey = Rsa::public_key_from_pem(pem_string.as_bytes())
-        .map_err(|e| format!("Failed to parse RSA public key: {e}"))?;
+        .map_err(|source| RsaParseError::RsaParsing { source })?;
 
     Ok(rsa_pubkey)
 }