Changeset 293719 in webkit

Timestamp:

May 3, 2022 1:06:52 AM (3 months ago)

Author:

youenn@apple.com

Message:

ServiceWorkerRegistration update should fail if called from an installing service worker context
​https://bugs.webkit.org/show_bug.cgi?id=239962

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/service-workers/service-worker/update-not-allowed.https-expected.txt:

Source/WebCore:

Implement step 4 of ​https://w3c.github.io/ServiceWorker/#service-worker-registration-update.
Covered by rebased test.

• workers/service/ServiceWorkerRegistration.cpp:

(WebCore::ServiceWorkerRegistration::update):

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/update-not-allowed.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/workers/service/ServiceWorkerRegistration.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-05-03  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerRegistration update should fail if called from an installing service worker context
+        https://bugs.webkit.org/show_bug.cgi?id=239962
+
+        Reviewed by Chris Dumez.
+
+        * TestExpectations:
+
 2022-05-02  Robert Jenner  <Jenner@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -371 +371 @@
 
 # Newly imported service worker tests that are flaky.
-imported/w3c/web-platform-tests/service-workers/service-worker/update-not-allowed.https.html [ Pass Failure ]
 imported/w3c/web-platform-tests/service-workers/service-worker/performance-timeline.https.html [ Pass Failure ]
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-05-03  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerRegistration update should fail if called from an installing service worker context
+        https://bugs.webkit.org/show_bug.cgi?id=239962
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/service-workers/service-worker/update-not-allowed.https-expected.txt:
+
 2022-05-02  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/update-not-allowed.https-expected.txt

@@ -1 +1 @@
 
 PASS ServiceWorkerRegistration.update() from client succeeds while installing service worker.
-FAIL ServiceWorkerRegistration.update() from installing service worker throws. assert_false: update() should have failed. expected false got true
+PASS ServiceWorkerRegistration.update() from installing service worker throws.
 PASS ServiceWorkerRegistration.update() from active service worker succeeds while installing service worker.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-03  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerRegistration update should fail if called from an installing service worker context
+        https://bugs.webkit.org/show_bug.cgi?id=239962
+
+        Reviewed by Chris Dumez.
+
+        Implement step 4 of https://w3c.github.io/ServiceWorker/#service-worker-registration-update.
+        Covered by rebased test.
+
+        * workers/service/ServiceWorkerRegistration.cpp:
+        (WebCore::ServiceWorkerRegistration::update):
+
 2022-05-02  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/workers/service/ServiceWorkerRegistration.cpp

@@ -156 +156 @@
     }
 
+    if (auto* serviceWorkerGlobalScope = dynamicDowncast<ServiceWorkerGlobalScope>(scriptExecutionContext()); serviceWorkerGlobalScope && serviceWorkerGlobalScope->serviceWorker().state() == ServiceWorkerState::Installing) {
+        promise->reject(Exception(InvalidStateError, "service worker is installing"_s));
+        return;
+    }
+
     m_container->updateRegistration(m_registrationData.scopeURL, newestWorker->scriptURL(), newestWorker->workerType(), WTFMove(promise));
 }