Server push cancellation: add PushPromiseHelper which reflects information on the push promise.

net/quic/chromium/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/chromium/quic_chromium_client_session.h"
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/rand_util.h"
@@ skipping 26 matching lines @@
 #include "net/quic/test_tools/quic_client_promised_info_peer.h"
 #include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
 #include "net/socket/socket_test_util.h"
 #include "net/spdy/spdy_test_utils.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"
+#include "net/tools/quic/test_tools/push_promise_delegate.h"
 #include "net/udp/datagram_client_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 
 namespace net {
 namespace test {
 namespace {
 
 const IPEndPoint kIpEndPoint = IPEndPoint(IPAddress::IPv4AllZeros(), 0);
@@ skipping 101 matching lines @@
   BoundTestNetLog bound_test_net_log_;
   MockClientSocketFactory socket_factory_;
   std::unique_ptr<MockRead> default_read_;
   std::unique_ptr<SequencedSocketData> socket_data_;
   MockClock clock_;
   MockRandom random_;
   QuicChromiumConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
   TransportSecurityState transport_security_state_;
   MockCryptoClientStreamFactory crypto_client_stream_factory_;
+  QuicClientPushPromiseIndex push_promise_index_;
   std::unique_ptr<QuicChromiumClientSession> session_;
   QuicConnectionVisitorInterface* visitor_;
   TestCompletionCallback callback_;
   QuicTestPacketMaker client_maker_;
   QuicTestPacketMaker server_maker_;
   ProofVerifyDetailsChromium verify_details_;
-  QuicClientPushPromiseIndex push_promise_index_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests,
                         QuicChromiumClientSessionTest,
                         ::testing::ValuesIn(AllSupportedVersions()));
 
 TEST_P(QuicChromiumClientSessionTest, CryptoConnect) {
   Initialize();
   CompleteCryptoHandshake();
 }
@@ skipping 56 matching lines @@
       session_->CreateOutgoingDynamicStream(kDefaultPriority);
   EXPECT_TRUE(stream);
 
   SpdyHeaderBlock promise_headers;
   promise_headers[":method"] = "GET";
   promise_headers[":authority"] = "www.example.org";
   promise_headers[":scheme"] = "https";
   promise_headers[":path"] = "/pushed.jpg";
 
   // Receive a PUSH PROMISE from the server.
-  session_->HandlePromised(stream->id(), kServerDataStreamId1, promise_headers);
+  EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+                                       promise_headers));
 
   QuicClientPromisedInfo* promised =
       session_->GetPromisedById(kServerDataStreamId1);
   EXPECT_TRUE(promised);
   // Fire alarm to time out the push stream.
   alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
   EXPECT_FALSE(
       session_->GetPromisedByUrl("https://www.example.org/pushed.jpg"));
   EXPECT_EQ(0u,
             QuicChromiumClientSessionPeer::GetPushedBytesCount(session_.get()));
@@ skipping 25 matching lines @@
   EXPECT_TRUE(stream);
 
   SpdyHeaderBlock promise_headers;
   promise_headers[":method"] = "GET";
   promise_headers[":authority"] = "www.example.org";
   promise_headers[":scheme"] = "https";
   promise_headers[":path"] = "/pushed.jpg";
 
   session_->GetOrCreateStream(kServerDataStreamId1);
   // Receive a PUSH PROMISE from the server.
-  session_->HandlePromised(stream->id(), kServerDataStreamId1, promise_headers);
+  EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+                                       promise_headers));
   session_->OnInitialHeadersComplete(kServerDataStreamId1, SpdyHeaderBlock());
   // Read data on the pushed stream.
   QuicStreamFrame data(kServerDataStreamId1, false, 0, StringPiece("SP"));
   session_->OnStreamFrame(data);
 
   QuicClientPromisedInfo* promised =
       session_->GetPromisedById(kServerDataStreamId1);
   EXPECT_TRUE(promised);
   // Fire alarm to time out the push stream.
   alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
   EXPECT_EQ(2u,
             QuicChromiumClientSessionPeer::GetPushedBytesCount(session_.get()));
   EXPECT_EQ(2u, QuicChromiumClientSessionPeer::GetPushedAndUnclaimedBytesCount(
                     session_.get()));
 }
 
