WebKit Bugzilla
Attachment 371728 Details for
Bug 197371
: Store prefetch redirects in the prefetch cache
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197371-20190610102742.patch (text/plain), 16.05 KB, created by
Rob Buis
on 2019-06-10 01:27:43 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rob Buis
Created:
2019-06-10 01:27:43 PDT
Size:
16.05 KB
patch
obsolete
>Subversion Revision: 246249 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index fb5b50dea19d1d58f201b1c632e9e03b1cc9432c..84da962c7777618a5f5c7a665c80dd213e164432 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,18 @@ >+2019-06-10 Rob Buis <rbuis@igalia.com> >+ >+ Add tests for prefetch redirects >+ https://bugs.webkit.org/show_bug.cgi?id=197371 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Allow clearing of the Purpose request header field. >+ >+ Test: http/tests/cache/link-prefetch-main-resource-redirect.html >+ >+ * platform/network/ResourceRequestBase.cpp: >+ (WebCore::ResourceRequestBase::clearPurpose): >+ * platform/network/ResourceRequestBase.h: >+ > 2019-06-09 Rob Buis <rbuis@igalia.com> > > Add wildcard to Access-Control-Allow-Methods and Access-Control-Allow-Headers >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index e968451353ad6905736a12176046f44199f99994..301399bfaaffbd6625d93ea5be2b02b3871637f8 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,23 @@ >+2019-06-10 Rob Buis <rbuis@igalia.com> >+ >+ Store prefetch redirects in the prefetch cache >+ https://bugs.webkit.org/show_bug.cgi?id=197371 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Store prefetch redirects in the prefetch cache and use them when >+ navigating. >+ >+ * NetworkProcess/NetworkResourceLoader.cpp: >+ (WebKit::NetworkResourceLoader::retrieveCacheEntry): >+ (WebKit::NetworkResourceLoader::willSendRedirectedRequest): >+ (WebKit::NetworkResourceLoader::didFinishWithRedirectResponse): >+ * NetworkProcess/NetworkResourceLoader.h: >+ * NetworkProcess/cache/PrefetchCache.cpp: >+ (WebKit::PrefetchCache::Entry::Entry): >+ (WebKit::PrefetchCache::storeRedirect): >+ * NetworkProcess/cache/PrefetchCache.h: >+ > 2019-06-09 Brent Fulgham <bfulgham@apple.com> > > [iOS] ResourceLoadStatistics state is not properly relayed to the NetworkProcess >diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp >index 4dbc37e72717d9df46a3284511b9c2da8f223e6b..619f0847485c1c5a54f3e34c3e53a9fe0b51c404 100644 >--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp >+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp >@@ -357,6 +357,15 @@ void ResourceRequestBase::clearHTTPContentType() > m_platformRequestUpdated = false; > } > >+void ResourceRequestBase::clearPurpose() >+{ >+ updateResourceRequest(); >+ >+ m_httpHeaderFields.remove(HTTPHeaderName::Purpose); >+ >+ m_platformRequestUpdated = false; >+} >+ > String ResourceRequestBase::httpReferrer() const > { > return httpHeaderField(HTTPHeaderName::Referer); >diff --git a/Source/WebCore/platform/network/ResourceRequestBase.h b/Source/WebCore/platform/network/ResourceRequestBase.h >index d98890879f6c3e101bbde2db7bdba845f0264597..dd446a890cdb9dcea7778b1bc28155af6fb6c079 100644 >--- a/Source/WebCore/platform/network/ResourceRequestBase.h >+++ b/Source/WebCore/platform/network/ResourceRequestBase.h >@@ -140,6 +140,8 @@ public: > > void clearHTTPAcceptEncoding(); > >+ WEBCORE_EXPORT void clearPurpose(); >+ > const Vector<String>& responseContentDispositionEncodingFallbackArray() const { return m_responseContentDispositionEncodingFallbackArray; } > WEBCORE_EXPORT void setResponseContentDispositionEncodingFallbackArray(const String& encoding1, const String& encoding2 = String(), const String& encoding3 = String()); > >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >index 0d4f9a2a1aea5c8800a5b13fe37e017bbdc49599..654c9ee21c82f9f178a72c2945ebdf704e0c8aa1 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >@@ -214,8 +214,13 @@ void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request) > if (isMainFrameLoad()) { > ASSERT(m_parameters.options.mode == FetchOptions::Mode::Navigate); > if (auto session = m_connection->networkProcess().networkSession(sessionID())) { >- if (auto entry = session->prefetchCache().take(request.url())) >- m_cache->store(request, entry->response, entry->releaseBuffer(), nullptr); >+ if (auto entry = session->prefetchCache().take(request.url())) { >+ if (!entry->redirectRequest.isNull()) { >+ auto maxAgeCap = validateCacheEntryForMaxAgeCapValidation(request, entry->redirectRequest, entry->response); >+ m_cache->storeRedirect(request, entry->response, entry->redirectRequest, maxAgeCap); >+ } else >+ m_cache->store(request, entry->response, entry->releaseBuffer(), nullptr); >+ } > } > } > m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = ResourceRequest { request }](auto entry, auto info) mutable { >@@ -640,7 +645,7 @@ void NetworkResourceLoader::willSendRedirectedRequest(ResourceRequest&& request, > } > > if (m_parameters.options.redirect == FetchOptions::Redirect::Manual) { >- this->didFinishWithRedirectResponse(WTFMove(result->redirectResponse)); >+ this->didFinishWithRedirectResponse(WTFMove(result->request), WTFMove(result->redirectRequest), WTFMove(result->redirectResponse)); > return; > } > >@@ -681,10 +686,11 @@ void NetworkResourceLoader::continueWillSendRedirectedRequest(ResourceRequest&& > send(Messages::WebResourceLoader::WillSendRequest(redirectRequest, sanitizeResponseIfPossible(WTFMove(redirectResponse), ResourceResponse::SanitizationType::Redirection))); > } > >-void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& redirectResponse) >+void NetworkResourceLoader::didFinishWithRedirectResponse(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse) > { > redirectResponse.setType(ResourceResponse::Type::Opaqueredirect); >- didReceiveResponse(WTFMove(redirectResponse), [] (auto) { }); >+ if (!isCrossOriginPrefetch()) >+ didReceiveResponse(WTFMove(redirectResponse), [] (auto) { }); > > WebCore::NetworkLoadMetrics networkLoadMetrics; > networkLoadMetrics.markComplete(); >@@ -692,6 +698,12 @@ void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& red > networkLoadMetrics.responseBodyDecodedSize = 0; > send(Messages::WebResourceLoader::DidFinishResourceLoad { networkLoadMetrics }); > >+ if (isCrossOriginPrefetch()) { >+ if (auto session = m_connection->networkProcess().networkSession(sessionID())) { >+ redirectRequest.clearPurpose(); >+ session->prefetchCache().storeRedirect(m_networkLoad->currentRequest().url(), WTFMove(redirectResponse), WTFMove(redirectRequest)); >+ } >+ } > cleanup(LoadResult::Success); > } > >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >index a8f6d315798c4adfff99da7e82ffc833a967683e..4b4ce4f08f8b80aa79d81bba25f6e24987a624d2 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >@@ -164,7 +164,7 @@ private: > #endif > > void continueWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&, Optional<WebCore::AdClickAttribution::Conversion>&&); >- void didFinishWithRedirectResponse(WebCore::ResourceResponse&&); >+ void didFinishWithRedirectResponse(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&); > WebCore::ResourceResponse sanitizeResponseIfPossible(WebCore::ResourceResponse&&, WebCore::ResourceResponse::SanitizationType); > > // ContentSecurityPolicyClient >diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp >index 0401fc98b416ce0a9acd095c3c3a23ea2a38fdbb..fc32565b0d00923863dd14ee5e458e27572d0261 100644 >--- a/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp >+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp >@@ -35,6 +35,11 @@ PrefetchCache::Entry::Entry(WebCore::ResourceResponse&& response, RefPtr<WebCore > { > } > >+PrefetchCache::Entry::Entry(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& redirectRequest) >+ : response(WTFMove(redirectResponse)), redirectRequest(WTFMove(redirectRequest)) >+{ >+} >+ > PrefetchCache::PrefetchCache() > : m_expirationTimer(*this, &PrefetchCache::clearExpiredEntries) > { >@@ -78,6 +83,16 @@ void PrefetchCache::store(const URL& requestUrl, WebCore::ResourceResponse&& res > m_expirationTimer.startOneShot(expirationTimeout); > } > >+void PrefetchCache::storeRedirect(const URL& requestUrl, WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& redirectRequest) >+{ >+ if (!m_sessionPrefetches) >+ m_sessionPrefetches = std::make_unique<PrefetchEntriesMap>(); >+ m_sessionPrefetches->set(requestUrl, std::make_unique<PrefetchCache::Entry>(WTFMove(redirectResponse), WTFMove(redirectRequest))); >+ m_sessionExpirationList.append(std::make_tuple(requestUrl, WallTime::now())); >+ if (!m_expirationTimer.isActive()) >+ m_expirationTimer.startOneShot(expirationTimeout); >+} >+ > void PrefetchCache::clearExpiredEntries() > { > URL requestUrl; >diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.h b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h >index c8895fe24b76f8d04adb638c73b1a1c84b2a9c40..a1710bae9e5a88526cefa3b39aa788faaf2cfa0e 100644 >--- a/Source/WebKit/NetworkProcess/cache/PrefetchCache.h >+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h >@@ -25,6 +25,7 @@ > > #pragma once > >+#include <WebCore/ResourceRequest.h> > #include <WebCore/ResourceResponse.h> > #include <WebCore/SharedBuffer.h> > #include <WebCore/Timer.h> >@@ -46,15 +47,18 @@ public: > > struct Entry { > Entry(WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&); >+ Entry(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&); > > Ref<WebCore::SharedBuffer> releaseBuffer() { return buffer.releaseNonNull(); } > > WebCore::ResourceResponse response; > RefPtr<WebCore::SharedBuffer> buffer; >+ WebCore::ResourceRequest redirectRequest; > }; > > std::unique_ptr<Entry> take(const URL&); > void store(const URL&, WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&); >+ void storeRedirect(const URL&, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&); > > private: > void clearExpiredEntries(); >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 74e8b9e7e994f9d394b7b52853d074c087313e8a..3d7c645aa48c866363291e79b8f73b9e666ed007 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,20 @@ >+2019-06-10 Rob Buis <rbuis@igalia.com> >+ >+ Add tests for prefetch redirects >+ https://bugs.webkit.org/show_bug.cgi?id=197371 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add a test to verify prefetch redirections are cached in the prefetch >+ cache and reused when navigating. >+ >+ * http/tests/cache/link-prefetch-main-resource-redirect-expected.txt: Added. >+ * http/tests/cache/link-prefetch-main-resource-redirect.html: Added. >+ * http/tests/cache/resources/main-resource-redirect-no-prefetch.php: Added. >+ * http/tests/cache/resources/prefetched-main-resource-redirect.php: Added. >+ * platform/mac-wk1/TestExpectations: >+ * platform/win/TestExpectations: >+ > 2019-06-08 Cathie Chen <cathiechen@igalia.com> > > resize-observer/element-leak.html fails on Windows platform >diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..7ef22e9a431ad0272713b71fdc8794016c8ef12f >--- /dev/null >+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt >@@ -0,0 +1 @@ >+PASS >diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html >new file mode 100644 >index 0000000000000000000000000000000000000000..6182a728f2d80daa1a949e6f002e0c3b97582743 >--- /dev/null >+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html >@@ -0,0 +1,16 @@ >+<html> >+<script> >+if (window.testRunner) { >+ testRunner.waitUntilDone(); >+ testRunner.dumpAsText(); >+} >+ >+function loadAfterPrefetch() >+{ >+ window.location.assign('http://localhost:8000/cache/resources/prefetched-main-resource-redirect.php'); >+} >+</script> >+<body> >+<link rel="prefetch" href="http://localhost:8000/cache/resources/prefetched-main-resource-redirect.php" onload="loadAfterPrefetch()"> >+</body> >+</html> >diff --git a/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php b/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php >new file mode 100644 >index 0000000000000000000000000000000000000000..7bc8c6fd0c4636657ba07574fefd1e79894d028d >--- /dev/null >+++ b/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php >@@ -0,0 +1,21 @@ >+<?php >+ header('HTTP/1.1 ' . 200); >+?> >+<!DOCTYPE html> >+<html> >+<body> >+<script> >+ >+if (window.testRunner) >+ testRunner.notifyDone(); >+ >+</script> >+<?php >+if ($_SERVER["HTTP_PURPOSE"] == "prefetch") { >+ print('FAIL'); >+} else { >+ print('PASS'); >+} >+?> >+</body> >+</html> >diff --git a/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php b/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php >new file mode 100644 >index 0000000000000000000000000000000000000000..8ab5330d283047ff48a7f2fec3d6ba89ca89cd7e >--- /dev/null >+++ b/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php >@@ -0,0 +1,10 @@ >+<?php >+ if ($_SERVER["HTTP_PURPOSE"] == "prefetch") { >+ header('HTTP/1.1 ' . 302); >+ header('Cache-Control: max-age=3600'); >+ header('Location: ' . 'main-resource-redirect-no-prefetch.php'); >+ } else { >+ header('HTTP/1.1 ' . 200); >+ print('FAIL'); >+ } >+?> >diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations >index 4804a70df89451b2c3d204479c00d40e5c4ecaf3..3e2acb984d50458dd0932e79573a7064dd64a469 100644 >--- a/LayoutTests/platform/mac-wk1/TestExpectations >+++ b/LayoutTests/platform/mac-wk1/TestExpectations >@@ -701,7 +701,9 @@ webkit.org/b/196915 [ Debug ] inspector/timeline/timeline-recording.html [ Pass > webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Skip ] > webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource-iframe.html [ Skip ] > >+webkit.org/b/197371 http/tests/cache/link-prefetch-main-resource-redirect.html [ Skip ] >+ > webkit.org/b/198177 pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html [ Skip ] > > webkit.org/b/198459 [ HighSierra Debug ] inspector/canvas/recording-2d-full.html [ Slow ] >-webkit.org/b/198459 [ HighSierra Debug ] inspector/canvas/recording-webgl-full.html [ Slow ] >\ No newline at end of file >+webkit.org/b/198459 [ HighSierra Debug ] inspector/canvas/recording-webgl-full.html [ Slow ] >diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations >index ae571b0255e327de553e5de237f5b16c362fb4f4..523174259f55ba5dd6103a61343400fec918ad1b 100644 >--- a/LayoutTests/platform/win/TestExpectations >+++ b/LayoutTests/platform/win/TestExpectations >@@ -4400,6 +4400,8 @@ webkit.org/b/197310 fast/harness/render-tree-as-text-options.html [ Failure ] > webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Skip ] > webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource-iframe.html [ Skip ] > >+webkit.org/b/197371 http/tests/cache/link-prefetch-main-resource-redirect.html [ Skip ] >+ > webkit.org/b/198112 http/tests/security/showModalDialog-sync-cross-origin-page-load2.html [ Skip ] > > webkit.org/b/198679 fast/events/fire-mousedown-while-pressing-mouse-button.html [ Failure ]
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197371
:
368556
|
368559
|
368560
|
368565
|
368566
|
368568
|
369382
|
369384
|
369386
|
369387
|
369388
|
369418
|
369504
|
369733
|
371728
|
371854
|
372194