<!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>[214189] trunk</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/214189">214189</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-03-20 12:50:09 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[QuickLook] Subresources should be in the same origin as the main document
https://bugs.webkit.org/show_bug.cgi?id=169868
<rdar://problem/29898214>
Reviewed by Daniel Bates.
Source/WebCore:
Prior to this change, QuickLook documents were placed in a unique origin, which meant all
subresources were loaded as cross-origin requests. This prevented XMLHttpRequests to the
QuickLook custom protocol, since cross-origin XHRs must be made to a protocol that
understands CORS.
Instead of a unique origin, we now create an origin for QuickLook documents from the preview
response URL (an x-apple-ql-id: URL), which will allow QuickLook to make same-origin XHRs by
using a URL with the same scheme and host as the preview response URL.
Test: http/tests/quicklook/same-origin-xmlhttprequest-allowed.html
* dom/Document.cpp:
(WebCore::Document::applyQuickLookSandbox):
LayoutTests:
* http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf: Added.
* http/tests/quicklook/resources/tap-run-test-hyperlink.js:
(runTest):
* http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt: Added.
* http/tests/quicklook/same-origin-xmlhttprequest-allowed.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsquicklookresourcestapruntesthyperlinkjs">trunk/LayoutTests/http/tests/quicklook/resources/tap-run-test-hyperlink.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsquicklookresourcessameoriginxmlhttprequestallowedrtf">trunk/LayoutTests/http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf</a></li>
<li><a href="#trunkLayoutTestshttptestsquicklooksameoriginxmlhttprequestallowedexpectedtxt">trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsquicklooksameoriginxmlhttprequestallowedhtml">trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214188 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-20 19:46:45 UTC (rev 214188)
+++ trunk/LayoutTests/ChangeLog 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-20 Andy Estes <aestes@apple.com>
+
+ [QuickLook] Subresources should be in the same origin as the main document
+ https://bugs.webkit.org/show_bug.cgi?id=169868
+ <rdar://problem/29898214>
+
+ Reviewed by Daniel Bates.
+
+ * http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf: Added.
+ * http/tests/quicklook/resources/tap-run-test-hyperlink.js:
+ (runTest):
+ * http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt: Added.
+ * http/tests/quicklook/same-origin-xmlhttprequest-allowed.html: Added.
+
</ins><span class="cx"> 2017-03-20 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Respect constraints passed to getUserMedia
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsquicklookresourcessameoriginxmlhttprequestallowedrtf"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf (0 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf (rev 0)
+++ trunk/LayoutTests/http/tests/quicklook/resources/same-origin-xmlhttprequest-allowed.rtf 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+{\rtf1\ansi\ansicpg1252\cocoartf1529\cocoasubrtf160
+{\fonttbl\f0\fmodern\fcharset0 Courier;\f1\froman\fcharset0 TimesNewRomanPSMT;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl0\margr0\margb0\margt0\vieww13440\viewh17040\viewkind1
+\deftab720
+\pard\pardeftab720\ri0\partightenfactor0
+{\field{\*\fldinst{HYPERLINK "javascript:(function%20()%20%7B%20var%20request%20=%20new%20XMLHttpRequest();%20request.onreadystatechange%20=%20function%20()%20%7B%20if%20(request.readyState%20===%204)%20%7B%20console.log('PASS:%20XMLHttpRequest%20allowed');%20testRunner.notifyDone();%20%7D%20%7D;%20request.open('GET',%20document.origin%20+%20'/x-apple-ql-magic/same-origin-xmlhttprequest-allowed.rtf');%20request.send();%20%7D)();"}}{\fldrslt
+\f0\fs36 \cf0 \ul \ulc0 Run test}}
+\f1\fs22 \
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsquicklookresourcestapruntesthyperlinkjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/quicklook/resources/tap-run-test-hyperlink.js (214188 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/quicklook/resources/tap-run-test-hyperlink.js 2017-03-20 19:46:45 UTC (rev 214188)
+++ trunk/LayoutTests/http/tests/quicklook/resources/tap-run-test-hyperlink.js 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-function runTest(frame, offsetInFrame)
</del><ins>+function runTest(frame, offsetInFrame, runAsync)
</ins><span class="cx"> {
</span><span class="cx"> if (!window.testRunner)
</span><span class="cx"> return;
</span><span class="lines">@@ -8,5 +8,9 @@
</span><span class="cx"> // FIXME: For some reason the (x, y) coordinates of the hyperlink "Run test" is offset 2 pixels
</span><span class="cx"> // in legacy WebKit (why?).
</span><span class="cx"> var fudgeFactor = UIHelper.isWebKit2() ? 0 : 2;
</span><del>- UIHelper.wait(UIHelper.activateAt(frame.offsetLeft + offsetInFrame + fudgeFactor, frame.offsetTop + offsetInFrame + fudgeFactor));
</del><ins>+ var promise = UIHelper.activateAt(frame.offsetLeft + offsetInFrame + fudgeFactor, frame.offsetTop + offsetInFrame + fudgeFactor);
+ if (runAsync)
+ return promise;
+
+ UIHelper.wait(promise);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsquicklooksameoriginxmlhttprequestallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt (0 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+CONSOLE MESSAGE: line 1: PASS: XMLHttpRequest allowed
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+Run test
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsquicklooksameoriginxmlhttprequestallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed.html (0 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed.html (rev 0)
+++ trunk/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed.html 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="/js-test-resources/ui-helper.js"></script>
+<script src="resources/tap-run-test-hyperlink.js"></script>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<iframe src="resources/same-origin-xmlhttprequest-allowed.rtf" onload="runTest(this, 8 /* offsetInFrame */, true /* runAsync */)"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214188 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-20 19:46:45 UTC (rev 214188)
+++ trunk/Source/WebCore/ChangeLog 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-03-20 Andy Estes <aestes@apple.com>
+
+ [QuickLook] Subresources should be in the same origin as the main document
+ https://bugs.webkit.org/show_bug.cgi?id=169868
+ <rdar://problem/29898214>
+
+ Reviewed by Daniel Bates.
+
+ Prior to this change, QuickLook documents were placed in a unique origin, which meant all
+ subresources were loaded as cross-origin requests. This prevented XMLHttpRequests to the
+ QuickLook custom protocol, since cross-origin XHRs must be made to a protocol that
+ understands CORS.
+
+ Instead of a unique origin, we now create an origin for QuickLook documents from the preview
+ response URL (an x-apple-ql-id: URL), which will allow QuickLook to make same-origin XHRs by
+ using a URL with the same scheme and host as the preview response URL.
+
+ Test: http/tests/quicklook/same-origin-xmlhttprequest-allowed.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::applyQuickLookSandbox):
+
</ins><span class="cx"> 2017-03-17 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> window.crypto.getRandomValues() uses the insecure RC4 RNG
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (214188 => 214189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-03-20 19:46:45 UTC (rev 214188)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-20 19:50:09 UTC (rev 214189)
</span><span class="lines">@@ -6818,7 +6818,14 @@
</span><span class="cx">
</span><span class="cx"> void Document::applyQuickLookSandbox()
</span><span class="cx"> {
</span><del>- static NeverDestroyed<String> quickLookCSP = makeString("default-src ", QLPreviewProtocol(), ": 'unsafe-inline'; base-uri 'none'; sandbox allow-scripts");
</del><ins>+ const URL& responseURL = m_frame->loader().activeDocumentLoader()->responseURL();
+ ASSERT(responseURL.protocolIs(QLPreviewProtocol()));
+
+ auto securityOrigin = SecurityOrigin::create(responseURL);
+ securityOrigin->setStorageBlockingPolicy(SecurityOrigin::BlockAllStorage);
+ setSecurityOriginPolicy(SecurityOriginPolicy::create(WTFMove(securityOrigin)));
+
+ static NeverDestroyed<String> quickLookCSP = makeString("default-src ", QLPreviewProtocol(), ": 'unsafe-inline'; base-uri 'none'; sandbox allow-same-origin allow-scripts");
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(contentSecurityPolicy());
</span><span class="cx"> // The sandbox directive is only allowed if the policy is from an HTTP header.
</span><span class="cx"> contentSecurityPolicy()->didReceiveHeader(quickLookCSP, ContentSecurityPolicyHeaderType::Enforce, ContentSecurityPolicy::PolicyFrom::HTTPHeader);
</span></span></pre>
</div>
</div>
</body>
</html>