<!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>[205134] 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/205134">205134</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-29 12:07:59 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Image Loader should use FetchOptions::mode according its crossOrigin attribute
https://bugs.webkit.org/show_bug.cgi?id=161309
Patch by Youenn Fablet <youenn@apple.com> on 2016-08-29
Reviewed by Darin Adler.
Source/WebCore:
Test: http/tests/security/load-image-after-redirection.html
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement): Using CachedResourceRequest::setAsPotentiallyCrossOrigin to set fetch mode.
LayoutTests:
* http/tests/security/load-image-after-redirection-expected.txt: Added.
* http/tests/security/load-image-after-redirection.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="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityloadimageafterredirectionexpectedtxt">trunk/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityloadimageafterredirectionhtml">trunk/LayoutTests/http/tests/security/load-image-after-redirection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205133 => 205134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-29 19:07:22 UTC (rev 205133)
+++ trunk/LayoutTests/ChangeLog 2016-08-29 19:07:59 UTC (rev 205134)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-29 Youenn Fablet <youenn@apple.com>
+
+ Image Loader should use FetchOptions::mode according its crossOrigin attribute
+ https://bugs.webkit.org/show_bug.cgi?id=161309
+
+ Reviewed by Darin Adler.
+
+ * http/tests/security/load-image-after-redirection-expected.txt: Added.
+ * http/tests/security/load-image-after-redirection.html: Added.
+
</ins><span class="cx"> 2016-08-29 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, update iOS simulator WK1 flaky tests.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityloadimageafterredirectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt (0 => 205134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt 2016-08-29 19:07:59 UTC (rev 205134)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/security/resources/abe-allow-star.php denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+
+
+PASS Loading an image in no-cors mode after a CORS invalid redirection is ok
+PASS Loading an image in cors mode after a CORS invalid redirection is stopped
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityloadimageafterredirectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/load-image-after-redirection.html (0 => 205134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/load-image-after-redirection.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/load-image-after-redirection.html 2016-08-29 19:07:59 UTC (rev 205134)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Testing redirection with images fetched with cors mode</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<img id="image1" style="visibility:hidden"></img>
+<img id="image2"crossorigin="anonymous" style="visibility:hidden"></img>
+<script type="text/javascript">
+var imageURLAfterCORSInvalidRedirection = "http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/security/resources/abe-allow-star.php";
+promise_test((test) => {
+ return new Promise((resolve, reject) => {
+ var image = document.getElementById("image1");
+ image.onload = resolve;
+ image.onerror = () => { reject("image loading failed unexpectedly"); };
+ image.src = imageURLAfterCORSInvalidRedirection;
+ });
+}, "Loading an image in no-cors mode after a CORS invalid redirection is ok");
+
+promise_test((test) => {
+ return new Promise((resolve, reject) => {
+ var image = document.getElementById("image2");
+ image.onerror = resolve;
+ image.onload = () => { reject("image loading succeeded unexpectedly"); };
+ image.src = imageURLAfterCORSInvalidRedirection;
+ });
+}, "Loading an image in cors mode after a CORS invalid redirection is stopped");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205133 => 205134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-29 19:07:22 UTC (rev 205133)
+++ trunk/Source/WebCore/ChangeLog 2016-08-29 19:07:59 UTC (rev 205134)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-29 Youenn Fablet <youenn@apple.com>
+
+ Image Loader should use FetchOptions::mode according its crossOrigin attribute
+ https://bugs.webkit.org/show_bug.cgi?id=161309
+
+ Reviewed by Darin Adler.
+
+ Test: http/tests/security/load-image-after-redirection.html
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement): Using CachedResourceRequest::setAsPotentiallyCrossOrigin to set fetch mode.
+
</ins><span class="cx"> 2016-08-29 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use MathMLPresentationElement for all MathML presentation tags
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (205133 => 205134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2016-08-29 19:07:22 UTC (rev 205133)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2016-08-29 19:07:59 UTC (rev 205134)
</span><span class="lines">@@ -179,12 +179,7 @@
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document.completeURL(sourceURI(attr))), options);
</span><span class="cx"> request.setInitiator(&element());
</span><span class="cx">
</span><del>- String crossOriginMode = element().attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
- if (!crossOriginMode.isNull()) {
- StoredCredentials allowCredentials = equalLettersIgnoringASCIICase(crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
- ASSERT(document.securityOrigin());
- updateRequestForAccessControl(request.mutableResourceRequest(), *document.securityOrigin(), allowCredentials);
- }
</del><ins>+ request.setAsPotentiallyCrossOrigin(element().attributeWithoutSynchronization(HTMLNames::crossoriginAttr), document);
</ins><span class="cx">
</span><span class="cx"> if (m_loadManually) {
</span><span class="cx"> bool autoLoadOtherImages = document.cachedResourceLoader().autoLoadImages();
</span></span></pre>
</div>
</div>
</body>
</html>