Skip to content

[compression]: removing enable_compression_without_content_length_header runtime guard #18460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rojkov merged 3 commits into from
Oct 11, 2021
Merged

[compression]: removing enable_compression_without_content_length_header runtime guard #18460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bbbcb
[compression]: removing enable_compression_without_content_length_hea…
tehnerd Oct 5, 2021
56a9d13
Merge remote-tracking branch 'upstream/main' into remove_gzip_guard
tehnerd Oct 7, 2021
bd38d9c
Merge remote-tracking branch 'upstream/main' into remove_gzip_guard
tehnerd Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Removed Config or Runtime
-------------------------
*Normally occurs at the end of the* :ref:`deprecation period <deprecated>`

* compression: removed ``envoy.reloadable_features.enable_compression_without_content_length_header`` runtime guard and legacy code paths.
* http: removed ``envoy.reloadable_features.return_502_for_upstream_protocol_errors``. Envoy will always return 502 code upon encountering upstream protocol error.
* http: removed ``envoy.reloadable_features.treat_upstream_connect_timeout_as_connect_failure`` and legacy code paths.

Expand Down
1 change: 0 additions & 1 deletion source/common/runtime/runtime_features.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ constexpr const char* runtime_features[] = {
"envoy.reloadable_features.correct_scheme_and_xfp",
"envoy.reloadable_features.disable_tls_inspector_injection",
"envoy.reloadable_features.dont_add_content_length_for_bodiless_requests",
"envoy.reloadable_features.enable_compression_without_content_length_header",
"envoy.reloadable_features.fix_added_trailers",
"envoy.reloadable_features.grpc_bridge_stats_disabled",
"envoy.reloadable_features.grpc_web_fix_non_proto_encoded_response_handling",
Expand Down
28 changes: 7 additions & 21 deletions source/extensions/filters/http/compressor/compressor_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,8 @@ Http::FilterHeadersStatus CompressorFilter::decodeHeaders(Http::RequestHeaderMap
}

const auto& request_config = config_->requestDirectionConfig();
const bool is_not_upgrade =
!Http::Utility::isUpgrade(headers) ||
!Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.enable_compression_without_content_length_header");

if (!end_stream && request_config.compressionEnabled() && is_not_upgrade &&
if (!end_stream && request_config.compressionEnabled() && !Http::Utility::isUpgrade(headers) &&
request_config.isMinimumContentLength(headers) &&
request_config.isContentTypeAllowed(headers) &&
!headers.getInline(request_content_encoding_handle.handle()) &&
Expand Down Expand Up @@ -234,15 +230,11 @@ Http::FilterHeadersStatus CompressorFilter::encodeHeaders(Http::ResponseHeaderMa
const auto& config = config_->responseDirectionConfig();
const bool isEnabledAndContentLengthBigEnough =
config.compressionEnabled() && config.isMinimumContentLength(headers);
const bool is_not_upgrade =
!Http::Utility::isUpgrade(headers) ||
!Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.enable_compression_without_content_length_header");

const bool isCompressible = isEnabledAndContentLengthBigEnough && is_not_upgrade &&
config.isContentTypeAllowed(headers) &&
!hasCacheControlNoTransform(headers) && isEtagAllowed(headers) &&
!headers.getInline(response_content_encoding_handle.handle());

const bool isCompressible =
isEnabledAndContentLengthBigEnough && !Http::Utility::isUpgrade(headers) &&
config.isContentTypeAllowed(headers) && !hasCacheControlNoTransform(headers) &&
isEtagAllowed(headers) && !headers.getInline(response_content_encoding_handle.handle());
if (!end_stream && isEnabledAndContentLengthBigEnough && isAcceptEncodingAllowed(headers) &&
isCompressible && isTransferEncodingAllowed(headers)) {
sanitizeEtagHeader(headers);
Expand Down Expand Up @@ -520,13 +512,7 @@ bool CompressorFilterConfig::DirectionConfig::isMinimumContentLength(
}
return is_minimum_content_length;
}
if (Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.enable_compression_without_content_length_header")) {
// return true to ignore the minimum length configuration if no content-length header is present
return true;
}
return StringUtil::caseFindToken(headers.getTransferEncodingValue(), ",",
Http::Headers::get().TransferEncodingValues.Chunked);
return true;
}

bool CompressorFilter::isTransferEncodingAllowed(Http::RequestOrResponseHeaderMap& headers) const {
Expand Down
22 changes: 0 additions & 22 deletions test/extensions/filters/http/compressor/compressor_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,28 +260,6 @@ TEST_F(CompressorFilterTest, CompressRequestAndResponseNoContentLength) {
doResponseCompression(headers, false);
}

TEST_F(CompressorFilterTest, CompressRequestAndResponseNoContentLengthRuntimeDisabled) {
setUpFilter(R"EOF(
{
"request_direction_config": {},
"response_direction_config": {},
"compressor_library": {
"name": "test",
"typed_config": {
"@type": "type.googleapis.com/envoy.extensions.compression.gzip.compressor.v3.Gzip"
}
}
}
)EOF");
TestScopedRuntime scoped_runtime;
Runtime::LoaderSingleton::getExisting()->mergeValues(
{{"envoy.reloadable_features.enable_compression_without_content_length_header", "false"}});
response_stats_prefix_ = "response.";
doRequestNoCompression({{":method", "get"}, {"accept-encoding", "deflate, test"}});
Http::TestResponseHeaderMapImpl headers{{":status", "200"}};
doResponseNoCompression(headers);
}

TEST_F(CompressorFilterTest, CompressRequestWithTrailers) {
setUpFilter(R"EOF(
{
Expand Down