Changeset 227625 in webkit

Timestamp:

Jan 25, 2018, 1:26:36 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

DocumentLoader should interrupt ongoing load when getting a redirection from network that matches a service worker
​https://bugs.webkit.org/show_bug.cgi?id=182115

Patch by Youenn Fablet <​youenn@apple.com> on 2018-01-25
Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

• web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt:

Source/WebCore:

Covered by rebased test.

In case a navigation load is going to the network process,
we need to interrupt it if having a redirection that leads to a new request going to a service worker.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::redirectReceived):

Source/WebKit:

• WebProcess/Storage/ServiceWorkerClientFetch.cpp:

(WebKit::ServiceWorkerClientFetch::didReceiveResponse):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-01-25  Youenn Fablet  <youenn@apple.com>
+
+        DocumentLoader should interrupt ongoing load when getting a redirection from network that matches a service worker
+        https://bugs.webkit.org/show_bug.cgi?id=182115
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt:
+
 2018-01-25  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt

@@ -6 +6 @@
 PASS Normal redirect to other-origin scope. 
 PASS SW-fallbacked redirect to same-origin out-scope. 
-FAIL SW-fallbacked redirect to same-origin same-scope. assert_object_equals: Intercepted URLs should match. expected property "1" missing
+PASS SW-fallbacked redirect to same-origin same-scope. 
 PASS SW-fallbacked redirect to same-origin other-scope. 
 PASS SW-fallbacked redirect to other-origin out-scope. 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-25  Youenn Fablet  <youenn@apple.com>
+
+        DocumentLoader should interrupt ongoing load when getting a redirection from network that matches a service worker
+        https://bugs.webkit.org/show_bug.cgi?id=182115
+
+        Reviewed by Alex Christensen.
+
+        Covered by rebased test.
+
+        In case a navigation load is going to the network process,
+        we need to interrupt it if having a redirection that leads to a new request going to a service worker.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::redirectReceived):
+
 2018-01-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -518 +518 @@
     ASSERT_UNUSED(resource, &resource == m_mainResource);
 #if ENABLE(SERVICE_WORKER)
-    willSendRequest(WTFMove(request), redirectResponse, [completionHandler = WTFMove(completionHandler), protectedThis = makeRef(*this), this] (auto&& request) mutable {
+    bool isRedirectionFromServiceWorker = redirectResponse.source() == ResourceResponse::Source::ServiceWorker;
+    willSendRequest(WTFMove(request), redirectResponse, [isRedirectionFromServiceWorker, completionHandler = WTFMove(completionHandler), protectedThis = makeRef(*this), this] (auto&& request) mutable {
         if (request.isNull() || !m_mainDocumentError.isNull() || !m_frame) {
             completionHandler({ });
@@ -524 +525 @@
         }
         auto url = request.url();
-        matchRegistration(url, [request = WTFMove(request), completionHandler = WTFMove(completionHandler), protectedThis = WTFMove(protectedThis), this] (auto&& registrationData) mutable {
+        matchRegistration(url, [request = WTFMove(request), isRedirectionFromServiceWorker, completionHandler = WTFMove(completionHandler), protectedThis = WTFMove(protectedThis), this] (auto&& registrationData) mutable {
             if (!m_mainDocumentError.isNull() || !m_frame) {
                 completionHandler({ });
                 return;
             }
-
-            if (areRegistrationsEqual(m_serviceWorkerRegistrationData, registrationData)) {
+            bool shouldContinueLoad = areRegistrationsEqual(m_serviceWorkerRegistrationData, registrationData)
+                && isRedirectionFromServiceWorker == !!registrationData;
+
+            if (shouldContinueLoad) {
                 completionHandler(WTFMove(request));
                 return;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-25  Youenn Fablet  <youenn@apple.com>
+
+        DocumentLoader should interrupt ongoing load when getting a redirection from network that matches a service worker
+        https://bugs.webkit.org/show_bug.cgi?id=182115
+
+        Reviewed by Alex Christensen.
+
+        * WebProcess/Storage/ServiceWorkerClientFetch.cpp:
+        (WebKit::ServiceWorkerClientFetch::didReceiveResponse):
+
 2018-01-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp

@@ -109 +109 @@
         return;
     }
+    response.setSource(ResourceResponse::Source::ServiceWorker);
 
     if (response.isRedirection()) {
@@ -135 +136 @@
         }
     }
-    response.setSource(ResourceResponse::Source::ServiceWorker);
 
     // As per https://fetch.spec.whatwg.org/#main-fetch step 9, copy request's url list in response's url list if empty.