Changeset 225574 in webkit

Timestamp:

Dec 6, 2017 9:13:35 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Service Worker fetch should filter HTTP headers that are added by CachedResourceLoader/CachedResource
​https://bugs.webkit.org/show_bug.cgi?id=180462

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-06
Reviewed by Geoffrey Garen.

LayoutTests/imported/w3c:

• web-platform-tests/service-workers/service-worker/fetch-response-taint.https-expected.txt:

Source/WebCore:

Coved by rebased test.

• loader/CrossOriginAccessControl.cpp:

(WebCore::cleanRedirectedRequestForAccessControl): Accept header is a safe header so it is fine to keep it.

• workers/service/context/ServiceWorkerFetch.cpp:

(WebCore::ServiceWorkerFetch::dispatchFetchEvent): Cleaning headers added by CachedResourceLoader/CachedResource.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-response-taint.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/CrossOriginAccessControl.cpp (modified) (1 diff)
• Source/WebCore/workers/service/context/ServiceWorkerFetch.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2017-12-06  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker fetch should filter HTTP headers that are added by CachedResourceLoader/CachedResource
+        https://bugs.webkit.org/show_bug.cgi?id=180462
+
+        Reviewed by Geoffrey Garen.
+
+        * web-platform-tests/service-workers/service-worker/fetch-response-taint.https-expected.txt:
+
 2017-12-05  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-response-taint.https-expected.txt

@@ -40 +40 @@
 PASS url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"same-origin" should fail. 
 PASS url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?" mode:"cors" credentials:"include" should fail. 
-FAIL fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"omit" should succeed. promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"same-origin" should succeed. promise_test: Unhandled rejection with value: object "TypeError: Type error"
+PASS fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"omit" should succeed. 
+PASS fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"same-origin" should succeed. 
 PASS url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=*" mode:"cors" credentials:"include" should fail. 
-FAIL fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=https://localhost:9443&ACACredentials=true" mode:"cors" credentials:"include" should succeed. promise_test: Unhandled rejection with value: object "TypeError: Type error"
+FAIL fetching url:"https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?ACAOrigin=https://localhost:9443&ACACredentials=true" mode:"cors" credentials:"include" should succeed. assert_equals: expected "username1s" but got "undefined"
 PASS fetching url:"https://localhost:9443/?url=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"omit" should succeed. 
 PASS fetching url:"https://localhost:9443/?url=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"same-origin" credentials:"same-origin" should succeed. 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-06  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker fetch should filter HTTP headers that are added by CachedResourceLoader/CachedResource
+        https://bugs.webkit.org/show_bug.cgi?id=180462
+
+        Reviewed by Geoffrey Garen.
+
+        Coved by rebased test.
+
+        * loader/CrossOriginAccessControl.cpp:
+        (WebCore::cleanRedirectedRequestForAccessControl): Accept header is a safe header so it is fine to keep it.
+        * workers/service/context/ServiceWorkerFetch.cpp:
+        (WebCore::ServiceWorkerFetch::dispatchFetchEvent): Cleaning headers added by CachedResourceLoader/CachedResource.
+
 2017-12-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp

@@ -124 +124 @@
     request.clearHTTPOrigin();
     request.clearHTTPUserAgent();
-    request.clearHTTPAccept();
     request.clearHTTPAcceptEncoding();
 }

trunk/Source/WebCore/workers/service/context/ServiceWorkerFetch.cpp

@@ -29 +29 @@
 #if ENABLE(SERVICE_WORKER)
 
+#include "CrossOriginAccessControl.h"
 #include "EventNames.h"
 #include "FetchEvent.h"
@@ -95 +96 @@
     ASSERT(globalScope.isServiceWorkerGlobalScope());
 
+    auto httpReferrer = request.httpReferrer();
+    // We are intercepting fetch calls after going through the HTTP layer, which adds some specific headers.
+    // Let's clean them so that cross origin checks do not fail.
+    cleanRedirectedRequestForAccessControl(request);
+
     auto requestHeaders = FetchHeaders::create(FetchHeaders::Guard::Immutable, HTTPHeaderMap { request.httpHeaderFields() });
-    auto fetchRequest = FetchRequest::create(globalScope, FetchBody::fromFormData(request.httpBody()), WTFMove(requestHeaders),  WTFMove(request), WTFMove(options), request.httpReferrer());
+    auto fetchRequest = FetchRequest::create(globalScope, FetchBody::fromFormData(request.httpBody()), WTFMove(requestHeaders),  WTFMove(request), WTFMove(options), WTFMove(httpReferrer));
 
     FetchEvent::Init init;