<!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>[194065] branches/safari-601-branch</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/194065">194065</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 15:07:24 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194001">r194001</a>. rdar://problem/23581577</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomDocumentcpp">branches/safari-601-branch/Source/WebCore/dom/Document.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxresourcesechohttprefererphp">branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxresourcessubresourcerequestnotincluderefererheaderframephp">branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderhtml">branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (194064 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-14 23:07:19 UTC (rev 194064)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-14 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r194001. rdar://problem/23581577
+
+ 2015-12-11 Jiewen Tan <jiewen_tan@apple.com>
+
+ Strip out Referer header when requesting subresources or following links for documents with "Content-Disposition: attachment"
+ https://bugs.webkit.org/show_bug.cgi?id=152102
+ <rdar://problem/22124230>
+
+ 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 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r193888. rdar://problem/23732405
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxresourcesechohttprefererphp"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php (0 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.parent.testRunner)
+ testRunner.notifyDone();
+</script>
+<?php
+echo $_SERVER['HTTP_REFERER'];
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxresourcessubresourcerequestnotincluderefererheaderframephp"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php (0 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<?php
+header("Content-Disposition: attachment; filename=test.html");
+header("Content-Type: text/html");
+?>
+<!DOCTYPE html>
+<style>
+a {
+ display: block;
+ width: 100vw;
+ height: 100vh;
+}
+
+</style>
+<a href="echo-http-referer.php">Link to echo-http-referer.php</a>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt (0 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt 2015-12-14 23:07:24 UTC (rev 194065)
</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="branchessafari601branchLayoutTestshttptestscontentdispositionattachmentsandboxsubresourcerequestnotincluderefererheaderhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html (0 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<script>
+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("(function() { uiController.singleTapAtPoint(" + x + ", " + y + "); })()");
+ }
+}
+</script>
+<p>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.</p>
+<iframe id='iframe' src="resources/subresource-request-not-include-referer-header-frame.php" onload="navigation()"></iframe>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194064 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-14 23:07:19 UTC (rev 194064)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-12-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194001. rdar://problem/23581577
+
+ 2015-12-11 Jiewen Tan <jiewen_tan@apple.com>
+
+ Strip out Referer header when requesting subresources or following links for documents with "Content-Disposition: attachment"
+ https://bugs.webkit.org/show_bug.cgi?id=152102
+ <rdar://problem/22124230>
+
+ Reviewed by Andy Estes.
+
+ Keep the ReferrerPolicy for a document as ReferrerPolicyNever if the document is loaded with
+ "Content-Disposition: attachment".
+
+ Test: http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::processReferrerPolicy):
+ (WebCore::Document::applyContentDispositionAttachmentSandbox):
+
+2015-12-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189942. rdar://problem/23886455
</span><span class="cx">
</span><span class="cx"> 2015-09-17 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Document.cpp (194064 => 194065)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Document.cpp 2015-12-14 23:07:19 UTC (rev 194064)
+++ branches/safari-601-branch/Source/WebCore/dom/Document.cpp 2015-12-14 23:07:24 UTC (rev 194065)
</span><span class="lines">@@ -3269,6 +3269,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, "no-referrer") || equalIgnoringCase(policy, "never"))
</span><span class="lines">@@ -4948,8 +4953,10 @@
</span><span class="cx"> setCookieURL(m_url);
</span><span class="cx"> enforceSandboxFlags(m_frame->loader().effectiveSandboxFlags());
</span><span class="cx">
</span><del>- if (shouldEnforceContentDispositionAttachmentSandbox())
- enforceSandboxFlags(SandboxAll);
</del><ins>+ if (shouldEnforceContentDispositionAttachmentSandbox()) {
+ setReferrerPolicy(ReferrerPolicyNever);
+ enforceSandboxFlags(SandboxAll);
+ }
</ins><span class="cx">
</span><span class="cx"> setSecurityOriginPolicy(SecurityOriginPolicy::create(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique() : SecurityOrigin::create(m_url)));
</span><span class="cx"> setContentSecurityPolicy(std::make_unique<ContentSecurityPolicy>(this));
</span></span></pre>
</div>
</div>
</body>
</html>