ConnectivityEvent::Misbehaved was added back; a TODO was added in the place where it could be used in the future

Author: ImplOfAnImpl

dns_server/src/crawler_p2p/crawler_manager/mod.rs

@@ -219,6 +219,13 @@ where
             ConnectivityEvent::ConnectionClosed { peer_id } => {
                 self.send_crawler_event(CrawlerEvent::Disconnected { peer_id });
             }
+            ConnectivityEvent::Misbehaved {
+                peer_id: _,
+                error: _,
+            } => {
+                // Ignore all misbehave reports
+                // TODO: Should we ban peers when they send unexpected messages?
+            }
         }
     }
 

p2p/src/net/default_backend/peer.rs

@@ -274,7 +274,11 @@ where
         // TODO: Use a bounded channel to send messages to the peer manager
         match msg.categorize() {
             CategorizedMessage::Handshake(_) => {
-                log::error!("peer {peer} sent handshaking message");
+                // TODO: this must be reported to the peer manager, so that it can adjust
+                // the peer's ban score. (We may add a separate PeerEvent for this and Backend
+                // can then use the now unused ConnectivityEvent::Misbehaved to forward the error
+                // to the peer manager.)
+                log::error!("Peer {peer} sent unexpected handshake message");
             }
             CategorizedMessage::PeerManagerMessage(msg) => {
                 peer_event_tx.send((peer, PeerEvent::MessageReceived { message: msg }))?

p2p/src/net/types.rs

@@ -157,6 +157,15 @@ pub enum ConnectivityEvent {
         peer_id: PeerId,
     },
 
+    /// Protocol violation
+    Misbehaved {
+        /// Unique ID of the peer
+        peer_id: PeerId,
+
+        /// Error code of the violation
+        error: P2pError,
+    },
+
     /// Handshake failed
     HandshakeFailed {
         /// Peer's address

p2p/src/peer_manager/mod.rs

@@ -1282,6 +1282,9 @@ where
             ConnectivityEvent::ConnectionError { address, error } => {
                 self.handle_outbound_error(address, error);
             }
+            ConnectivityEvent::Misbehaved { peer_id, error } => {
+                self.adjust_peer_score(peer_id, error.ban_score());
+            }
             ConnectivityEvent::HandshakeFailed { address, error } => {
                 self.adjust_peer_score_on_failed_handshake(address, error.ban_score());
             }