From de836e4463f923198f4229eabb92079a98e2515b Mon Sep 17 00:00:00 2001 From: "ap@apple.com" Date: Sat, 12 Dec 2015 00:45:03 +0000 Subject: [PATCH] Roll out http://trac.webkit.org/r193984, because the new test is timing out. Was: 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 Source/WebCore: * dom/Document.cpp: (WebCore::Document::processReferrerPolicy): (WebCore::Document::applyContentDispositionAttachmentSandbox): LayoutTests: * http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php: Removed. * http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php: Removed. * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt: Removed. * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html: Removed. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@193995 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 13 +++++++++ .../resources/echo-http-referer.php | 8 ------ ...ce-request-not-include-referer-header-frame.php | 14 ---------- ...request-not-include-referer-header-expected.txt | 8 ------ ...esource-request-not-include-referer-header.html | 31 ---------------------- Source/WebCore/ChangeLog | 12 +++++++++ Source/WebCore/dom/Document.cpp | 6 ----- 7 files changed, 25 insertions(+), 67 deletions(-) delete mode 100644 LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php delete mode 100644 LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php delete mode 100644 LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt delete mode 100644 LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 6cc04c5..6694747 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,16 @@ +2015-12-11 Alexey Proskuryakov + + Roll out http://trac.webkit.org/r193984, because the new test is timing out. + + Was: 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 + + + * http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php: Removed. + * http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php: Removed. + * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt: Removed. + * http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html: Removed. + 2015-12-11 Brady Eidson Modern IDB: storage/indexeddb/optional-arguments.html fails. diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php b/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php deleted file mode 100644 index 21e327d..0000000 --- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php b/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php deleted file mode 100644 index b6052a4..0000000 --- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php +++ /dev/null @@ -1,14 +0,0 @@ - - - -Link to second-wo-referer.php \ No newline at end of file diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt deleted file mode 100644 index 2638d01..0000000 --- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -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' --------- - diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html b/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html deleted file mode 100644 index e28cdc2..0000000 --- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html +++ /dev/null @@ -1,31 +0,0 @@ - - -

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.

- diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index d5fd9be..897e90f 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2015-12-11 Alexey Proskuryakov + + Roll out http://trac.webkit.org/r193984, because the new test is timing out. + + Was: 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 + + + * dom/Document.cpp: + (WebCore::Document::processReferrerPolicy): + (WebCore::Document::applyContentDispositionAttachmentSandbox): + 2015-12-11 Brady Eidson Modern IDB: storage/indexeddb/optional-arguments.html fails. diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index e06dbc8..b824efb 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -3339,11 +3339,6 @@ void Document::processReferrerPolicy(const String& policy) { 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")) @@ -6876,7 +6871,6 @@ void Document::applyContentDispositionAttachmentSandbox() { ASSERT(shouldEnforceContentDispositionAttachmentSandbox()); - setReferrerPolicy(ReferrerPolicyNever); if (!isMediaDocument()) enforceSandboxFlags(SandboxAll); else -- 1.8.3.1