uhv: add http-parser permissive parsing mode for h1 codec

bazel/external/http_parser/BUILD

@@ -12,7 +12,7 @@ cc_library(
     # This compiler flag is set to an arbtitrarily high number so
     # as to effectively disables the http_parser header limit, as
     # we do our own checks in the conn manager and codec.
-    copts = ["-DHTTP_MAX_HEADER_SIZE=0x2000000"],
+    copts = ["-DHTTP_MAX_HEADER_SIZE=0x2000000", "-DHTTP_PARSER_STRICT"],
     includes = ["."],
     visibility = ["//visibility:public"],
 )

bazel/external/http_parser__permissive/BUILD

@@ -0,0 +1,18 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+licenses(["notice"])  # Apache 2
+
+cc_library(
+    name = "http_parser__permissive",
+    srcs = [
+        "http_parser_permissive.cc",
+        "http_parser_permissive.h",
+    ],
+    hdrs = ["http_parser_permissive.h"],
+    # This compiler flag is set to an arbtitrarily high number so
+    # as to effectively disables the http_parser header limit, as
+    # we do our own checks in the conn manager and codec.
+    copts = ["-DHTTP_MAX_HEADER_SIZE=0x2000000"],
+    includes = ["."],
+    visibility = ["//visibility:public"],
+)

bazel/external/http_parser__permissive/README.md

@@ -0,0 +1,4 @@
+This is a clone of the [http-parser](https://github.com/nodejs/http-parser)
+repo at commit `4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878`. See GitHub issue
+[#19749](https://github.com/envoyproxy/envoy/issues/19749) for more
+information.

bazel/repositories.bzl

@@ -577,6 +577,10 @@ def _com_github_nodejs_http_parser():
         name = "http_parser",
         actual = "@envoy//bazel/external/http_parser",
     )
+    native.bind(
+        name = "http_parser__permissive",
+        actual = "@envoy//bazel/external/http_parser__permissive",
+    )
 
 def _com_github_alibaba_hessian2_codec():
     external_http_archive("com_github_alibaba_hessian2_codec")

envoy/http/codec.h

@@ -46,6 +46,14 @@ const char MaxResponseHeadersCountOverrideKey[] =
 
 class Stream;
 
+/**
+ * Header validation mode that codecs should use internally.
+ */
+enum class CodecHeaderValidationMode {
+  Enabled,
+  Disabled,
+};
+
 /**
  * Error codes used to convey the reason for a GOAWAY.
  */

source/common/http/codec_client.cc

@@ -183,7 +183,7 @@ NoConnectCodecClientProd::NoConnectCodecClientProd(CodecType type,
   case CodecType::HTTP1: {
     codec_ = std::make_unique<Http1::ClientConnectionImpl>(
         *connection_, host->cluster().http1CodecStats(), *this, host->cluster().http1Settings(),
-        host->cluster().maxResponseHeadersCount());
+        host->cluster().maxResponseHeadersCount(), CodecHeaderValidationMode::Enabled);
     break;
   }
   case CodecType::HTTP2: {

source/common/http/conn_manager_utility.cc

@@ -70,7 +70,8 @@ ServerConnectionPtr ConnectionManagerUtility::autoCreateCodec(
     Http1::CodecStats& stats = Http1::CodecStats::atomicGet(http1_codec_stats, scope);
     return std::make_unique<Http1::ServerConnectionImpl>(
         connection, stats, callbacks, http1_settings, max_request_headers_kb,
-        max_request_headers_count, headers_with_underscores_action);
+        max_request_headers_count, headers_with_underscores_action,
+        CodecHeaderValidationMode::Enabled);
   }
 }
 

source/common/http/http1/BUILD

