fix: allow arbitrary response handler only if there is no handler found, and turn it on by default in the parse_response() helper. Also, it's no longer an error to omit content-type; per the RFC, this defaults to application/octet-stream

Author: jcnelson

stackslib/src/net/http/tests.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",

stackslib/src/net/httpcore.rs

@@ -1356,6 +1356,7 @@ impl StacksHttp {
             "127.0.0.1:20443".parse().unwrap(),
             &ConnectionOptions::default(),
         );
+        http.allow_arbitrary_response = true;
 
         let (preamble, message_offset) = http.read_preamble(response_buf)?;
         let is_chunked = match preamble {
@@ -1498,7 +1499,9 @@ impl ProtocolFamily for StacksHttp {
                             num_read,
                         );
 
-                        let parse_res = if self.allow_arbitrary_response {
+                        let parse_res = if self.request_handler_index.is_none()
+                            && self.allow_arbitrary_response
+                        {
                             let arbitrary_parser = RPCArbitraryResponseHandler {};
                             let response_payload = arbitrary_parser
                                 .try_parse_response(http_response_preamble, &message_bytes[..])?;
@@ -1604,7 +1607,7 @@ impl ProtocolFamily for StacksHttp {
                 // message of known length
                 test_debug!("read http response payload of {} bytes", buf.len(),);
 
-                if self.allow_arbitrary_response {
+                if self.request_handler_index.is_none() && self.allow_arbitrary_response {
                     let arbitrary_parser = RPCArbitraryResponseHandler {};
                     let response_payload =
                         arbitrary_parser.try_parse_response(http_response_preamble, buf)?;