Changeset 249626 in webkit

Timestamp:

Sep 7, 2019 10:26:51 PM (5 years ago)

Author:

Chris Dumez

Message:

Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test
​https://bugs.webkit.org/show_bug.cgi?id=201574

Reviewed by Alex Christensen.

Source/WebKit:

Update Service Workers so that they obey the "secureContextChecksEnabled" preference.
This was needed to allow my service worker to access self.caches in my API test.

• WebProcess/Storage/WebSWContextManagerConnection.cpp:

(WebKit::WebSWContextManagerConnection::updatePreferencesStore):

Tools:

Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test so that
we truly test private browsing. testRunner.setPrivateBrowsingEnabled_DEPRECATED() is a hack which
does not work well for WK2.

• TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:

LayoutTests:

Drop legacy test which was replaced by an API test.

• http/tests/workers/service/serviceworker-private-browsing-worker.js: Removed.
• http/tests/workers/service/serviceworker-private-browsing.https-expected.txt: Removed.
• http/tests/workers/service/serviceworker-private-browsing.https.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/workers/service/serviceworker-private-browsing-worker.js (deleted)
• LayoutTests/http/tests/workers/service/serviceworker-private-browsing.https-expected.txt (deleted)
• LayoutTests/http/tests/workers/service/serviceworker-private-browsing.https.html (deleted)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-09-07  Chris Dumez  <cdumez@apple.com>
+
+        Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test
+        https://bugs.webkit.org/show_bug.cgi?id=201574
+
+        Reviewed by Alex Christensen.
+
+        Drop legacy test which was replaced by an API test.
+
+        * http/tests/workers/service/serviceworker-private-browsing-worker.js: Removed.
+        * http/tests/workers/service/serviceworker-private-browsing.https-expected.txt: Removed.
+        * http/tests/workers/service/serviceworker-private-browsing.https.html: Removed.
+
 2019-09-07  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1045 +1045 @@
 webkit.org/b/175419 http/tests/workers/service/controller-change.html [ Skip ]
 webkit.org/b/175419 http/tests/workers/service/no-page-cache-when-controlled.html [ Skip ]
-webkit.org/b/175419 http/tests/workers/service/serviceworker-private-browsing.https.html [ Skip ]
 webkit.org/b/175419 http/wpt/service-workers/persistent-importScripts.html [ Failure ]
 webkit.org/b/175419 imported/w3c/web-platform-tests/service-workers/service-worker/activation.https.html [ Skip ]

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-07  Chris Dumez  <cdumez@apple.com>
+
+        Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test
+        https://bugs.webkit.org/show_bug.cgi?id=201574
+
+        Reviewed by Alex Christensen.
+
+        Update Service Workers so that they obey the "secureContextChecksEnabled" preference.
+        This was needed to allow my service worker to access self.caches in my API test.
+
+        * WebProcess/Storage/WebSWContextManagerConnection.cpp:
+        (WebKit::WebSWContextManagerConnection::updatePreferencesStore):
+
 2019-09-07  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -114 +114 @@
     RuntimeEnabledFeatures::sharedFeatures().setServerTimingEnabled(store.getBoolValueForKey(WebPreferencesKey::serverTimingEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setIsSecureContextAttributeEnabled(store.getBoolValueForKey(WebPreferencesKey::isSecureContextAttributeEnabledKey()));
+    RuntimeEnabledFeatures::sharedFeatures().setSecureContextChecksEnabled(store.getBoolValueForKey(WebPreferencesKey::secureContextChecksEnabledKey()));
 
     m_storageBlockingPolicy = static_cast<SecurityOrigin::StorageBlockingPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey()));

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-07  Chris Dumez  <cdumez@apple.com>
+
+        Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test
+        https://bugs.webkit.org/show_bug.cgi?id=201574
+
+        Reviewed by Alex Christensen.
+
+        Rewrite http/tests/workers/service/serviceworker-private-browsing.https.html as an API test so that
+        we truly test private browsing. testRunner.setPrivateBrowsingEnabled_DEPRECATED() is a hack which
+        does not work well for WK2.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+
 2019-09-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm

@@ -1350 +1350 @@
 }
 
+static const char* serviceWorkerCacheAccessEphemeralSessionMainBytes = R"SWRESOURCE(
+<script>
+try {
+    navigator.serviceWorker.addEventListener("message", (event) => {
+        webkit.messageHandlers.sw.postMessage(event.data);
+    });
+
+    navigator.serviceWorker.register("serviceworker-private-browsing-worker.js", { scope : "my private backyard" }).then((registration) => {
+        activeWorker = registration.installing;
+        activeWorker.addEventListener('statechange', () => {
+            if (activeWorker.state === "activated") {
+                activeWorker.postMessage("TESTCACHE");
+            }
+        });
+    });
+} catch (e) {
+    webkit.messageHandlers.sw.postMessage("" + e);
+}
+</script>
+)SWRESOURCE";
+
+static const char* serviceWorkerCacheAccessEphemeralSessionSWBytes = R"SWRESOURCE(
+self.addEventListener("message", (event) => {
+    try {
+        self.caches.keys().then((keys) => {
+            event.source.postMessage(keys.length === 0 ? "PASS" : "FAIL: caches is not empty, got: " + JSON.stringify(keys));
+        });
+    } catch (e) {
+         event.source.postMessage("" + e);
+    }
+});
+)SWRESOURCE";
+
+// Opens a cache in the default session and checks that an ephemeral service worker
+// does not have access to it.
+TEST(ServiceWorkers, ServiceWorkerCacheAccessEphemeralSession)
+{
+    [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
+
+    // Start with a clean slate data store
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
+    done = false;
+    
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    setConfigurationInjectedBundlePath(configuration.get());
+    
+    auto defaultPreferences = [configuration preferences];
+    [defaultPreferences _setSecureContextChecksEnabled:NO];
+    
+    auto handler = adoptNS([[SWSchemes alloc] init]);
+    handler->resources.set("sw://host/openCache.html", ResourceInfo { @"text/html", "foo" });
+    handler->resources.set("sw://host/main.html", ResourceInfo { @"text/html", serviceWorkerCacheAccessEphemeralSessionMainBytes });
+    handler->resources.set("sw://host/serviceworker-private-browsing-worker.js", ResourceInfo { @"application/javascript", serviceWorkerCacheAccessEphemeralSessionSWBytes });
+    [configuration setURLSchemeHandler:handler.get() forURLScheme:@"SW"];
+
+    auto defaultWebView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/openCache.html"]];
+    [defaultWebView synchronouslyLoadRequest:request];
+    
+    bool openedCache = false;
+    [defaultWebView evaluateJavaScript:@"self.caches.open('test');" completionHandler: [&] (id innerText, NSError *error) {
+        openedCache = true;
+    }];
+    TestWebKitAPI::Util::run(&openedCache);
+
+    configuration.get().websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
+
+    auto messageHandler = adoptNS([[SWMessageHandlerForCacheStorage alloc] init]);
+    [[configuration userContentController] addScriptMessageHandler:messageHandler.get() name:@"sw"];
+
+    auto ephemeralWebView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+    request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/main.html"]];
+
+    [ephemeralWebView loadRequest:request];
+    TestWebKitAPI::Util::run(&done);
+    done = false;
+}
+
 static const char* regularPageGrabbingCacheStorageDirectory = R"SWRESOURCE(
 <script>
@@ -1379 +1460 @@
     [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
 
-    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-
-    configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     setConfigurationInjectedBundlePath(configuration.get());