@@ -35,6 +35,7 @@ envoy_cc_library(
         ":codec_stats_lib",
         ":header_formatter_lib",
         ":legacy_parser_lib",
+        ":legacy_permissive_parser_lib",
         ":parser_interface",
         "//envoy/buffer:buffer_interface",
         "//envoy/common:scope_tracker_interface",
@@ -108,11 +109,36 @@ envoy_cc_library(
 
 envoy_cc_library(
     name = "legacy_parser_lib",
-    srcs = ["legacy_parser_impl.cc"],
-    hdrs = ["legacy_parser_impl.h"],
-    external_deps = ["http_parser"],
+    srcs = [
+        "legacy_parser_impl.cc",
+    ],
+    hdrs = [
+        "legacy_parser_impl.h",
+    ],
+    external_deps = [
+        "http_parser",
+    ],
     deps = [
         ":parser_interface",
+        "//envoy/http:codec_interface",
+        "//source/common/common:assert_lib",
+    ],
+)
+
+envoy_cc_library(
+    name = "legacy_permissive_parser_lib",
+    srcs = [
+        "legacy_permissive_parser_impl.cc",
+    ],
+    hdrs = [
+        "legacy_permissive_parser_impl.h",
+    ],
+    external_deps = [
+        "http_parser__permissive",
+    ],
+    deps = [
+        ":parser_interface",
+        "//envoy/http:codec_interface",
         "//source/common/common:assert_lib",
     ],
 )

source/common/http/http1/codec_impl.cc

@@ -21,6 +21,7 @@
 #include "source/common/http/headers.h"
 #include "source/common/http/http1/header_formatter.h"
 #include "source/common/http/http1/legacy_parser_impl.h"
+#include "source/common/http/http1/legacy_permissive_parser_impl.h"
 #include "source/common/http/utility.h"
 #include "source/common/runtime/runtime_features.h"
 
@@ -472,7 +473,8 @@ int ConnectionImpl::setAndCheckCallbackStatusOr(Envoy::StatusOr<ParserStatus>&&
 
 ConnectionImpl::ConnectionImpl(Network::Connection& connection, CodecStats& stats,
                                const Http1Settings& settings, MessageType type,
-                               uint32_t max_headers_kb, const uint32_t max_headers_count)
+                               uint32_t max_headers_kb, const uint32_t max_headers_count,
+                               const CodecHeaderValidationMode codec_header_validation_mode)
     : connection_(connection), stats_(stats), codec_settings_(settings),
       encode_only_header_key_formatter_(encodeOnlyFormatterFromSettings(settings)),
       processing_trailers_(false), handling_upgrade_(false), reset_stream_called_(false),
@@ -483,7 +485,11 @@ ConnectionImpl::ConnectionImpl(Network::Connection& connection, CodecStats& stat
           []() -> void { /* TODO(adisuissa): Handle overflow watermark */ })),
       max_headers_kb_(max_headers_kb), max_headers_count_(max_headers_count) {
   output_buffer_->setWatermarks(connection.bufferLimit());
-  parser_ = std::make_unique<LegacyHttpParserImpl>(type, this);
+  if (codec_header_validation_mode == CodecHeaderValidationMode::Enabled) {
+    parser_ = std::make_unique<LegacyHttpParserImpl>(type, this);
+  } else {
+    parser_ = std::make_unique<LegacyPermissiveHttpParserImpl>(type, this);
+  }
 }
 
 Status ConnectionImpl::completeLastHeader() {
@@ -957,9 +963,10 @@ ServerConnectionImpl::ServerConnectionImpl(
     const Http1Settings& settings, uint32_t max_request_headers_kb,
     const uint32_t max_request_headers_count,
     envoy::config::core::v3::HttpProtocolOptions::HeadersWithUnderscoresAction
-        headers_with_underscores_action)
+        headers_with_underscores_action,
+    const CodecHeaderValidationMode codec_header_validation_mode)
     : ConnectionImpl(connection, stats, settings, MessageType::Request, max_request_headers_kb,
-                     max_request_headers_count),
+                     max_request_headers_count, codec_header_validation_mode),
       callbacks_(callbacks),
       response_buffer_releasor_([this](const Buffer::OwnedBufferFragmentImpl* fragment) {
         releaseOutboundResponse(fragment);
@@ -1269,11 +1276,12 @@ void ServerConnectionImpl::ActiveRequest::dumpState(std::ostream& os, int indent
   os << DUMP_MEMBER(response_encoder_.local_end_stream_);
 }
 
-ClientConnectionImpl::ClientConnectionImpl(Network::Connection& connection, CodecStats& stats,
-                                           ConnectionCallbacks&, const Http1Settings& settings,
-                                           const uint32_t max_response_headers_count)
+ClientConnectionImpl::ClientConnectionImpl(
+    Network::Connection& connection, CodecStats& stats, ConnectionCallbacks&,
+    const Http1Settings& settings, const uint32_t max_response_headers_count,
+    const CodecHeaderValidationMode codec_header_validation_mode)
     : ConnectionImpl(connection, stats, settings, MessageType::Response, MAX_RESPONSE_HEADERS_KB,
-                     max_response_headers_count) {}
+                     max_response_headers_count, codec_header_validation_mode) {}
 
 bool ClientConnectionImpl::cannotHaveBody() {
   if (pending_response_.has_value() && pending_response_.value().encoder_.headRequest()) {

source/common/http/http1/codec_impl.h

@@ -252,7 +252,8 @@ class ConnectionImpl : public virtual Connection,
 
 protected:
   ConnectionImpl(Network::Connection& connection, CodecStats& stats, const Http1Settings& settings,
-                 MessageType type, uint32_t max_headers_kb, const uint32_t max_headers_count);
+                 MessageType type, uint32_t max_headers_kb, const uint32_t max_headers_count,
+                 CodecHeaderValidationMode codec_header_validation_mode);
 
   bool resetStreamCalled() { return reset_stream_called_; }
 
@@ -434,7 +435,8 @@ class ServerConnectionImpl : public ServerConnection, public ConnectionImpl {
                        ServerConnectionCallbacks& callbacks, const Http1Settings& settings,
                        uint32_t max_request_headers_kb, const uint32_t max_request_headers_count,
                        envoy::config::core::v3::HttpProtocolOptions::HeadersWithUnderscoresAction
-                           headers_with_underscores_action);
+                           headers_with_underscores_action,
+                       const CodecHeaderValidationMode codec_header_validation_mode);
   bool supportsHttp10() override { return codec_settings_.accept_http_10_; }
 
 protected:
@@ -550,7 +552,8 @@ class ClientConnectionImpl : public ClientConnection, public ConnectionImpl {
 public:
   ClientConnectionImpl(Network::Connection& connection, CodecStats& stats,
                        ConnectionCallbacks& callbacks, const Http1Settings& settings,
-                       const uint32_t max_response_headers_count);
+                       const uint32_t max_response_headers_count,
+                       const CodecHeaderValidationMode codec_header_validation_mode);
   // Http::ClientConnection
   RequestEncoder& newStream(ResponseDecoder& response_decoder) override;