Changeset 190418 in webkit

Timestamp:

Oct 1, 2015 11:09:07 AM (9 years ago)

Author:

Antti Koivisto

Message:

Network cache: Subresource referer header wrong after cached redirect
​https://bugs.webkit.org/show_bug.cgi?id=149709
rdar://problem/22917174

Reviewed by Chris Dumez.

Source/WebKit2:

If a main resource is loaded from a cache entry that involved redirects the document
will end up setting the Referer-headers of the subresources to the request URL not the redirected URL

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didRetrieveCacheEntry):

If a cache entry involved a redirect synthesize a minimal willSendRequest message so that WebCore side
runs through the same code paths as when receiving a redirect from network.

LayoutTests:

• http/tests/cache/redirect-referer-expected.html: Added.
• http/tests/cache/redirect-referer.html: Added.
• http/tests/cache/resources/load-and-check-referer.php: Added.
• http/tests/cache/resources/permanent-redirect.php: Added.
• http/tests/cache/resources/redirect-referer-iframe.html: Added.
• http/tests/cache/resources/redirect-referer-iframe-expected.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/redirect-referer-expected.html (added)
• LayoutTests/http/tests/cache/redirect-referer.html (added)
• LayoutTests/http/tests/cache/resources/load-and-check-referer.php (added)
• LayoutTests/http/tests/cache/resources/permanent-redirect.php (added)
• LayoutTests/http/tests/cache/resources/redirect-referer-iframe-expected.html (added)
• LayoutTests/http/tests/cache/resources/redirect-referer-iframe.html (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-01  Antti Koivisto  <antti@apple.com>
+
+        Network cache: Subresource referer header wrong after cached redirect
+        https://bugs.webkit.org/show_bug.cgi?id=149709
+        rdar://problem/22917174
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/cache/redirect-referer-expected.html: Added.
+        * http/tests/cache/redirect-referer.html: Added.
+        * http/tests/cache/resources/load-and-check-referer.php: Added.
+        * http/tests/cache/resources/permanent-redirect.php: Added.
+        * http/tests/cache/resources/redirect-referer-iframe.html: Added.
+        * http/tests/cache/resources/redirect-referer-iframe-expected.html: Added.
+
 2015-10-01  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-01  Antti Koivisto  <antti@apple.com>
+
+        Network cache: Subresource referer header wrong after cached redirect
+        https://bugs.webkit.org/show_bug.cgi?id=149709
+        rdar://problem/22917174
+
+        Reviewed by Chris Dumez.
+
+        If a main resource is loaded from a cache entry that involved redirects the document
+        will end up setting the Referer-headers of the subresources to the request URL not the redirected URL
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
+
+            If a cache entry involved a redirect synthesize a minimal willSendRequest message so that WebCore side
+            runs through the same code paths as when receiving a redirect from network.
+
 2015-10-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -571 +571 @@
         sendReplyToSynchronousRequest(*m_synchronousLoadData, entry->buffer());
     } else {
+        if (entry->response().url() != originalRequest().url()) {
+            // This is a cached redirect. Synthesize a minimal redirect so we get things like referer header right.
+            // FIXME: We should cache the actual redirects.
+            ResourceRequest syntheticRedirectRequest(entry->response().url());
+            ResourceResponse syntheticRedirectResponse(originalRequest().url(), { }, 0, { });
+            sendAbortingOnFailure(Messages::WebResourceLoader::WillSendRequest(syntheticRedirectRequest, syntheticRedirectResponse));
+        }
+
         bool needsContinueDidReceiveResponseMessage = originalRequest().requester() == ResourceRequest::Requester::Main;
         sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(entry->response(), needsContinueDidReceiveResponseMessage));