Changeset 263622 in webkit

Timestamp:

Jun 27, 2020 9:13:56 AM (4 years ago)

Author:

youenn@apple.com

Message:

Protect SWServer::claim from a registration without active worker
​https://bugs.webkit.org/show_bug.cgi?id=213597

Reviewed by Chris Dumez.

SWServerWorker might be active while being terminated.
If terminated as part of SWServerRegistration::clear, the registration no longer has a service worker.
SWServer::claim should therefore check for registration active worker.
This is difficult to test as one needs to claim at the time the service worker is being terminated but not yet terminated.

• workers/service/server/SWServer.cpp:

(WebCore::SWServer::claim):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/SWServer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-27  Youenn Fablet  <youenn@apple.com>
+
+        Protect SWServer::claim from a registration without active worker
+        https://bugs.webkit.org/show_bug.cgi?id=213597
+
+        Reviewed by Chris Dumez.
+
+        SWServerWorker might be active while being terminated.
+        If terminated as part of SWServerRegistration::clear, the registration no longer has a service worker.
+        SWServer::claim should therefore check for registration active worker.
+        This is difficult to test as one needs to claim at the time the service worker is being terminated but not yet terminated.
+
+        * workers/service/server/SWServer.cpp:
+        (WebCore::SWServer::claim):
+
 2020-06-27  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/workers/service/server/SWServer.cpp

@@ -582 +582 @@
 Optional<ExceptionData> SWServer::claim(SWServerWorker& worker)
 {
-    if (!worker.isActive())
+    auto* registration = worker.registration();
+    if (!registration || &worker != registration->activeWorker())
         return ExceptionData { InvalidStateError, "Service worker is not active"_s };
 
     auto& origin = worker.origin();
     forEachClientForOrigin(origin, [&](auto& clientData) {
-        auto* registration = this->doRegistrationMatching(origin.topOrigin, clientData.url);
-        if (!(registration && registration->key() == worker.registrationKey()))
+        if (doRegistrationMatching(origin.topOrigin, clientData.url) != registration)
             return;