SignedSSVMessage and SSVMessage validation (sigp#160)

Co-authored-by: Zachary Holme <zacholme@gmail.com>

Author: diegomrsantos

Cargo.lock

@@ -214,9 +214,9 @@ where
         &self,
         wrapped_msg: &WrappedQbftMessage,
     ) -> Option<(Option<ValidData<D>>, OperatorId)> {
-        // Validate the wrapped message. This will validate the SignedSsvMessage and the QbftMessage
-        if !wrapped_msg.validate() {
-            warn!("Message validation unsuccessful");
+        // Validate the qbft message
+        if !wrapped_msg.qbft_message.validate() {
+            warn!("Invalid qbft_message");
             return None;
         }
 
@@ -927,7 +927,8 @@ where
             MsgType::SSVConsensusMsgType,
             self.identifier.clone(),
             qbft_message.as_ssz_bytes(),
-        );
+        )
+        .expect("SSVMessage should be valid."); //TODO revisit this
 
         // Wrap in unsigned SSV message
         UnsignedSSVMessage {

anchor/common/qbft/src/lib.rs

@@ -50,13 +50,6 @@ pub struct WrappedQbftMessage {
     pub qbft_message: QbftMessage,
 }
 
-impl WrappedQbftMessage {
-    // Validate that the message is well formed
-    pub fn validate(&self) -> bool {
-        self.signed_message.validate() && self.qbft_message.validate()
-    }
-}
-
 /// This represents an individual round, these change on regular time intervals
 #[derive(Clone, Copy, Debug, Deref, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct Round(NonZeroUsize);

anchor/common/qbft/src/qbft_types.rs

@@ -6,7 +6,7 @@ use super::*;
 use qbft_types::DefaultLeaderFunction;
 use sha2::{Digest, Sha256};
 use ssv_types::consensus::UnsignedSSVMessage;
-use ssv_types::message::SignedSSVMessage;
+use ssv_types::message::{SignedSSVMessage, RSA_SIGNATURE_SIZE};
 use ssv_types::OperatorId;
 use ssz_derive::{Decode, Encode};
 use std::cell::RefCell;
@@ -46,7 +46,7 @@ fn convert_unsigned_to_wrapped(
 ) -> WrappedQbftMessage {
     // Create a signed message containing just this operator
     let signed_message = SignedSSVMessage::new(
-        vec![vec![0; 96]], // Test signature of 96 bytes
+        vec![vec![0; RSA_SIGNATURE_SIZE]],
         vec![OperatorId(*operator_id)],
         msg.ssv_message.clone(),
         msg.full_data,

anchor/common/qbft/src/tests.rs

@@ -14,6 +14,7 @@ indexmap = { workspace = true }
 openssl = { workspace = true }
 rusqlite = { workspace = true }
 sha2 = { workspace = true }
+thiserror = { workspace = true }
 tree_hash = { workspace = true }
 tree_hash_derive = { workspace = true }
 types = { workspace = true }

anchor/common/ssv_types/Cargo.toml

@@ -13,3 +13,5 @@ pub mod partial_sig;
 mod share;
 mod sql_conversions;
 mod util;
+
+pub use share::ENCRYPTED_KEY_LENGTH;