Changeset 292907 in webkit

Timestamp:

Apr 15, 2022, 8:12:14 AM (4 years ago)

Author:

youenn@apple.com

Message:

Sandboxed iframe loads should match a service worker registration based on sandbox flags
​https://bugs.webkit.org/show_bug.cgi?id=239379

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https-expected.txt: Added.

Source/WebCore:

Coverdd by updated tests.

• loader/DocumentLoader.cpp:

Sandboxed iframes have a null origin and should not be intercepted by service workers.

LayoutTests:

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-15  Youenn Fablet  <youenn@apple.com>
+
+        Sandboxed iframe loads should match a service worker registration based on sandbox flags
+        https://bugs.webkit.org/show_bug.cgi?id=239379
+
+        Reviewed by Chris Dumez.
+
+        * TestExpectations:
+
 2022-04-15  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -381 +381 @@
 
 # Skip service worker tests that are timing out.
-imported/w3c/web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/update-bytecheck.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html [ Skip ]

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-04-15  Youenn Fablet  <youenn@apple.com>
+
+        Sandboxed iframe loads should match a service worker registration based on sandbox flags
+        https://bugs.webkit.org/show_bug.cgi?id=239379
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https-expected.txt: Added.
+
 2022-04-15  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-15  Youenn Fablet  <youenn@apple.com>
+
+        Sandboxed iframe loads should match a service worker registration based on sandbox flags
+        https://bugs.webkit.org/show_bug.cgi?id=239379
+
+        Reviewed by Chris Dumez.
+
+        Coverdd by updated tests.
+
+        * loader/DocumentLoader.cpp:
+        Sandboxed iframes have a null origin and should not be intercepted by service workers.
+
 2022-04-15  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -2117 +2117 @@
 }
 
+static bool isSandboxingAllowingServiceWorkerFetchHandling(SandboxFlags flags)
+{
+    return !(flags & SandboxOrigin) && !(flags & SandboxScripts);
+}
+
 void DocumentLoader::loadMainResource(ResourceRequest&& request)
 {
@@ -2135 +2140 @@
 #if ENABLE(SERVICE_WORKER)
     if (m_frame && m_frame->settings().serviceWorkersEnabled()) {
-        // The main navigation load will trigger the registration of the client.
-        if (m_resultingClientId)
-            scriptExecutionContextIdentifierToLoaderMap().remove(m_resultingClientId);
-        m_resultingClientId = ScriptExecutionContextIdentifier::generate();
-        ASSERT(!scriptExecutionContextIdentifierToLoaderMap().contains(m_resultingClientId));
-        scriptExecutionContextIdentifierToLoaderMap().add(m_resultingClientId, this);
-        mainResourceLoadOptions.clientIdentifier = m_resultingClientId;
+        if (!isSandboxingAllowingServiceWorkerFetchHandling(frameLoader()->effectiveSandboxFlags()))
+            mainResourceLoadOptions.serviceWorkersMode = ServiceWorkersMode::None;
+        else {
+            // The main navigation load will trigger the registration of the client.
+            if (m_resultingClientId)
+                scriptExecutionContextIdentifierToLoaderMap().remove(m_resultingClientId);
+            m_resultingClientId = ScriptExecutionContextIdentifier::generate();
+            ASSERT(!scriptExecutionContextIdentifierToLoaderMap().contains(m_resultingClientId));
+            scriptExecutionContextIdentifierToLoaderMap().add(m_resultingClientId, this);
+            mainResourceLoadOptions.clientIdentifier = m_resultingClientId;
+        }
     }
 #endif