git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae64439)
Roll out http://trac.webkit.org/r193984, because the new test is timing out.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 12 Dec 2015 00:45:03 +0000 (00:45 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 12 Dec 2015 00:45:03 +0000 (00:45 +0000)
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
<rdar://problem/22124230>

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 patch | blob | history
LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php [deleted file] patch | blob | history
LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php [deleted file] patch | blob | history
LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header-expected.txt [deleted file] patch | blob | history
LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html [deleted file] patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/dom/Document.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6cc04c55b012f421f5e85c129f6667e0c7e9f5f8..6694747f259058d444a71df1cf31bbd04eefbeac 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2015-12-11  Alexey Proskuryakov  <ap@apple.com>
+
+        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
+        <rdar://problem/22124230>
+
+        * 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  <beidson@apple.com>
 
         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 (file)
index 21e327d..0000000
--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/echo-http-referer.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<script>
-if (window.parent.testRunner)
-    testRunner.notifyDone();
-</script>
-<?php
-echo $_SERVER['HTTP_REFERER'];
-?>
\ 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 (file)
index b6052a4..0000000
--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/subresource-request-not-include-referer-header-frame.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="second-wo-referer.php">Link to second-wo-referer.php</a>
\ 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 (file)
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 (file)
index e28cdc2..0000000
--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/subresource-request-not-include-referer-header.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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/first-w-content-diposition-attachment.php" onload="navigation()"></iframe>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d5fd9be9d421e40340a8187e4fff059ef6212372..897e90f537d4e211e3a457862da797ea3b94e52e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2015-12-11  Alexey Proskuryakov  <ap@apple.com>
+
+        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
+        <rdar://problem/22124230>
+
+        * dom/Document.cpp:
+        (WebCore::Document::processReferrerPolicy):
+        (WebCore::Document::applyContentDispositionAttachmentSandbox):
+
 2015-12-11  Brady Eidson  <beidson@apple.com>
 
         Modern IDB: storage/indexeddb/optional-arguments.html fails.
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index e06dbc8a20bb9a75e54a1aa55f8168090cbb1d4e..b824efbda8438079de37fe990da73904872862da 100644 (file)
--- 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
Mirror of the WebKit open source project from svn.webkit.org.