+TEST_P(QuicChromiumClientSessionTest, CancelPushWhenPendingValidation) {
+  MockRead reads[] = {MockRead(SYNCHRONOUS, ERR_IO_PENDING, 0)};
+  std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
+      1, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT));
+
+  MockWrite writes[] = {
+      MockWrite(ASYNC, client_rst->data(), client_rst->length(), 1)};
+  socket_data_.reset(new SequencedSocketData(reads, arraysize(reads), writes,
+                                             arraysize(writes)));
+  Initialize();
+
+  ProofVerifyDetailsChromium details;
+  details.cert_verify_result.verified_cert =
+      ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
+  ASSERT_TRUE(details.cert_verify_result.verified_cert.get());
+
+  CompleteCryptoHandshake();
+  session_->OnProofVerifyDetailsAvailable(details);
+
+  QuicChromiumClientStream* stream =
+      session_->CreateOutgoingDynamicStream(kDefaultPriority);
+  EXPECT_TRUE(stream);
+
+  SpdyHeaderBlock promise_headers;
+  promise_headers[":method"] = "GET";
+  promise_headers[":authority"] = "www.example.org";
+  promise_headers[":scheme"] = "https";
+  promise_headers[":path"] = "/pushed.jpg";
+
+  // Receive a PUSH PROMISE from the server.
+  EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+                                       promise_headers));
+
+  QuicClientPromisedInfo* promised =
+      session_->GetPromisedById(kServerDataStreamId1);
+  EXPECT_TRUE(promised);
+
+  // Initiate rendezvous.
+  SpdyHeaderBlock client_request = promise_headers.Clone();
+  PushPromiseDelegate delegate(/*match=*/true);
+  promised->HandleClientRequest(client_request, &delegate);
+
+  // Cancel the push before receiving the response to the pushed request.
+  GURL pushed_url("https://www.example.org/pushed.jpg");
+  session_->CancelPush(pushed_url);
+  EXPECT_TRUE(session_->GetPromisedByUrl(pushed_url.spec()));
+
+  // Reset the stream now before tear down.
+  session_->CloseStream(kClientDataStreamId1);
+}
+
 TEST_P(QuicChromiumClientSessionTest, CancelPushBeforeReceivingResponse) {
   base::HistogramTester histogram_tester;
   MockRead reads[] = {MockRead(SYNCHRONOUS, ERR_IO_PENDING, 0)};
   std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
       1, true, kServerDataStreamId1, QUIC_STREAM_CANCELLED));
   MockWrite writes[] = {
       MockWrite(ASYNC, client_rst->data(), client_rst->length(), 1)};
   socket_data_.reset(new SequencedSocketData(reads, arraysize(reads), writes,
                                              arraysize(writes)));
   Initialize();
@@ skipping 10 matching lines @@
       session_->CreateOutgoingDynamicStream(kDefaultPriority);
   EXPECT_TRUE(stream);
 
   SpdyHeaderBlock promise_headers;
   promise_headers[":method"] = "GET";
   promise_headers[":authority"] = "www.example.org";
   promise_headers[":scheme"] = "https";
   promise_headers[":path"] = "/pushed.jpg";
 
   // Receive a PUSH PROMISE from the server.
-  session_->HandlePromised(stream->id(), kServerDataStreamId1, promise_headers);
+  EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+                                       promise_headers));
 
   QuicClientPromisedInfo* promised =
       session_->GetPromisedById(kServerDataStreamId1);
   EXPECT_TRUE(promised);
   // Cancel the push before receiving the response to the pushed request.
   GURL pushed_url("https://www.example.org/pushed.jpg");
   session_->CancelPush(pushed_url);
 
   EXPECT_FALSE(session_->GetPromisedByUrl(pushed_url.spec()));
   EXPECT_EQ(0u,
@@ skipping 26 matching lines @@
   EXPECT_TRUE(stream);
 
   SpdyHeaderBlock promise_headers;
   promise_headers[":method"] = "GET";
   promise_headers[":authority"] = "www.example.org";
   promise_headers[":scheme"] = "https";
   promise_headers[":path"] = "/pushed.jpg";
 
   session_->GetOrCreateStream(kServerDataStreamId1);
   // Receive a PUSH PROMISE from the server.
-  session_->HandlePromised(stream->id(), kServerDataStreamId1, promise_headers);
+  EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+                                       promise_headers));
   session_->OnInitialHeadersComplete(kServerDataStreamId1, SpdyHeaderBlock());
   // Read data on the pushed stream.
   QuicStreamFrame data(kServerDataStreamId1, false, 0, StringPiece("SP"));
   session_->OnStreamFrame(data);
 
   QuicClientPromisedInfo* promised =
       session_->GetPromisedById(kServerDataStreamId1);
   EXPECT_TRUE(promised);
   // Cancel the push after receiving data on the push stream.
   GURL pushed_url("https://www.example.org/pushed.jpg");
@@ skipping 349 matching lines @@
 
   EXPECT_TRUE(socket_data_->AllReadDataConsumed());
   EXPECT_TRUE(socket_data_->AllWriteDataConsumed());
   EXPECT_TRUE(new_socket_data.AllReadDataConsumed());
   EXPECT_TRUE(new_socket_data.AllWriteDataConsumed());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net