Reland to M-52: Make revalidation to fail when received a redirect response

third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
     RawResource* jpegResource(RawResource::create(jpegRequest, Resource::Raw));
 
     ResourceRequest pngRequest;
     pngRequest.setHTTPAccept("image/png");
 
     ASSERT_FALSE(jpegResource->canReuse(pngRequest));
 }
 
 class DummyClient final : public RawResourceClient {
 public:
-    DummyClient() : m_called(false) {}
+    DummyClient() : m_called(false), m_numberOfRedirectsReceived(0) {}
     ~DummyClient() override {}
 
     // ResourceClient implementation.
     void notifyFinished(Resource* resource) override
     {
         m_called = true;
     }
     String debugName() const override { return "DummyClient"; }
 
     void dataReceived(Resource*, const char* data, size_t length) override
     {
         m_data.append(data, length);
     }
 
+    void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) override
+    {
+        ++m_numberOfRedirectsReceived;
+    }
+
     bool called() { return m_called; }
+    int numberOfRedirectsReceived() const { return m_numberOfRedirectsReceived; }
     const Vector<char>& data() { return m_data; }
 private:
     bool m_called;
+    int m_numberOfRedirectsReceived;
     Vector<char> m_data;
 };
 
 // This client adds another client when notified.
 class AddingClient : public RawResourceClient {
 public:
     AddingClient(DummyClient* client, Resource* resource)
         : m_dummyClient(client)
         , m_resource(resource)
         , m_removeClientTimer(this, &AddingClient::removeClient) {}
@@ skipping 138 matching lines @@
     EXPECT_EQ("updated", resource->response().httpHeaderField("x-custom"));
 
     memoryCache()->remove(resource);
 
     resource->removeClient(client.get());
     EXPECT_FALSE(resource->hasClientsOrObservers());
     EXPECT_FALSE(client->called());
     EXPECT_EQ(0u, client->data().size());
 }
 
+TEST(RawResourceTest, RedirectDuringRevalidation)
+{
+    Resource* resource = RawResource::create(ResourceRequest("https://example.com/1"), Resource::Raw);
+    ResourceResponse response;
+    response.setURL(KURL(ParsedURLString, "https://example.com/1"));
+    response.setHTTPStatusCode(200);
+    resource->responseReceived(response, nullptr);
+    const char data[5] = "abcd";
+    resource->appendData(data, 4);
+    resource->finish();
+    memoryCache()->add(resource);
+
+    EXPECT_FALSE(resource->isCacheValidator());
+    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
+    EXPECT_EQ("https://example.com/1", resource->lastResourceRequest().url().getString());
+
+    // Simulate a revalidation.
+    resource->setRevalidatingRequest(ResourceRequest("https://example.com/1"));
+    EXPECT_TRUE(resource->isCacheValidator());
+    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
+    EXPECT_EQ("https://example.com/1", resource->lastResourceRequest().url().getString());
+
+    OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
+    resource->addClient(client.get());
+
+    // The revalidating request is redirected.
+    ResourceResponse redirectResponse;
+    redirectResponse.setURL(KURL(ParsedURLString, "https://example.com/1"));
+    redirectResponse.setHTTPHeaderField("location", "https://example.com/2");
+    redirectResponse.setHTTPStatusCode(308);
+    ResourceRequest redirectedRevalidatingRequest("https://example.com/2");
+    resource->willFollowRedirect(redirectedRevalidatingRequest, redirectResponse);
+    EXPECT_FALSE(resource->isCacheValidator());
+    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
+    EXPECT_EQ("https://example.com/2", resource->lastResourceRequest().url().getString());
+
+    // The final response is received.
+    ResourceResponse revalidatingResponse;
+    revalidatingResponse.setURL(KURL(ParsedURLString, "https://example.com/2"));
+    revalidatingResponse.setHTTPStatusCode(200);
+    resource->responseReceived(revalidatingResponse, nullptr);
+    const char data2[4] = "xyz";
+    resource->appendData(data2, 3);
+    resource->finish();
+    EXPECT_FALSE(resource->isCacheValidator());
+    EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
+    EXPECT_EQ("https://example.com/2", resource->lastResourceRequest().url().getString());
+    EXPECT_FALSE(resource->isCacheValidator());
+    EXPECT_EQ(200, resource->response().httpStatusCode());
+    EXPECT_EQ(3u, resource->resourceBuffer()->size());
+    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")), resource);
+
+    EXPECT_TRUE(client->called());
+    EXPECT_EQ(1, client->numberOfRedirectsReceived());
+    EXPECT_EQ("xyz", String(client->data().data(), client->data().size()));
+
+    // Test the case where a client is added after revalidation is completed.
+    OwnPtr<DummyClient> client2 = adoptPtr(new DummyClient);
+    resource->addClient(client2.get());
+
+    // Because RawResourceClient is added asynchronously,
+    // |runPendingTasks()| is called to make |client2| to be notified.
+    testing::runPendingTasks();
+
+    EXPECT_TRUE(client2->called());
+    EXPECT_EQ(1, client2->numberOfRedirectsReceived());
+    EXPECT_EQ("xyz", String(client2->data().data(), client2->data().size()));
+
+    memoryCache()->remove(resource);
+
+    resource->removeClient(client.get());
+    resource->removeClient(client2.get());
+    EXPECT_FALSE(resource->hasClientsOrObservers());
+}
+
 TEST(RawResourceTest, AddClientDuringCallback)
 {
     Resource* raw = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
 
     // Create a non-null response.
     ResourceResponse response = raw->response();
     response.setURL(KURL(ParsedURLString, "http://600.613/"));
     raw->setResponse(response);
     raw->finish();
     EXPECT_FALSE(raw->response().isNull());
@@ skipping 47 matching lines @@
 
 TEST(RawResourceTest, CanReuseDevToolsEmulateNetworkConditionsClientIdHeader)
 {
     ResourceRequest request("data:text/html,");
     request.setHTTPHeaderField(HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo");
     Resource* raw = RawResource::create(request, Resource::Raw);
     EXPECT_TRUE(raw->canReuse(ResourceRequest("data:text/html,")));
 }
 
 } // namespace blink