<!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>[169243] 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/169243">169243</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 20:59:11 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>http/tests/security/xss-DENIED-xsl-document-redirect.xml fails with NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=132523
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2014-05-22
Reviewed by Alexey Proskuryakov.
Source/WebCore:
We should not manufacture a response in the event of an error during a
synchronous XHR. In addition, this test removes two places that are
sensitive to such a manufactured response.
Updates test expectations.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadRequest): Don't inspect a
loader response if there is an error
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::platformLoadResourceSynchronously): Do not
manufacture a response
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::platformLoadResourceSynchronously): Do not
manufacture a response
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::docLoaderFunc): Only use the response's URL if no error
occurred.
LayoutTests:
Two tests have been rebaselined, and re-enable test that now passes. Because of
<a href="http://trac.webkit.org/projects/webkit/changeset/23889">r23889</a>, synchronous XHRs for file: URLs purposely don't invoke error handlers.
* fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt: Updated
incorrect test description
* fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html: Ditto
* platform/mac-wk2/TestExpectations: Re-enable test that now passes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastxmlhttprequestresourcesxmlhttprequestnonexistentfilerealhtml">trunk/LayoutTests/fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html</a></li>
<li><a href="#trunkLayoutTestsfastxmlhttprequestxmlhttprequestnonexistentfileexpectedtxt">trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/LayoutTests/ChangeLog 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-22 Myles C. Maxfield <mmaxfield@apple.com>
+
+ http/tests/security/xss-DENIED-xsl-document-redirect.xml fails with NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=132523
+
+ Reviewed by Alexey Proskuryakov.
+
+ Two tests have been rebaselined, and re-enable test that now passes. Because of
+ r23889, synchronous XHRs for file: URLs purposely don't invoke error handlers.
+
+ * fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt: Updated
+ incorrect test description
+ * fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html: Ditto
+ * platform/mac-wk2/TestExpectations: Re-enable test that now passes.
+
</ins><span class="cx"> 2014-05-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the compositing/transitions/transform-on-large-layer.html test
</span></span></pre></div>
<a id="trunkLayoutTestsfastxmlhttprequestresourcesxmlhttprequestnonexistentfilerealhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/LayoutTests/fast/xmlhttprequest/resources/xmlhttprequest-nonexistent-file-real.html 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="testXHRNonExistentFile()">
</span><span class="cx"> <p> Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=22475">22475</a>: REGRESSION: Async XMLHttpRequest never finishes on nonexistent files anymore </p>
</span><del>- <p> In both cases, readyState 4 should be reached, and error handler should be invoked. </p>
</del><ins>+ <p> In both cases, readyState 4 should be reached. Because one of the requests is synchronous and for a file: URL, only a single error handler should be invoked. </p>
</ins><span class="cx"> <div id="console"/>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastxmlhttprequestxmlhttprequestnonexistentfileexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx">
</span><span class="cx"> Bug 22475: REGRESSION: Async XMLHttpRequest never finishes on nonexistent files anymore
</span><span class="cx">
</span><del>-In both cases, readyState 4 should be reached, and error handler should be invoked.
</del><ins>+In both cases, readyState 4 should be reached. Because one of the requests is synchronous and for a file: URL, only a single error handler should be invoked.
</ins><span class="cx">
</span><span class="cx"> Doing an XHR to a nonexistent file.
</span><span class="cx"> ReadyState handler: readyState = 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -407,9 +407,6 @@
</span><span class="cx"> webkit.org/b/123431 [ Mavericks ] http/tests/local/link-stylesheet-load-order-preload.html [ Failure ]
</span><span class="cx"> webkit.org/b/123431 [ Mavericks ] http/tests/local/link-stylesheet-load-order.html [ Failure ]
</span><span class="cx">
</span><del>-# passes but has different logging
-[ Mavericks ] http/tests/security/xss-DENIED-xsl-document-redirect.xml [ Failure ]
-
</del><span class="cx"> # test results in DRT don't match in browser behavior, test seems broken
</span><span class="cx"> fast/dom/Window/mozilla-focus-blur.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-22 Myles C. Maxfield <mmaxfield@apple.com>
+
+ http/tests/security/xss-DENIED-xsl-document-redirect.xml fails with NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=132523
+
+ Reviewed by Alexey Proskuryakov.
+
+ We should not manufacture a response in the event of an error during a
+ synchronous XHR. In addition, this test removes two places that are
+ sensitive to such a manufactured response.
+
+ Updates test expectations.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::loadRequest): Don't inspect a
+ loader response if there is an error
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::platformLoadResourceSynchronously): Do not
+ manufacture a response
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::platformLoadResourceSynchronously): Do not
+ manufacture a response
+ * xml/XSLTProcessorLibxslt.cpp:
+ (WebCore::docLoaderFunc): Only use the response's URL if no error
+ occurred.
+
</ins><span class="cx"> 2014-05-22 Myles C. Maxfield <litherum@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed typo fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -410,9 +410,14 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(&m_document, identifier, m_client);
</span><span class="cx">
</span><del>- // No exception for file:/// resources, see <rdar://problem/4962298>.
- // Also, if we have an HTTP response, then it wasn't a network error in fact.
- if (!error.isNull() && !requestURL.isLocalFile() && response.httpStatusCode() <= 0) {
</del><ins>+ if (!error.isNull() && response.httpStatusCode() <= 0) {
+ if (requestURL.isLocalFile()) {
+ // We don't want XMLHttpRequest to raise an exception for file:// resources, see <rdar://problem/4962298>.
+ // FIXME: XMLHttpRequest quirks should be in XMLHttpRequest code, not in DocumentThreadableLoader.cpp.
+ didReceiveResponse(identifier, response);
+ didFinishLoading(identifier, 0.0);
+ return;
+ }
</ins><span class="cx"> m_client->didFail(error);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -512,14 +512,6 @@
</span><span class="cx">
</span><span class="cx"> if (error.isNull())
</span><span class="cx"> response = client->response();
</span><del>- else {
- response = ResourceResponse(request.url(), String(), 0, String(), String());
- // FIXME: ResourceHandleMac also handles authentication errors by setting code to 401. CFNet version should probably do the same.
- if (error.domain() == String(kCFErrorDomainCFNetwork))
- response.setHTTPStatusCode(error.errorCode());
- else
- response.setHTTPStatusCode(404);
- }
</del><span class="cx">
</span><span class="cx"> data.swap(client->mutableData());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -426,25 +426,6 @@
</span><span class="cx">
</span><span class="cx"> if (error.isNull())
</span><span class="cx"> response = client->response();
</span><del>- else {
- // FIXME: We might not ever need to manufacture a response: This might all be dead code.
- // When exploring removal of this code, we should substitute appropriate ASSERTs.
- response = ResourceResponse(request.url(), String(), 0, String(), String());
- if (error.domain() == String(NSURLErrorDomain))
- switch (error.errorCode()) {
- case NSURLErrorUserCancelledAuthentication:
- // FIXME: We don't need to manufacture a 401 response if we say continueWithoutCredentialForAuthenticationChallenge:
- // in which case we'll get the real failure response. A reading of SynchronousLoaderClient.mm suggests we already do this.
- response.setHTTPStatusCode(401);
- break;
- default:
- response.setHTTPStatusCode(error.errorCode());
- }
- else {
- // FIXME: This is wrong. We shouldn't need to ever make up a 404.
- response.setHTTPStatusCode(404);
- }
- }
</del><span class="cx">
</span><span class="cx"> data.swap(client->mutableData());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (169242 => 169243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-05-23 03:31:57 UTC (rev 169242)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2014-05-23 03:59:11 UTC (rev 169243)
</span><span class="lines">@@ -128,7 +128,10 @@
</span><span class="cx"> bool requestAllowed = globalCachedResourceLoader->frame() && globalCachedResourceLoader->document()->securityOrigin()->canRequest(url);
</span><span class="cx"> if (requestAllowed) {
</span><span class="cx"> globalCachedResourceLoader->frame()->loader().loadResourceSynchronously(url, AllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, error, response, data);
</span><del>- requestAllowed = globalCachedResourceLoader->document()->securityOrigin()->canRequest(response.url());
</del><ins>+ if (error.isNull())
+ requestAllowed = globalCachedResourceLoader->document()->securityOrigin()->canRequest(response.url());
+ else
+ data.clear();
</ins><span class="cx"> }
</span><span class="cx"> if (!requestAllowed) {
</span><span class="cx"> data.clear();
</span></span></pre>
</div>
</div>
</body>
</html>