commit 6043dd6bf6bcdaa19627d1d582c65747b9fef2b8
author nharper <nharper@google.com> Mon Jun 29 13:36:53 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 29 13:37:31 2020 -0700
tree 6525c510d79011881bbfa5bddcb465e4e3017f9e
parent cfef5708c83caf3bc42c771f45cb63d6d9fd795d

Deprecate gfe2_reloadable_flag_quic_tls_enforce_valid_sni

PiperOrigin-RevId: 318883809
Change-Id: I9b95e7fdbed1ba22beec30527875630e7cbcfb24

quic/core/tls_server_handshaker.cc

diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 3894556..717d774 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -510,14 +510,11 @@
     hostname_ = hostname;
     crypto_negotiated_params_->sni =
         QuicHostnameUtils::NormalizeHostname(hostname_);
-    if (GetQuicReloadableFlag(quic_tls_enforce_valid_sni)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_tls_enforce_valid_sni);
-      if (!QuicHostnameUtils::IsValidSNI(hostname_)) {
-        // TODO(b/151676147): Include this error string in the CONNECTION_CLOSE
-        // frame.
-        QUIC_LOG(ERROR) << "Invalid SNI provided: \"" << hostname_ << "\"";
-        return SSL_TLSEXT_ERR_ALERT_FATAL;
-      }
+    if (!QuicHostnameUtils::IsValidSNI(hostname_)) {
+      // TODO(b/151676147): Include this error string in the CONNECTION_CLOSE
+      // frame.
+      QUIC_LOG(ERROR) << "Invalid SNI provided: \"" << hostname_ << "\"";
+      return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
   } else {
     QUIC_LOG(INFO) << "No hostname indicated in SNI";

quic/core/tls_server_handshaker_test.cc

diff --git a/quic/core/tls_server_handshaker_test.cc b/quic/core/tls_server_handshaker_test.cc
index b766dfc..8b60122 100644
--- a/quic/core/tls_server_handshaker_test.cc
+++ b/quic/core/tls_server_handshaker_test.cc
@@ -366,7 +366,6 @@
 }
 
 TEST_F(TlsServerHandshakerTest, RejectInvalidSNI) {
-  SetQuicReloadableFlag(quic_tls_enforce_valid_sni, true);
   server_id_ = QuicServerId("invalid!.example.com", kServerPort, false);
   InitializeFakeClient();
   static_cast<TlsClientHandshaker*>(