<!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>[209784] 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/209784">209784</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-13 16:20:11 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/204163">r204163</a>): Web Inspector: Page crashes when Inspector tries to load insecure SourceMap
https://bugs.webkit.org/show_bug.cgi?id=165806
<rdar://problem/28169025>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-12-13
Reviewed by Alex Christensen.
Source/WebCore:
Test: http/tests/inspector/network/loadResource-insecure-resource.html
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::loadResource):
DocumentThreadableLoader now triggers the ThreadableLoaderClient's didFail
callback, so this didFailLoaderCreation is now redundent and incorrect.
LayoutTests:
* http/tests/inspector/network/loadResource-insecure-resource-expected.txt: Added.
* http/tests/inspector/network/loadResource-insecure-resource.html: Added.
* http/tests/inspector/network/resource-timing.html:
* http/tests/inspector/resources/inspector-test.js:
(runTestHTTPS):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcetiminghtml">trunk/LayoutTests/http/tests/inspector/network/resource-timing.html</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesinspectortestjs">trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkloadResourceinsecureresourceexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkloadResourceinsecureresourcehtml">trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/LayoutTests/ChangeLog 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r204163): Web Inspector: Page crashes when Inspector tries to load insecure SourceMap
+ https://bugs.webkit.org/show_bug.cgi?id=165806
+ <rdar://problem/28169025>
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/inspector/network/loadResource-insecure-resource-expected.txt: Added.
+ * http/tests/inspector/network/loadResource-insecure-resource.html: Added.
+ * http/tests/inspector/network/resource-timing.html:
+ * http/tests/inspector/resources/inspector-test.js:
+ (runTestHTTPS):
+
</ins><span class="cx"> 2016-12-13 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline js/dom/global-constructors-attributes.html after r209777.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkloadResourceinsecureresourceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt (0 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/inspector/network/loadResource-insecure-resource.html was not allowed to display insecure content from http://127.0.0.0:8000/inspector/network/resources/data.json?2.
+
+Tests loading resources on a secure page with Network.loadResource.
+
+
+== Running test suite: Network.loadResource.MixedContent
+-- Running test case: Network.loadResource.MixedContent.SecureSuccess
+PASS: Should not be an error loading a secure resource.
+PASS: Should be a 200 OK status.
+
+-- Running test case: Network.loadResource.MixedContent.InsecureFailure
+PASS: Should be an error loading an insecure resource.
+PASS: Loading resource for inspector failed access control check
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkloadResourceinsecureresourcehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource.html (0 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource.html 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Network.loadResource.MixedContent");
+
+ suite.addTestCase({
+ name: "Network.loadResource.MixedContent.SecureSuccess",
+ description: "Ensure trying to load an https resource from a secure page succeeds.",
+ test(resolve, reject) {
+ const url = "https://127.0.0.1:8443/inspector/network/resources/data.json?1";
+ NetworkAgent.loadResource(WebInspector.frameResourceManager.mainFrame.id, url, (error, content, mimeType, status) => {
+ InspectorTest.expectThat(!error, "Should not be an error loading a secure resource.");
+ InspectorTest.expectEqual(status, 200, "Should be a 200 OK status.");
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "Network.loadResource.MixedContent.InsecureFailure",
+ description: "Ensure trying to load an http resource from a secure page fails.",
+ test(resolve, reject) {
+ const url = "http://127.0.0.0:8000/inspector/network/resources/data.json?2";
+ NetworkAgent.loadResource(WebInspector.frameResourceManager.mainFrame.id, url, (error, content, mimeType, status) => {
+ InspectorTest.expectThat(error, "Should be an error loading an insecure resource.");
+ InspectorTest.pass(error);
+ resolve();
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTestHTTPS()">
+<p>Tests loading resources on a secure page with Network.loadResource.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcetiminghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/network/resource-timing.html (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resource-timing.html 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/LayoutTests/http/tests/inspector/network/resource-timing.html 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -10,9 +10,10 @@
</span><span class="cx"> document.body.appendChild(img);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function test() {
</del><ins>+function test()
+{
</ins><span class="cx"> let suite = InspectorTest.createAsyncSuite("ResourceTimingData");
</span><del>- InspectorTest.debug();
</del><ins>+
</ins><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "CheckResourceTimingInformationForResource",
</span><span class="cx"> description: "Check if a resource has timing information.",
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesinspectortestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -101,6 +101,24 @@
</span><span class="cx"> testRunner.evaluateInWebInspector(testFunctionCodeString);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function runTestHTTPS()
+{
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ let url = new URL(document.URL);
+ if (url.protocol !== "https:") {
+ url.protocol = "https:";
+ url.port = "8443";
+ window.location.href = url.toString();
+ return;
+ }
+
+ runTest();
+}
+
</ins><span class="cx"> TestPage.completeTest = function()
</span><span class="cx"> {
</span><span class="cx"> // Don't try to use testRunner if running through the browser.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/Source/WebCore/ChangeLog 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION(r204163): Web Inspector: Page crashes when Inspector tries to load insecure SourceMap
+ https://bugs.webkit.org/show_bug.cgi?id=165806
+ <rdar://problem/28169025>
+
+ Reviewed by Alex Christensen.
+
+ Test: http/tests/inspector/network/loadResource-insecure-resource.html
+
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::loadResource):
+ DocumentThreadableLoader now triggers the ThreadableLoaderClient's didFail
+ callback, so this didFailLoaderCreation is now redundent and incorrect.
+
</ins><span class="cx"> 2016-12-13 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Enhance fast path translate transforms to allow percentages
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -129,12 +129,6 @@
</span><span class="cx"> dispose();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void didFailLoaderCreation()
- {
- m_callback->sendFailure(ASCIILiteral("Could not create a loader"));
- dispose();
- }
-
</del><span class="cx"> void setLoader(RefPtr<ThreadableLoader>&& loader)
</span><span class="cx"> {
</span><span class="cx"> m_loader = WTFMove(loader);
</span><span class="lines">@@ -683,14 +677,11 @@
</span><span class="cx"> options.credentials = FetchOptions::Credentials::SameOrigin;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span><span class="cx">
</span><del>- // InspectorThreadableLoaderClient deletes itself when the load completes.
</del><ins>+ // InspectorThreadableLoaderClient deletes itself when the load completes or fails.
</ins><span class="cx"> InspectorThreadableLoaderClient* inspectorThreadableLoaderClient = new InspectorThreadableLoaderClient(callback.copyRef());
</span><del>-
</del><span class="cx"> auto loader = DocumentThreadableLoader::create(*document, *inspectorThreadableLoaderClient, WTFMove(request), options);
</span><del>- if (!loader) {
- inspectorThreadableLoaderClient->didFailLoaderCreation();
</del><ins>+ if (!loader)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // If the load already completed, inspectorThreadableLoaderClient will have been deleted and we will have already called the callback.
</span><span class="cx"> if (!callback->isActive())
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (209783 => 209784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-12-14 00:18:17 UTC (rev 209783)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-12-14 00:20:11 UTC (rev 209784)
</span><span class="lines">@@ -331,7 +331,6 @@
</span><span class="cx">
</span><span class="cx"> bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const URL& url) const
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> if (!canRequestInContentDispositionAttachmentSandbox(type, url))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>