<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280237] releases/WebKitGTK/webkit-2.32</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280237">280237</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2021-07-23 03:11:19 -0700 (Fri, 23 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/276012">r276012</a> - REGRESSION(Safari 14): iframe with blob url does not work with sandboxing
https://bugs.webkit.org/show_bug.cgi?id=222312
<rdar://problem/74927624>

Reviewed by Chris Dumez.

Source/WebCore:

In https://trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/275884">r275884</a>, we correctly compute whether a blob is to be considered secure or not.
For that, we need to have the blob URL registered with its document origin.
Update PolicyChecker to properly register the temporoary blob URL with its document origin.

Test: http/tests/security/sandbox-iframe-and-blob.https.html

* loader/PolicyChecker.cpp:
(WebCore::FrameLoader::PolicyChecker::extendBlobURLLifetimeIfNecessary const):

LayoutTests:

* http/tests/security/resources/sandbox-iframe-and-blob-frame.html: Added.
* http/tests/security/sandbox-iframe-and-blob.https-expected.txt: Added.
* http/tests/security/sandbox-iframe-and-blob.https.html: Added.
* platform/win/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestsplatformwinTestExpectations">releases/WebKitGTK/webkit-2.32/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreloaderPolicyCheckercpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/PolicyChecker.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestshttptestssecurityresourcessandboxiframeandblobframehtml">releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/resources/sandbox-iframe-and-blob-frame.html</a></li>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestshttptestssecuritysandboxiframeandblobhttpsexpectedtxt">releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestshttptestssecuritysandboxiframeandblobhttpshtml">releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog (280236 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog     2021-07-23 10:11:10 UTC (rev 280236)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog        2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-04-15  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION(Safari 14): iframe with blob url does not work with sandboxing
+        https://bugs.webkit.org/show_bug.cgi?id=222312
+        <rdar://problem/74927624>
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/security/resources/sandbox-iframe-and-blob-frame.html: Added.
+        * http/tests/security/sandbox-iframe-and-blob.https-expected.txt: Added.
+        * http/tests/security/sandbox-iframe-and-blob.https.html: Added.
+        * platform/win/TestExpectations:
+
</ins><span class="cx"> 2021-04-18  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Blob URLs should use for their owner origin for CSP checks
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestshttptestssecurityresourcessandboxiframeandblobframehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/resources/sandbox-iframe-and-blob-frame.html (0 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/resources/sandbox-iframe-and-blob-frame.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/resources/sandbox-iframe-and-blob-frame.html 2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+    <iframe id="myFrame"></iframe>
+    <script>
+const html = "<body" + ">PASS<script" + ">parent.postMessage('loaded', '*')</"+ "script></" + "body>";
+var blob = new Blob([html], {type: 'text/html'});
+var url = URL.createObjectURL(blob);
+myFrame.src = url;
+window.onmessage = (event) => {
+    parent.postMessage(event.data, '*');
+};
+    </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestshttptestssecuritysandboxiframeandblobhttpsexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https-expected.txt (0 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https-expected.txt   2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+
+PASS Verify blob URLs are loaded with sandbox iframes
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestshttptestssecuritysandboxiframeandblobhttpshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https.html (0 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/http/tests/security/sandbox-iframe-and-blob.https.html   2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+    <iframe id="myFrame" sandbox="allow-scripts"></iframe>
+    <script>
+promise_test(async () => {
+    myFrame.src = "resources/sandbox-iframe-and-blob-frame.html";
+    const result = await new Promise((resolve, reject) => {
+        window.onmessage = (event) => {
+            resolve(event.data);
+        };
+        setTimeout(() => reject("iframe load timed out"), 5000);
+    });
+    assert_equals(result, 'loaded');
+}, "Verify blob URLs are loaded with sandbox iframes");
+    </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/platform/win/TestExpectations (280236 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/platform/win/TestExpectations 2021-07-23 10:11:10 UTC (rev 280236)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/platform/win/TestExpectations    2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -2330,6 +2330,7 @@
</span><span class="cx"> http/tests/security/contentSecurityPolicy/navigate-self-to-blob.html [ Skip ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/report-document-uri-blob.html [ Skip ]
</span><span class="cx"> fast/frames/restoring-page-cache-should-not-run-scripts-via-style-update.html [ Skip ]
</span><ins>+http/tests/security/sandbox-iframe-and-blob.https.html [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> # Clear Key not implemented
</span><span class="cx"> http/tests/media/clearkey/clear-key-hls-aes128.html [ Skip ] # Timeout
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280236 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog  2021-07-23 10:11:10 UTC (rev 280236)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog     2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-04-15  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION(Safari 14): iframe with blob url does not work with sandboxing
+        https://bugs.webkit.org/show_bug.cgi?id=222312
+        <rdar://problem/74927624>
+
+        Reviewed by Chris Dumez.
+
+        In https://trac.webkit.org/r275884, we correctly compute whether a blob is to be considered secure or not.
+        For that, we need to have the blob URL registered with its document origin.
+        Update PolicyChecker to properly register the temporoary blob URL with its document origin.
+
+        Test: http/tests/security/sandbox-iframe-and-blob.https.html
+
+        * loader/PolicyChecker.cpp:
+        (WebCore::FrameLoader::PolicyChecker::extendBlobURLLifetimeIfNecessary const):
+
</ins><span class="cx"> 2021-04-18  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Blob URLs should use for their owner origin for CSP checks
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/PolicyChecker.cpp (280236 => 280237)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/PolicyChecker.cpp   2021-07-23 10:11:10 UTC (rev 280236)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/PolicyChecker.cpp      2021-07-23 10:11:19 UTC (rev 280237)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HTMLPlugInElement.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "ThreadableBlobRegistry.h"
</ins><span class="cx"> #include <wtf/CompletionHandler.h>
</span><span class="cx"> 
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="lines">@@ -111,12 +112,12 @@
</span><span class="cx"> 
</span><span class="cx">     // Create a new temporary blobURL in case this one gets revoked during the asynchronous navigation policy decision.
</span><span class="cx">     URL temporaryBlobURL = BlobURL::createPublicURL(&m_frame.document()->securityOrigin());
</span><del>-    blobRegistry().registerBlobURL(temporaryBlobURL, request.url());
</del><ins>+    ThreadableBlobRegistry::registerBlobURL(&m_frame.document()->securityOrigin(), temporaryBlobURL, request.url());
</ins><span class="cx">     request.setURL(temporaryBlobURL);
</span><span class="cx">     if (loader)
</span><span class="cx">         loader->request().setURL(temporaryBlobURL);
</span><span class="cx">     return CompletionHandler<void()>([temporaryBlobURL = WTFMove(temporaryBlobURL)] {
</span><del>-        blobRegistry().unregisterBlobURL(temporaryBlobURL);
</del><ins>+        ThreadableBlobRegistry::unregisterBlobURL(temporaryBlobURL);
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>