Merge pull request #5101 from stacks-network/fix/event-dispatcher-timeout

Fix event dispatcher stall

Author: jcnelson

Cargo.lock

@@ -121,7 +121,7 @@ impl HttpRequest for GetStackersRequestHandler {
     }
 
     fn path_regex(&self) -> Regex {
-        Regex::new(r#"^/v3/stacker_set/(?P<cycle_num>[0-9]{1,20})$"#).unwrap()
+        Regex::new(r#"^/v3/stacker_set/(?P<cycle_num>[0-9]{1,10})$"#).unwrap()
     }
 
     fn metrics_identifier(&self) -> &str {

stackslib/src/net/api/getstackers.rs

@@ -494,8 +494,12 @@ impl AtlasDB {
         page_index: u32,
         block_id: &StacksBlockId,
     ) -> Result<Vec<bool>, db_error> {
-        let min = page_index * AttachmentInstance::ATTACHMENTS_INV_PAGE_SIZE;
-        let max = min + AttachmentInstance::ATTACHMENTS_INV_PAGE_SIZE;
+        let min = page_index
+            .checked_mul(AttachmentInstance::ATTACHMENTS_INV_PAGE_SIZE)
+            .ok_or(db_error::Overflow)?;
+        let max = min
+            .checked_add(AttachmentInstance::ATTACHMENTS_INV_PAGE_SIZE)
+            .ok_or(db_error::Overflow)?;
         let qry = "SELECT attachment_index, is_available FROM attachment_instances WHERE attachment_index >= ?1 AND attachment_index < ?2 AND index_block_hash = ?3 ORDER BY attachment_index ASC";
         let args = params![min, max, block_id,];
         let rows = query_rows::<(u32, u32), _>(&self.conn, &qry, args)?;

stackslib/src/net/atlas/db.rs

@@ -971,7 +971,7 @@ impl<P: ProtocolFamily> ConnectionInbox<P> {
             // NOTE: it's important that buf not be too big, since up to buf.len()-1 bytes may need
             // to be copied if a message boundary isn't aligned with buf (which is usually the
             // case).
-            let mut buf = [0u8; 4096];
+            let mut buf = [0u8; 65536];
             let num_read = match fd.read(&mut buf) {
                 Ok(0) => {
                     // remote fd is closed, but do try to consume all remaining bytes in the buffer

stackslib/src/net/connection.rs

@@ -178,14 +178,14 @@ impl FromStr for HttpContentType {
         let s = header.to_string().to_lowercase();
         if s == "application/octet-stream" {
             Ok(HttpContentType::Bytes)
-        } else if s == "text/plain" {
+        } else if s == "text/plain" || s.starts_with("text/plain;") {
             Ok(HttpContentType::Text)
-        } else if s == "application/json" {
+        } else if s == "application/json" || s.starts_with("application/json;") {
             Ok(HttpContentType::JSON)
         } else {
-            Err(CodecError::DeserializeError(
-                "Unsupported HTTP content type".to_string(),
-            ))
+            Err(CodecError::DeserializeError(format!(
+                "Unsupported HTTP content type: {header}"
+            )))
         }
     }
 }

stackslib/src/net/http/mod.rs

@@ -582,7 +582,7 @@ impl StacksMessageCodec for HttpResponsePreamble {
                     ));
                 }
 
-                if content_type.is_none() || (content_length.is_none() && !chunked_encoding) {
+                if content_length.is_none() && !chunked_encoding {
                     return Err(CodecError::DeserializeError(
                         "Invalid HTTP response: missing Content-Type, Content-Length".to_string(),
                     ));
@@ -593,7 +593,7 @@ impl StacksMessageCodec for HttpResponsePreamble {
                     status_code: status_code,
                     reason: reason,
                     keep_alive: keep_alive,
-                    content_type: content_type.unwrap(),
+                    content_type: content_type.unwrap_or(HttpContentType::Bytes), // per the RFC
                     content_length: content_length,
                     headers: headers,
                 })

stackslib/src/net/http/response.rs

@@ -368,8 +368,6 @@ fn test_parse_http_response_preamble_err() {
          "Unsupported HTTP content type"),
         ("HTTP/1.1 200 OK\r\nContent-Length: foo\r\n\r\n",
          "Invalid Content-Length"),
-        ("HTTP/1.1 200 OK\r\nContent-Length: 123\r\n\r\n",
-         "missing Content-Type, Content-Length"),
         ("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n",
          "missing Content-Type, Content-Length"),
         ("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 123\r\nTransfer-Encoding: chunked\r\n\r\n",