Skip to content

runtime: remove require_ocsp_response_for_must_staple_certs #17541

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
yanavlasov merged 2 commits into from
Aug 5, 2021
Merged

runtime: remove require_ocsp_response_for_must_staple_certs #17541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e98f4fd
runtime: removing require_ocsp_response_for_must_staple_certs
alyssawilk Jul 28, 2021
fb47763
Merge branch 'main' into require_ocsp_response_for_must_staple_certs
alyssawilk Jul 29, 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 @@ -50,6 +50,7 @@ Removed Config or Runtime
* http: removed ``envoy.reloadable_features.allow_preconnect`` runtime guard and legacy code paths.
* listener: removed ``envoy.reloadable_features.disable_tls_inspector_injection`` runtime guard and legacy code paths.
* ocsp: removed ``envoy.reloadable_features.check_ocsp_policy deprecation`` runtime guard and legacy code paths.
* ocsp: removed ``envoy.reloadable_features.require_ocsp_response_for_must_staple_certs deprecation`` and legacy code paths.

New Features
------------
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 @@ -81,7 +81,6 @@ constexpr const char* runtime_features[] = {
"envoy.reloadable_features.prefer_quic_kernel_bpf_packet_routing",
"envoy.reloadable_features.preserve_downstream_scheme",
"envoy.reloadable_features.remove_forked_chromium_url",
"envoy.reloadable_features.require_ocsp_response_for_must_staple_certs",
"envoy.reloadable_features.require_strict_1xx_and_204_response_headers",
"envoy.reloadable_features.return_502_for_upstream_protocol_errors",
"envoy.reloadable_features.send_strict_1xx_and_204_response_headers",
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/transport_sockets/tls/context_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,9 +777,7 @@ ServerContextImpl::ServerContextImpl(Stats::Scope& scope,

auto& ocsp_resp_bytes = tls_certificates[i].get().ocspStaple();
if (ocsp_resp_bytes.empty()) {
if (Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.require_ocsp_response_for_must_staple_certs") &&
ctx.is_must_staple_) {
if (ctx.is_must_staple_) {
throw EnvoyException("OCSP response is required for must-staple certificate");
}
if (ocsp_staple_policy_ == Ssl::ServerContextConfig::OcspStaplePolicy::MustStaple) {
Expand Down
17 changes: 0 additions & 17 deletions test/extensions/transport_sockets/tls/context_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,23 +623,6 @@ TEST_F(SslServerContextImplOcspTest, TestMustStapleCertWithoutStapleConfigFails)
"OCSP response is required for must-staple certificate");
}

TEST_F(SslServerContextImplOcspTest, TestMustStapleCertWithoutStapleFeatureFlagOff) {
const std::string tls_context_yaml = R"EOF(
common_tls_context:
tls_certificates:
- certificate_chain:
filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_cert.pem"
private_key:
filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_key.pem"
ocsp_staple_policy: lenient_stapling
)EOF";

TestScopedRuntime scoped_runtime;
Runtime::LoaderSingleton::getExisting()->mergeValues(
{{"envoy.reloadable_features.require_ocsp_response_for_must_staple_certs", "false"}});
loadConfigYaml(tls_context_yaml);
}

TEST_F(SslServerContextImplOcspTest, TestGetCertInformationWithOCSP) {
const std::string yaml = R"EOF(
common_tls_context:
Expand Down