Changeset 289236 in webkit

Timestamp:

Feb 7, 2022 11:57:43 AM (5 months ago)

Author:

Chris Dumez

Message:

WorkerGlobalScope.importScripts() should protect blob urls that were passed in until the imports are done
​https://bugs.webkit.org/show_bug.cgi?id=236168

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Rebaseline WPT test that is now passing.

• web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker-expected.txt:

Source/WebCore:

No new tests, rebaselined existing test.

• workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::importScripts):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/workers/WorkerGlobalScope.cpp (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-07  Chris Dumez  <cdumez@apple.com>
+
+        WorkerGlobalScope.importScripts() should protect blob urls that were passed in until the imports are done
+        https://bugs.webkit.org/show_bug.cgi?id=236168
+
+        Reviewed by Darin Adler.
+
+        Rebaseline WPT test that is now passing.
+
+        * web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker-expected.txt:
+
 2022-02-07  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker-expected.txt

@@ -2 +2 @@
 PASS Blob URLs work on importScripts
 PASS A revoked blob URL will fail
-FAIL Revoking a blob URL in an earlier script will not fail Load failed
+PASS Revoking a blob URL in an earlier script will not fail
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-07  Chris Dumez  <cdumez@apple.com>
+
+        WorkerGlobalScope.importScripts() should protect blob urls that were passed in until the imports are done
+        https://bugs.webkit.org/show_bug.cgi?id=236168
+
+        Reviewed by Darin Adler.
+
+        No new tests, rebaselined existing test.
+
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::importScripts):
+
 2022-02-07  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -29 +29 @@
 #include "WorkerGlobalScope.h"
 
+#include "BlobURL.h"
 #include "CSSFontSelector.h"
 #include "CSSValueList.h"
@@ -349 +350 @@
 
     Vector<URL> completedURLs;
+    Vector<BlobURLHandle> protectedBlobURLs;
     completedURLs.reserveInitialCapacity(urls.size());
     for (auto& entry : urls) {
@@ -354 +356 @@
         if (!url.isValid())
             return Exception { SyntaxError };
+        if (url.protocolIsBlob())
+            protectedBlobURLs.append(BlobURLHandle { url });
         completedURLs.uncheckedAppend(WTFMove(url));
     }