<!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>[183280] 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/183280">183280</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 14:09:02 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Origin header is preserved on cross-origin redirects.
https://bugs.webkit.org/show_bug.cgi?id=144157.
Reviewed by Sam Weinig.
Source/WebCore:
Tests: http/tests/security/cors-post-redirect-301.html
http/tests/security/cors-post-redirect-302.html
http/tests/security/cors-post-redirect-307.html
http/tests/security/cors-post-redirect-308.html
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::willSendRequest): Always clear any origin header for cross-origin redirects.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::willSendRequest): Ditto.
LayoutTests:
* http/tests/security/cors-post-redirect-301-expected.txt: Added.
* http/tests/security/cors-post-redirect-301.html: Added.
* http/tests/security/cors-post-redirect-302-expected.txt: Added.
* http/tests/security/cors-post-redirect-302.html: Added.
* http/tests/security/cors-post-redirect-307-expected.txt: Added.
* http/tests/security/cors-post-redirect-307.html: Added.
* http/tests/security/cors-post-redirect-308-expected.txt: Added.
* http/tests/security/cors-post-redirect-308.html: Added.
* http/tests/security/resources/cors-post-redirect-target.php: 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="#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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect301expectedtxt">trunk/LayoutTests/http/tests/security/cors-post-redirect-301-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect301html">trunk/LayoutTests/http/tests/security/cors-post-redirect-301.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect302expectedtxt">trunk/LayoutTests/http/tests/security/cors-post-redirect-302-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect302html">trunk/LayoutTests/http/tests/security/cors-post-redirect-302.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect307expectedtxt">trunk/LayoutTests/http/tests/security/cors-post-redirect-307-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect307html">trunk/LayoutTests/http/tests/security/cors-post-redirect-307.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect308expectedtxt">trunk/LayoutTests/http/tests/security/cors-post-redirect-308-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycorspostredirect308html">trunk/LayoutTests/http/tests/security/cors-post-redirect-308.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityresourcescorspostredirecttargetphp">trunk/LayoutTests/http/tests/security/resources/cors-post-redirect-target.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183279 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-24 20:55:22 UTC (rev 183279)
+++ trunk/LayoutTests/ChangeLog 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-24 Brady Eidson <beidson@apple.com>
+
+ Origin header is preserved on cross-origin redirects.
+ https://bugs.webkit.org/show_bug.cgi?id=144157.
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/security/cors-post-redirect-301-expected.txt: Added.
+ * http/tests/security/cors-post-redirect-301.html: Added.
+ * http/tests/security/cors-post-redirect-302-expected.txt: Added.
+ * http/tests/security/cors-post-redirect-302.html: Added.
+ * http/tests/security/cors-post-redirect-307-expected.txt: Added.
+ * http/tests/security/cors-post-redirect-307.html: Added.
+ * http/tests/security/cors-post-redirect-308-expected.txt: Added.
+ * http/tests/security/cors-post-redirect-308.html: Added.
+ * http/tests/security/resources/cors-post-redirect-target.php: Added.
+
</ins><span class="cx"> 2015-04-24 Matthew Mirman <mmirman@apple.com>
</span><span class="cx">
</span><span class="cx"> Added tests to ensure that Object.prototype.__proto__ native getter and setter do not coerce undefined to this
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect301expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-301-expected.txt (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-301-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-301-expected.txt 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+There was no origin header
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect301html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-301.html (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-301.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-301.html 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<head>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+</script>
+</head>
+<body>
+
+This test is designed to work only when loaded from http://127.0.0.1:8000
+
+<form id='testForm' method='POST'>
+<input id='redircode' type='hidden' name='redircode' value='301'>
+</form>
+
+<script>
+
+var form = document.getElementById('testForm');
+form.action = "/resources/redirect.php?code=301&url=http://localhost:8000/security/resources/cors-post-redirect-target.php";
+form.submit();
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect302expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-302-expected.txt (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-302-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-302-expected.txt 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+There was no origin header
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect302html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-302.html (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-302.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-302.html 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<head>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+</script>
+</head>
+<body>
+
+This test is designed to work only when loaded from http://127.0.0.1:8000
+
+<form id='testForm' method='POST'>
+<input id='redircode' type='hidden' name='redircode' value='302'>
+</form>
+
+<script>
+
+var form = document.getElementById('testForm');
+form.action = "/resources/redirect.php?code=302&url=http://localhost:8000/security/resources/cors-post-redirect-target.php";
+form.submit();
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect307expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-307-expected.txt (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-307-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-307-expected.txt 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+There was no origin header
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect307html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-307.html (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-307.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-307.html 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<head>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+</script>
+</head>
+<body>
+
+This test is designed to work only when loaded from http://127.0.0.1:8000
+
+<form id='testForm' method='POST'>
+<input id='redircode' type='hidden' name='redircode' value='307'>
+</form>
+
+<script>
+
+var form = document.getElementById('testForm');
+form.action = "/resources/redirect.php?code=307&url=http://localhost:8000/security/resources/cors-post-redirect-target.php";
+form.submit();
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect308expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-308-expected.txt (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-308-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-308-expected.txt 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+There was no origin header
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycorspostredirect308html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cors-post-redirect-308.html (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cors-post-redirect-308.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cors-post-redirect-308.html 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<head>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+</script>
+</head>
+<body>
+
+This test is designed to work only when loaded from http://127.0.0.1:8000
+
+<form id='testForm' method='POST'>
+<input id='redircode' type='hidden' name='redircode' value='308'>
+</form>
+
+<script>
+
+var form = document.getElementById('testForm');
+form.action = "/resources/redirect.php?code=308&url=http://localhost:8000/security/resources/cors-post-redirect-target.php";
+form.submit();
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityresourcescorspostredirecttargetphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/resources/cors-post-redirect-target.php (0 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/resources/cors-post-redirect-target.php (rev 0)
+++ trunk/LayoutTests/http/tests/security/resources/cors-post-redirect-target.php 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<?php
+$sawOrigin = false;
+foreach (getallheaders() as $name => $value) {
+ if (strtolower($name) == "origin") {
+ echo "Origin header value: $value";
+ $sawOrigin = true;
+ }
+}
+
+if (!$sawOrigin)
+ echo "There was no origin header";
+
+?>
+<script>
+if (window.testRunner)
+ testRunner.notifyDone();
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183279 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-24 20:55:22 UTC (rev 183279)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-24 Brady Eidson <beidson@apple.com>
+
+ Origin header is preserved on cross-origin redirects.
+ https://bugs.webkit.org/show_bug.cgi?id=144157.
+
+ Reviewed by Sam Weinig.
+
+ Tests: http/tests/security/cors-post-redirect-301.html
+ http/tests/security/cors-post-redirect-302.html
+ http/tests/security/cors-post-redirect-307.html
+ http/tests/security/cors-post-redirect-308.html
+
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::willSendRequest): Always clear any origin header for cross-origin redirects.
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::willSendRequest): Ditto.
+
</ins><span class="cx"> 2015-04-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Immediate action not functional for embedded PDFs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (183279 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-04-24 20:55:22 UTC (rev 183279)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -276,9 +276,10 @@
</span><span class="cx"> request.removeCredentials();
</span><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(request.url(), redirectResponse.url())) {
</span><del>- // If the network layer carries over authentication headers from the original request
- // in a cross-origin redirect, we want to clear those headers here.
</del><ins>+ // The network layer might carry over some headers from the original request that
+ // we want to strip here because the redirect is cross-origin.
</ins><span class="cx"> request.clearHTTPAuthorization();
</span><ins>+ request.clearHTTPOrigin();
</ins><span class="cx"> } else {
</span><span class="cx"> // Only consider applying authentication credentials if this is actually a redirect and the redirect
</span><span class="cx"> // URL didn't include credentials of its own.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (183279 => 183280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-04-24 20:55:22 UTC (rev 183279)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-04-24 21:09:02 UTC (rev 183280)
</span><span class="lines">@@ -462,10 +462,10 @@
</span><span class="cx"> request.removeCredentials();
</span><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(request.url(), redirectResponse.url())) {
</span><del>- // If the network layer carries over authentication headers from the original request
- // in a cross-origin redirect, we want to clear those headers here.
- // As of Lion, CFNetwork no longer does this.
</del><ins>+ // The network layer might carry over some headers from the original request that
+ // we want to strip here because the redirect is cross-origin.
</ins><span class="cx"> request.clearHTTPAuthorization();
</span><ins>+ request.clearHTTPOrigin();
</ins><span class="cx"> } else {
</span><span class="cx"> // Only consider applying authentication credentials if this is actually a redirect and the redirect
</span><span class="cx"> // URL didn't include credentials of its own.
</span></span></pre>
</div>
</div>
</body>
</html>