fix(p2p): apply code review suggestions

Author: vlad9486

node/common/src/service/p2p.rs

@@ -88,11 +88,12 @@ impl P2pCryptoService for NodeService {
             .expect("unable to create signature")
     }
 
-    fn verify_publication(&mut self, pk: &[u8], publication: &[u8], sig: &[u8]) -> bool {
-        let Ok(pk) = libp2p_identity::PublicKey::try_decode_protobuf(pk) else {
-            return false;
-        };
-        println!("pk {:?}", pk);
+    fn verify_publication(
+        &mut self,
+        pk: &libp2p_identity::PublicKey,
+        publication: &[u8],
+        sig: &[u8],
+    ) -> bool {
         let msg: Vec<u8> = [b"libp2p-pubsub:", publication].concat();
         pk.verify(&msg, sig)
     }

node/testing/src/service/mod.rs

@@ -297,7 +297,12 @@ impl P2pCryptoService for NodeTestingService {
         self.real.sign_publication(publication)
     }
 
-    fn verify_publication(&mut self, pk: &[u8], publication: &[u8], sig: &[u8]) -> bool {
+    fn verify_publication(
+        &mut self,
+        pk: &libp2p_identity::PublicKey,
+        publication: &[u8],
+        sig: &[u8],
+    ) -> bool {
         self.real.verify_publication(pk, publication, sig)
     }
 }

p2p/src/network/p2p_network_service.rs

@@ -36,7 +36,12 @@ pub trait P2pCryptoService: redux::Service {
     fn sign_key(&mut self, key: &[u8; 32]) -> Vec<u8>;
 
     fn sign_publication(&mut self, publication: &[u8]) -> Vec<u8>;
-    fn verify_publication(&mut self, pk: &[u8], publication: &[u8], sig: &[u8]) -> bool;
+    fn verify_publication(
+        &mut self,
+        pk: &libp2p_identity::PublicKey,
+        publication: &[u8],
+        sig: &[u8],
+    ) -> bool;
 }
 
 #[derive(Debug, thiserror::Error)]

p2p/src/network/pubsub/p2p_network_pubsub_effects.rs

@@ -132,6 +132,7 @@ impl P2pNetworkPubsubAction {
                 ..
             } => {
                 let Some(state) = state.clients.get(&peer_id) else {
+                    // TODO: add bug_condition
                     return;
                 };
                 let messages = state.incoming_messages.clone();
@@ -142,16 +143,27 @@ impl P2pNetworkPubsubAction {
                     {
                         message.key = None;
                         let mut data = vec![];
+
+                        let Ok(pk) = libp2p_identity::PublicKey::try_decode_protobuf(&from[2..])
+                        else {
+                            // TODO: add bug_condition
+                            // peer specify bad pk
+                            continue;
+                        };
+
                         #[allow(clippy::if_same_then_else)]
                         if prost::Message::encode(&message, &mut data).is_err() {
+                            // TODO: add bug_condition
+                            // should never happen;
+                            // we just decode this message, so it should encode without error
                             continue;
-                        } else if !store
-                            .service()
-                            .verify_publication(&from[2..], &data, &signature)
-                        {
+                        } else if !store.service().verify_publication(&pk, &data, &signature) {
+                            // TODO: add bug_condition
+                            // signature is invalid
                             continue;
                         }
                     } else {
+                        // TODO: add bug_condition
                         // the message doesn't contain signature or it doesn't contain verifying key
                         continue;
                     }

p2p/testing/src/service.rs

@@ -139,10 +139,12 @@ impl P2pCryptoService for ClusterService {
             .expect("unable to create signature")
     }
 
-    fn verify_publication(&mut self, pk: &[u8], publication: &[u8], sig: &[u8]) -> bool {
-        let Ok(pk) = libp2p_identity::PublicKey::try_decode_protobuf(pk) else {
-            return false;
-        };
+    fn verify_publication(
+        &mut self,
+        pk: &libp2p_identity::PublicKey,
+        publication: &[u8],
+        sig: &[u8],
+    ) -> bool {
         let msg: Vec<u8> = [b"libp2p-pubsub:", publication].concat();
         pk.verify(&msg, sig)
     }