Changeset 256680 in webkit

Timestamp:

Feb 14, 2020 7:02:02 PM (4 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r256578. rdar://problem/59447009

Protect WebSWServerConnection::scheduleJobInServer from bad scopeURL
​https://bugs.webkit.org/show_bug.cgi?id=207722

Reviewed by Chris Dumez.

• NetworkProcess/ServiceWorker/WebSWServerConnection.cpp: (WebKit::WebSWServerConnection::scheduleJobInServer): In case of bad scope, fail the job early on.
• WebProcess/Storage/WebSWClientConnection.cpp: (WebKit::WebSWClientConnection::scheduleJobInServer): Remove the RELEASE_ASSERT from now since we defend in Network process. We will add it back in ServiceWorkerRegistration::getOrCreate as a follow-up.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@256578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (modified) (1 diff)
• WebProcess/Storage/WebSWClientConnection.cpp (modified) (1 diff)

branches/safari-609-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-14  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r256578. rdar://problem/59447009
+
+    Protect WebSWServerConnection::scheduleJobInServer from bad scopeURL
+    https://bugs.webkit.org/show_bug.cgi?id=207722
+    
+    Reviewed by Chris Dumez.
+    
+    * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+    (WebKit::WebSWServerConnection::scheduleJobInServer):
+    In case of bad scope, fail the job early on.
+    * WebProcess/Storage/WebSWClientConnection.cpp:
+    (WebKit::WebSWClientConnection::scheduleJobInServer):
+    Remove the RELEASE_ASSERT from now since we defend in Network process.
+    We will add it back in ServiceWorkerRegistration::getOrCreate as a follow-up.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256578 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-02-13  Youenn Fablet  <youenn@apple.com>
+
+            Protect WebSWServerConnection::scheduleJobInServer from bad scopeURL
+            https://bugs.webkit.org/show_bug.cgi?id=207722
+
+            Reviewed by Chris Dumez.
+
+            * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+            (WebKit::WebSWServerConnection::scheduleJobInServer):
+            In case of bad scope, fail the job early on.
+            * WebProcess/Storage/WebSWClientConnection.cpp:
+            (WebKit::WebSWClientConnection::scheduleJobInServer):
+            Remove the RELEASE_ASSERT from now since we defend in Network process.
+            We will add it back in ServiceWorkerRegistration::getOrCreate as a follow-up.
+
 2020-02-14  Russell Epstein  <repstein@apple.com>
 

branches/safari-609-branch/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp

@@ -273 +273 @@
 void WebSWServerConnection::scheduleJobInServer(ServiceWorkerJobData&& jobData)
 {
+    ASSERT(!jobData.scopeURL.isNull());
+    if (jobData.scopeURL.isNull()) {
+        rejectJobInClient(jobData.identifier().jobIdentifier, ExceptionData { InvalidStateError, "Scope URL is empty"_s });
+        return;
+    }
+
     SWSERVERCONNECTION_RELEASE_LOG_IF_ALLOWED("Scheduling ServiceWorker job %s in server", jobData.identifier().loggingString().utf8().data());
     ASSERT(identifier() == jobData.connectionIdentifier());

branches/safari-609-branch/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp

@@ -74 +74 @@
 void WebSWClientConnection::scheduleJobInServer(const ServiceWorkerJobData& jobData)
 {
-    RELEASE_ASSERT(!jobData.scopeURL.isNull());
     runOrDelayTaskForImport([this, jobData] {
         send(Messages::WebSWServerConnection::ScheduleJobInServer { jobData });