now ignoring pubsub messages upon receving invalid-signed-records

Author: lla-dane

libp2p/pubsub/gossipsub.py

@@ -229,7 +229,9 @@ async def handle_rpc(self, rpc: rpc_pb2.RPC, sender_peer_id: ID) -> None:
         """
         # Process the senderRecord if sent
         if isinstance(self.pubsub, Pubsub):
-            _ = maybe_consume_signed_record(rpc, self.pubsub.host)
+            if not maybe_consume_signed_record(rpc, self.pubsub.host):
+                logger.error("Received an invalid-signed-record, ignoring the message")
+                return
 
         control_message = rpc.control
 

libp2p/pubsub/pubsub.py

@@ -270,7 +270,11 @@ async def continuously_read_stream(self, stream: INetStream) -> None:
                 rpc_incoming.ParseFromString(incoming)
 
                 # Process the sender's signed-record if sent
-                _ = maybe_consume_signed_record(rpc_incoming, self.host)
+                if not maybe_consume_signed_record(rpc_incoming, self.host):
+                    logger.error(
+                        "Received an invalid-signed-record, ignoring the incoming msg"
+                    )
+                    continue
 
                 if rpc_incoming.publish:
                     # deal with RPC.publish

tests/core/pubsub/test_pubsub.py

@@ -11,6 +11,7 @@
 import multiaddr
 import trio
 
+from libp2p.crypto.rsa import create_new_key_pair
 from libp2p.custom_types import AsyncValidatorFn
 from libp2p.exceptions import (
     ValidationError,
@@ -162,6 +163,27 @@ async def test_peers_subscribe():
         assert envelope_b_sub.record().seq == envelope_b_unsub.record().seq
 
 
+@pytest.mark.trio
+async def test_peer_subscribe_fail_upon_invald_record_transfer():
+    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+        await connect(pubsubs_fsub[0].host, pubsubs_fsub[1].host)
+
+        # Corrupt host_a's local peer record
+        envelope = pubsubs_fsub[0].host.get_peerstore().get_local_record()
+        key_pair = create_new_key_pair()
+
+        if envelope is not None:
+            envelope.public_key = key_pair.public_key
+            pubsubs_fsub[0].host.get_peerstore().set_local_record(envelope)
+
+        await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
+        # Yeild to let 0 notify 1
+        await trio.sleep(1)
+        assert pubsubs_fsub[0].my_id not in pubsubs_fsub[1].peer_topics.get(
+            TESTING_TOPIC, set()
+        )
+
+
 @pytest.mark.trio
 async def test_get_hello_packet():
     async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub: