<!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>[194001] 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/194001">194001</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 18:26:45 -0800 (Fri, 11 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Strip out Referer header when requesting subresources or following links for documents with &quot;Content-Disposition: attachment&quot;
https://bugs.webkit.org/show_bug.cgi?id=152102
&lt;rdar://problem/22124230&gt;

Reviewed by Andy Estes.

Source/WebCore:

Keep the ReferrerPolicy for a document as ReferrerPolicyNever if the document is loaded with
&quot;Content-Disposition: attachment&quot;.

Test: http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html

* dom/Document.cpp:
(WebCore::Document::processReferrerPolicy):
(WebCore::Document::applyContentDispositionAttachmentSandbox):

LayoutTests:

* http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php: Added.
* http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php: Added.
* http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt: Added.
* http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesechohttprefererphp">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcessubresourcerequestnotincluderefererheaderframephp">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderexpectedtxt">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderhtml">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194000 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-12 01:52:43 UTC (rev 194000)
+++ trunk/LayoutTests/ChangeLog        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-11  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        Strip out Referer header when requesting subresources or following links for documents with &quot;Content-Disposition: attachment&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=152102
+        &lt;rdar://problem/22124230&gt;
+
+        Reviewed by Andy Estes.
+
+        * http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php: Added.
+        * http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php: Added.
+        * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt: Added.
+        * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html: Added.
+
</ins><span class="cx"> 2015-12-11  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [MediaStream] Add a setting to allow the mock media capture devices to be enabled and disabled
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesechohttprefererphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php (0 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php                                (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;script&gt;
+if (window.parent.testRunner)
+    testRunner.notifyDone();
+&lt;/script&gt;
+&lt;?php
+echo $_SERVER['HTTP_REFERER'];
+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcessubresourcerequestnotincluderefererheaderframephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php (0 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php                                (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+&lt;?php
+header(&quot;Content-Disposition: attachment; filename=test.html&quot;);
+header(&quot;Content-Type: text/html&quot;);
+?&gt;
+&lt;!DOCTYPE html&gt;
+&lt;style&gt;
+a {
+    display: block;
+    width: 100vw;
+    height: 100vh;
+}
+
+&lt;/style&gt;
+&lt;a href=&quot;echo-http-referer.php&quot;&gt;Link to echo-http-referer.php&lt;/a&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt (0 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+This test verifies that a subresource loaded by a document which is loaded with Content-Disposition:attachment will not have http referer. Tess passes if no referer is printed.
+
+
+
+--------
+Frame: 'iframe'
+--------
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html (0 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;script&gt;
+if (window.internals)
+    internals.settings.setContentDispositionAttachmentSandboxEnabled(true);
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.dumpChildFramesAsText();
+    testRunner.waitUntilDone();
+}
+
+function navigation() {
+    // Due to the sandbox, it's not possible to run script in the iframe or even access its contentDocument.
+    var element = document.getElementById('iframe');
+    var x = element.offsetLeft + 10;
+    var y = element.offsetTop + 10;
+
+    if (window.testRunner) {
+        if (window.eventSender) {
+            eventSender.mouseMoveTo(x, y);
+            eventSender.mouseDown();
+            eventSender.mouseUp();
+        }
+
+        if (testRunner.runUIScript)
+            testRunner.runUIScript(&quot;(function() { uiController.singleTapAtPoint(&quot; + x + &quot;, &quot; + y + &quot;); })()&quot;);
+    }
+}
+&lt;/script&gt;
+&lt;p&gt;This test verifies that a subresource loaded by a document which is loaded with Content-Disposition:attachment will not have http referer. Tess passes if no referer is printed.&lt;/p&gt;
+&lt;iframe id='iframe' src=&quot;resources/subresource-request-not-include-referer-header-frame.php&quot; onload=&quot;navigation()&quot;&gt;&lt;/iframe&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194000 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-12 01:52:43 UTC (rev 194000)
+++ trunk/Source/WebCore/ChangeLog        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-11  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        Strip out Referer header when requesting subresources or following links for documents with &quot;Content-Disposition: attachment&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=152102
+        &lt;rdar://problem/22124230&gt;
+
+        Reviewed by Andy Estes.
+
+        Keep the ReferrerPolicy for a document as ReferrerPolicyNever if the document is loaded with
+        &quot;Content-Disposition: attachment&quot;.
+
+        Test: http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::processReferrerPolicy):
+        (WebCore::Document::applyContentDispositionAttachmentSandbox):
+
</ins><span class="cx"> 2015-12-11  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [MediaStream] Add a setting to allow the mock media capture devices to be enabled and disabled
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (194000 => 194001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2015-12-12 01:52:43 UTC (rev 194000)
+++ trunk/Source/WebCore/dom/Document.cpp        2015-12-12 02:26:45 UTC (rev 194001)
</span><span class="lines">@@ -3339,6 +3339,11 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!policy.isNull());
</span><span class="cx"> 
</span><ins>+    // Documents in a Content-Disposition: attachment sandbox should never send a Referer header,
+    // even if the document has a meta tag saying otherwise.
+    if (shouldEnforceContentDispositionAttachmentSandbox())
+        return;
+
</ins><span class="cx">     // Note that we're supporting both the standard and legacy keywords for referrer
</span><span class="cx">     // policies, as defined by http://www.w3.org/TR/referrer-policy/#referrer-policy-delivery-meta
</span><span class="cx">     if (equalIgnoringCase(policy, &quot;no-referrer&quot;) || equalIgnoringCase(policy, &quot;never&quot;))
</span><span class="lines">@@ -6871,6 +6876,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(shouldEnforceContentDispositionAttachmentSandbox());
</span><span class="cx"> 
</span><ins>+    setReferrerPolicy(ReferrerPolicyNever);
</ins><span class="cx">     if (!isMediaDocument())
</span><span class="cx">         enforceSandboxFlags(SandboxAll);
</span><span class="cx">     else
</span></span></pre>
</div>
</div>

</body>
</html>