relnote: remove insecure QUIC support

net/quic/quic_chromium_client_session_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_chromium_client_session.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
@@ skipping 21 matching lines @@
 #include "net/spdy/spdy_test_utils.h"
 #include "net/test/cert_test_util.h"
 #include "net/udp/datagram_client_socket.h"
 
 using testing::_;
 
 namespace net {
 namespace test {
 namespace {
 
-const char kServerHostname[] = "www.example.org";
-const uint16 kServerPort = 80;
+const char kServerHostname[] = "test.example.com";
+const uint16 kServerPort = 443;
 
 class QuicChromiumClientSessionTest
     : public ::testing::TestWithParam<QuicVersion> {
  protected:
   QuicChromiumClientSessionTest()
       : connection_(new PacketSavingConnection(Perspective::IS_CLIENT,
                                                SupportedVersions(GetParam()))),
-        session_(connection_,
-                 GetSocket().Pass(),
-                 /*stream_factory=*/nullptr,
-                 /*crypto_client_stream_factory=*/nullptr,
-                 &clock_,
-                 &transport_security_state_,
-                 make_scoped_ptr((QuicServerInfo*)nullptr),
-                 QuicServerId(kServerHostname,
-                              kServerPort,
-                              /*is_secure=*/false,
-                              PRIVACY_MODE_DISABLED),
-                 kQuicYieldAfterPacketsRead,
-                 QuicTime::Delta::FromMilliseconds(
-                     kQuicYieldAfterDurationMilliseconds),
-                 /*cert_verify_flags=*/0,
-                 DefaultQuicConfig(),
-                 &crypto_config_,
-                 "CONNECTION_UNKNOWN",
-                 base::TimeTicks::Now(),
-                 base::ThreadTaskRunnerHandle::Get().get(),
-                 /*socket_performance_watcher=*/nullptr,
-                 &net_log_) {
+        crypto_config_(CryptoTestUtils::ProofVerifierForTesting()),
+        session_(
+            connection_,
+            GetSocket().Pass(),
+            /*stream_factory=*/nullptr,
+            /*crypto_client_stream_factory=*/nullptr,
+            &clock_,
+            &transport_security_state_,
+            make_scoped_ptr((QuicServerInfo*)nullptr),
+            QuicServerId(kServerHostname, kServerPort, PRIVACY_MODE_DISABLED),
+            kQuicYieldAfterPacketsRead,
+            QuicTime::Delta::FromMilliseconds(
+                kQuicYieldAfterDurationMilliseconds),
+            /*cert_verify_flags=*/0,
+            DefaultQuicConfig(),
+            &crypto_config_,
+            "CONNECTION_UNKNOWN",
+            base::TimeTicks::Now(),
+            base::ThreadTaskRunnerHandle::Get().get(),
+            /*socket_performance_watcher=*/nullptr,
+            &net_log_) {
     session_.Initialize();
     // Advance the time, because timers do not like uninitialized times.
     connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
   }
 
   void TearDown() override {
     session_.CloseSessionOnError(ERR_ABORTED, QUIC_INTERNAL_ERROR);
   }
 
   scoped_ptr<DatagramClientSocket> GetSocket() {
     socket_factory_.AddSocketDataProvider(&socket_data_);
     return socket_factory_.CreateDatagramClientSocket(
         DatagramSocket::DEFAULT_BIND, base::Bind(&base::RandInt), &net_log_,
         NetLog::Source());
   }
 
   void CompleteCryptoHandshake() {
     ASSERT_EQ(ERR_IO_PENDING,
               session_.CryptoConnect(false, callback_.callback()));
     CryptoTestUtils::HandshakeWithFakeServer(connection_,
                                              session_.GetCryptoStream());
     ASSERT_EQ(OK, callback_.WaitForResult());
   }
 
   PacketSavingConnection* connection_;
   TestNetLog net_log_;
   MockClientSocketFactory socket_factory_;
   StaticSocketDataProvider socket_data_;
   TransportSecurityState transport_security_state_;
+  QuicCryptoClientConfig crypto_config_;
   QuicChromiumClientSession session_;
   MockClock clock_;
   MockRandom random_;
   QuicConnectionVisitorInterface* visitor_;
   TestCompletionCallback callback_;
-  QuicCryptoClientConfig crypto_config_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests,
                         QuicChromiumClientSessionTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
 
 TEST_P(QuicChromiumClientSessionTest, CryptoConnect) {
   CompleteCryptoHandshake();
 }
 
@@ skipping 42 matching lines @@
 
   // After receiving a GoAway, I should no longer be able to create outgoing
   // streams.
   session_.connection()->OnGoAwayFrame(
       QuicGoAwayFrame(QUIC_PEER_GOING_AWAY, 1u, "Going away."));
   EXPECT_EQ(nullptr, session_.CreateOutgoingDynamicStream());
 }
 
 TEST_P(QuicChromiumClientSessionTest, CanPool) {
   // Load a cert that is valid for:
-  //   www.example.org
+  //   test.example.com
   //   mail.example.org
-  //   www.example.com
+  //   test.example.org
 
   ProofVerifyDetailsChromium details;
   details.cert_verify_result.verified_cert =
       ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
   ASSERT_TRUE(details.cert_verify_result.verified_cert.get());
 
   session_.OnProofVerifyDetailsAvailable(details);
   CompleteCryptoHandshake();
 
-  EXPECT_TRUE(session_.CanPool("www.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_FALSE(session_.CanPool("www.example.org", PRIVACY_MODE_ENABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_TRUE(session_.CanPool("test.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("test.example.com", PRIVACY_MODE_ENABLED));
+  // All URL's are secure QUIC.
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.google.com", PRIVACY_MODE_DISABLED));
 }
 
 TEST_P(QuicChromiumClientSessionTest, ConnectionPooledWithTlsChannelId) {
   // Load a cert that is valid for:
-  //   www.example.org
+  //   test.example.com
   //   mail.example.org
   //   www.example.com
 
   ProofVerifyDetailsChromium details;
   details.cert_verify_result.verified_cert =
       ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
   ASSERT_TRUE(details.cert_verify_result.verified_cert.get());
 
   session_.OnProofVerifyDetailsAvailable(details);
   CompleteCryptoHandshake();
   QuicChromiumClientSessionPeer::SetChannelIDSent(&session_, true);
 
-  EXPECT_TRUE(session_.CanPool("www.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_TRUE(session_.CanPool("test.example.com", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.google.com", PRIVACY_MODE_DISABLED));
 }
 
 TEST_P(QuicChromiumClientSessionTest, ConnectionNotPooledWithDifferentPin) {
   uint8 primary_pin = 1;
   uint8 backup_pin = 2;
   uint8 bad_pin = 3;
   AddPin(&transport_security_state_, "mail.example.org", primary_pin,
          backup_pin);
 
@@ skipping 25 matching lines @@
   details.cert_verify_result.is_issued_by_known_root = true;
   details.cert_verify_result.public_key_hashes.push_back(
       GetTestHashValue(primary_pin));
 
   ASSERT_TRUE(details.cert_verify_result.verified_cert.get());
 
   session_.OnProofVerifyDetailsAvailable(details);
   CompleteCryptoHandshake();
   QuicChromiumClientSessionPeer::SetChannelIDSent(&session_, true);
 
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net