Merge pull request #6154 from stacks-network/release/3.1.0.0.11

Merge release/3.1.0.0.11 to master

Author: wileyj

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
+## [3.1.0.0.11]
+
+- Hotfix for p2p stack misbehavior in mempool syncing conditions
+
 ## [3.1.0.0.10]
 
 ### Added

stackslib/src/net/api/postmempoolquery.rs

@@ -97,6 +97,7 @@ pub struct StacksMemPoolStream {
     pub corked: bool,
     /// Did we run out of transactions to send?
     pub finished: bool,
+    num_bytes: u64,
     /// link to the mempool DB
     mempool_db: DBConn,
 }
@@ -118,6 +119,7 @@ impl StacksMemPoolStream {
             tx_query,
             last_randomized_txid,
             num_txs: 0,
+            num_bytes: 0,
             max_txs,
             coinbase_height,
             corked: false,
@@ -178,6 +180,14 @@ impl HttpChunkGenerator for StacksMemPoolStream {
         if !next_txs.is_empty() {
             // have another tx to send
             let chunk = next_txs[0].serialize_to_vec();
+            if u64::try_from(chunk.len())
+                .unwrap()
+                .saturating_add(self.num_bytes)
+                >= u64::from(MAX_MESSAGE_LEN) / 2
+            {
+                self.corked = true;
+                return Ok(self.last_randomized_txid.serialize_to_vec());
+            }
             if let Some(next_last_randomized_txid) = next_last_randomized_txid_opt {
                 // we have more after this
                 self.last_randomized_txid = next_last_randomized_txid;
@@ -187,6 +197,9 @@ impl HttpChunkGenerator for StacksMemPoolStream {
                 self.finished = true;
             }
             self.num_txs += next_txs.len() as u64;
+            self.num_bytes = self
+                .num_bytes
+                .saturating_add(u64::try_from(chunk.len()).unwrap());
             return Ok(chunk);
         } else if let Some(next_txid) = next_last_randomized_txid_opt {
             // no more txs to send

stackslib/src/net/connection.rs

@@ -937,7 +937,12 @@ impl<P: ProtocolFamily> ConnectionInbox<P> {
                         );
                         self.inbox.push_back(message);
                         consumed_message = true;
-                    };
+                    } else {
+                        if bytes_consumed == 0 {
+                            warn!("0 bytes consumed, but no message parsed");
+                            return Err(net_error::ConnectionBroken);
+                        }
+                    }
 
                     bytes_consumed
                 } else {

versions.toml

@@ -1,4 +1,4 @@
 # Update these values when a new release is created.
 # `stacks-common/build.rs` will automatically update `versions.rs` with these values.
-stacks_node_version = "3.1.0.0.10"
-stacks_signer_version = "3.1.0.0.10.0"
+stacks_node_version = "3.1.0.0.11"
+stacks_signer_version = "3.1.0.0.11.0"