From 7f950a43891514c881cea787a91afc4d04aaebbe Mon Sep 17 00:00:00 2001
From: Alvin Baptiste <alvinsb@gmail.com>
Date: Wed, 5 Aug 2020 18:01:31 +0000
Subject: [PATCH] http: remove deprecated
 envoy.reloadable_features.connection_header_sanitization runtime guard

Signed-off-by: Alvin Baptiste <alvinsb@gmail.com>
---
 docs/root/version_history/current.rst         | 1 +
 source/common/http/http1/codec_impl.cc        | 4 +---
 source/common/http/http1/codec_impl.h         | 1 -
 source/common/http/http1/codec_impl_legacy.cc | 4 +---
 source/common/http/http1/codec_impl_legacy.h  | 1 -
 source/common/runtime/runtime_features.cc     | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
index 15f30db08ed3..1854d7e45fe8 100644
--- a/docs/root/version_history/current.rst
+++ b/docs/root/version_history/current.rst
@@ -42,6 +42,7 @@ Removed Config or Runtime
 * http: removed legacy header sanitization and the runtime guard `envoy.reloadable_features.strict_header_validation`.
 * http: removed legacy transfer-encoding enforcement and runtime guard `envoy.reloadable_features.reject_unsupported_transfer_encodings`.
 * http: removed configurable strict host validation and runtime guard `envoy.reloadable_features.strict_authority_validation`.
+* http: removed the connection header sanitization runtime guard `envoy.reloadable_features.connection_header_sanitization`.
 
 New Features
 ------------
diff --git a/source/common/http/http1/codec_impl.cc b/source/common/http/http1/codec_impl.cc
index c9cf88f569e8..2b15971bc52e 100644
--- a/source/common/http/http1/codec_impl.cc
+++ b/source/common/http/http1/codec_impl.cc
@@ -448,8 +448,6 @@ ConnectionImpl::ConnectionImpl(Network::Connection& connection, CodecStats& stat
     : connection_(connection), stats_(stats),
       header_key_formatter_(std::move(header_key_formatter)), processing_trailers_(false),
       handling_upgrade_(false), reset_stream_called_(false), deferred_end_stream_headers_(false),
-      connection_header_sanitization_(Runtime::runtimeFeatureEnabled(
-          "envoy.reloadable_features.connection_header_sanitization")),
       enable_trailers_(enable_trailers),
       strict_1xx_and_204_headers_(Runtime::runtimeFeatureEnabled(
           "envoy.reloadable_features.strict_1xx_and_204_response_headers")),
@@ -848,7 +846,7 @@ int ServerConnectionImpl::onHeadersComplete() {
     ENVOY_CONN_LOG(trace, "Server: onHeadersComplete size={}", connection_, headers->size());
     const char* method_string = http_method_str(static_cast<http_method>(parser_.method));
 
-    if (!handling_upgrade_ && connection_header_sanitization_ && headers->Connection()) {
+    if (!handling_upgrade_ && headers->Connection()) {
       // If we fail to sanitize the request, return a 400 to the client
       if (!Utility::sanitizeConnectionHeader(*headers)) {
         absl::string_view header_value = headers->getConnectionValue();
diff --git a/source/common/http/http1/codec_impl.h b/source/common/http/http1/codec_impl.h
index c74c0adae87c..511f794de01d 100644
--- a/source/common/http/http1/codec_impl.h
+++ b/source/common/http/http1/codec_impl.h
@@ -253,7 +253,6 @@ class ConnectionImpl : public virtual Connection, protected Logger::Loggable<Log
   // HTTP/1 message has been flushed from the parser. This allows raising an HTTP/2 style headers
   // block with end stream set to true with no further protocol data remaining.
   bool deferred_end_stream_headers_ : 1;
-  const bool connection_header_sanitization_ : 1;
   const bool enable_trailers_ : 1;
   const bool strict_1xx_and_204_headers_ : 1;
 
diff --git a/source/common/http/http1/codec_impl_legacy.cc b/source/common/http/http1/codec_impl_legacy.cc
index a8829d2182e2..186fa3e490cb 100644
--- a/source/common/http/http1/codec_impl_legacy.cc
+++ b/source/common/http/http1/codec_impl_legacy.cc
@@ -453,8 +453,6 @@ ConnectionImpl::ConnectionImpl(Network::Connection& connection, CodecStats& stat
     : connection_(connection), stats_(stats),
       header_key_formatter_(std::move(header_key_formatter)), processing_trailers_(false),
       handling_upgrade_(false), reset_stream_called_(false), deferred_end_stream_headers_(false),
-      connection_header_sanitization_(Runtime::runtimeFeatureEnabled(
-          "envoy.reloadable_features.connection_header_sanitization")),
       enable_trailers_(enable_trailers),
       strict_1xx_and_204_headers_(Runtime::runtimeFeatureEnabled(
           "envoy.reloadable_features.strict_1xx_and_204_response_headers")),
@@ -853,7 +851,7 @@ int ServerConnectionImpl::onHeadersComplete() {
     ENVOY_CONN_LOG(trace, "Server: onHeadersComplete size={}", connection_, headers->size());
     const char* method_string = http_method_str(static_cast<http_method>(parser_.method));
 
-    if (!handling_upgrade_ && connection_header_sanitization_ && headers->Connection()) {
+    if (!handling_upgrade_ && headers->Connection()) {
       // If we fail to sanitize the request, return a 400 to the client
       if (!Utility::sanitizeConnectionHeader(*headers)) {
         absl::string_view header_value = headers->getConnectionValue();
diff --git a/source/common/http/http1/codec_impl_legacy.h b/source/common/http/http1/codec_impl_legacy.h
index 622d9441459b..b553c5f9f9c7 100644
--- a/source/common/http/http1/codec_impl_legacy.h
+++ b/source/common/http/http1/codec_impl_legacy.h
@@ -257,7 +257,6 @@ class ConnectionImpl : public virtual Connection, protected Logger::Loggable<Log
   // HTTP/1 message has been flushed from the parser. This allows raising an HTTP/2 style headers
   // block with end stream set to true with no further protocol data remaining.
   bool deferred_end_stream_headers_ : 1;
-  const bool connection_header_sanitization_ : 1;
   const bool enable_trailers_ : 1;
   const bool strict_1xx_and_204_headers_ : 1;
 
diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc
index 0cd11caf9396..7a22c679951a 100644
--- a/source/common/runtime/runtime_features.cc
+++ b/source/common/runtime/runtime_features.cc
@@ -55,7 +55,6 @@ constexpr const char* runtime_features[] = {
     // Enabled
     "envoy.reloadable_features.http1_flood_protection",
     "envoy.reloadable_features.test_feature_true",
-    "envoy.reloadable_features.connection_header_sanitization",
     // Begin alphabetically sorted section.
     "envoy.reloadable_features.activate_fds_next_event_loop",
     "envoy.reloadable_features.allow_500_after_100",