Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (194064 => 194065)
--- 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)
@@ -1,3 +1,20 @@
+2015-12-14 Matthew Hanson <[email protected]>
+
+ Merge r194001. rdar://problem/23581577
+
+ 2015-12-11 Jiewen Tan <[email protected]>
+
+ 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.
+
2015-12-11 Matthew Hanson <[email protected]>
Merge r193888. rdar://problem/23732405
Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php (0 => 194065)
--- 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)
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script>
+if (window.parent.testRunner)
+ testRunner.notifyDone();
+</script>
+<?php
+echo $_SERVER['HTTP_REFERER'];
+?>
\ No newline at end of file
Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php (0 => 194065)
--- 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)
@@ -0,0 +1,14 @@
+<?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="" to echo-http-referer.php</a>
\ No newline at end of file
Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt (0 => 194065)
--- 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)
@@ -0,0 +1,8 @@
+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'
+--------
+
Added: branches/safari-601-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html (0 => 194065)
--- 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)
@@ -0,0 +1,31 @@
+<!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="" _onload_="navigation()"></iframe>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194064 => 194065)
--- 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)
@@ -1,5 +1,26 @@
2015-12-14 Matthew Hanson <[email protected]>
+ Merge r194001. rdar://problem/23581577
+
+ 2015-12-11 Jiewen Tan <[email protected]>
+
+ 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 <[email protected]>
+
Merge r189942. rdar://problem/23886455
2015-09-17 Tim Horton <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/dom/Document.cpp (194064 => 194065)
--- 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)
@@ -3269,6 +3269,11 @@
{
ASSERT(!policy.isNull());
+ // 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;
+
// Note that we're supporting both the standard and legacy keywords for referrer
// policies, as defined by http://www.w3.org/TR/referrer-policy/#referrer-policy-delivery-meta
if (equalIgnoringCase(policy, "no-referrer") || equalIgnoringCase(policy, "never"))
@@ -4948,8 +4953,10 @@
setCookieURL(m_url);
enforceSandboxFlags(m_frame->loader().effectiveSandboxFlags());
- if (shouldEnforceContentDispositionAttachmentSandbox())
- enforceSandboxFlags(SandboxAll);
+ if (shouldEnforceContentDispositionAttachmentSandbox()) {
+ setReferrerPolicy(ReferrerPolicyNever);
+ enforceSandboxFlags(SandboxAll);
+ }
setSecurityOriginPolicy(SecurityOriginPolicy::create(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique() : SecurityOrigin::create(m_url)));
setContentSecurityPolicy(std::make_unique<ContentSecurityPolicy>(this));
