<!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>[203300] 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/203300">203300</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-07-15 14:18:33 -0700 (Fri, 15 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Block insecure script running in a data: frame when the top-level page is HTTPS
https://bugs.webkit.org/show_bug.cgi?id=125806
<rdar://problem/27331825>
Reviewed by Brady Eidson.
Fix based on a Blink change (patch by <tsepez@chromium.org>):
<https://chromium.googlesource.com/chromium/blink/+/33e553bd96e040151c1472289a0d80803bfca3a5>
Source/WebCore:
Test: http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::checkInsecureContent): Check the top-level frame's security state
before allowing insecure scripts to be used.
LayoutTests:
* http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt: Added.
* http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html: Added.
* http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentinsecurescriptindataiframeinmainframeblockedexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentinsecurescriptindataiframeinmainframeblockedhtml">trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentresourcesframewithdataurlframewithscripthtml">trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203299 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-15 21:17:01 UTC (rev 203299)
+++ trunk/LayoutTests/ChangeLog 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-15 Brent Fulgham <bfulgham@apple.com>
+
+ Block insecure script running in a data: frame when the top-level page is HTTPS
+ https://bugs.webkit.org/show_bug.cgi?id=125806
+ <rdar://problem/27331825>
+
+ Reviewed by Brady Eidson.
+
+ Fix based on a Blink change (patch by <tsepez@chromium.org>):
+ <https://chromium.googlesource.com/chromium/blink/+/33e553bd96e040151c1472289a0d80803bfca3a5>
+
+ * http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt: Added.
+ * http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html: Added.
+ * http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html: Added.
+
</ins><span class="cx"> 2016-07-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skipping test from r203288 on ios-simulator due to reliance upon mouse events.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentinsecurescriptindataiframeinmainframeblockedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt (0 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-data-url-frame-with-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
+
+This test opens a window that loads a data: iframe that loads an insecure script, and that the script is still blocked. Although the data: frame has a separate origin, the script can still navigate top.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentinsecurescriptindataiframeinmainframeblockedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html (0 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<html>
+<body>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+ testRunner.overridePreference("WebKitAllowRunningInsecureContent", false);
+}
+window.addEventListener("message", function (e) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+</script>
+<p>This test opens a window that loads a data: iframe that loads an
+insecure script, and that the script is still blocked. Although the
+data: frame has a separate origin, the script can still navigate top.
+</p>
+<script>
+window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-data-url-frame-with-script.html");
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentresourcesframewithdataurlframewithscripthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html (0 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-data-url-frame-with-script.html 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<script>
+function frameLoaded() {
+ if (window.opener)
+ window.opener.postMessage('done', '*');
+}
+</script>
+<iframe onload="frameLoaded()" src="data:text/html,<html><script src='http://127.0.0.1:8080/security/mixedContent/resources/script.js'></script></html>"></iframe>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203299 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-15 21:17:01 UTC (rev 203299)
+++ trunk/Source/WebCore/ChangeLog 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-15 Brent Fulgham <bfulgham@apple.com>
+
+ Block insecure script running in a data: frame when the top-level page is HTTPS
+ https://bugs.webkit.org/show_bug.cgi?id=125806
+ <rdar://problem/27331825>
+
+ Reviewed by Brady Eidson.
+
+ Fix based on a Blink change (patch by <tsepez@chromium.org>):
+ <https://chromium.googlesource.com/chromium/blink/+/33e553bd96e040151c1472289a0d80803bfca3a5>
+
+ Test: http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::checkInsecureContent): Check the top-level frame's security state
+ before allowing insecure scripts to be used.
+
</ins><span class="cx"> 2016-07-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Let the compiler generate QualifiedName copy constructor and assignment operator
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (203299 => 203300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-07-15 21:17:01 UTC (rev 203299)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-07-15 21:18:33 UTC (rev 203300)
</span><span class="lines">@@ -343,9 +343,13 @@
</span><span class="cx"> case CachedResource::CSSStyleSheet:
</span><span class="cx"> // These resource can inject script into the current document (Script,
</span><span class="cx"> // XSL) or exfiltrate the content of the current document (CSS).
</span><del>- if (Frame* f = frame())
</del><ins>+ if (Frame* f = frame()) {
</ins><span class="cx"> if (!f->loader().mixedContentChecker().canRunInsecureContent(m_document->securityOrigin(), url))
</span><span class="cx"> return false;
</span><ins>+ Frame& top = f->tree().top();
+ if (&top != f && !top.loader().mixedContentChecker().canRunInsecureContent(top.document()->securityOrigin(), url))
+ return false;
+ }
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> case CachedResource::TextTrackResource:
</span></span></pre>
</div>
</div>
</body>
</html>