2011-04-27 Robert Hogan <robert@webkit.org>

        Reviewed by Adam Barth.

        Allow shadowing of history object
        https://bugs.webkit.org/show_bug.cgi?id=55965

        * fast/dom/Window/get-set-properties-expected.txt:
        * fast/dom/Window/get-set-properties.html:
        * fast/dom/Window/window-property-shadowing-expected.txt:
        * fast/dom/Window/window-property-shadowing.html:
        * fast/js/var-declarations-shadowing-expected.txt:
        * fast/js/var-declarations-shadowing.html:
        * http/tests/history/cross-origin-replace-history-object-child-expected.txt: Added.
        * http/tests/history/cross-origin-replace-history-object-child.html: Added.
        * http/tests/history/cross-origin-replace-history-object-expected.txt: Added.
        * http/tests/history/cross-origin-replace-history-object.html: Added.
        * http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html: Added.
        * http/tests/history/resources/cross-origin-replaces-history-object-iframe.html: Added.
        * http/tests/security/cross-frame-access-put-expected.txt: Note that a window property with
          the DoNotCheckDomainSecurityOnGet attribute generates two cross-origin JS warnings. Amended
          expected results to include the additional extra warning for the history object.
2011-04-27  Robert Hogan  <robert@webkit.org>

        Reviewed by Adam Barth.

        Allow shadowing of history object
        https://bugs.webkit.org/show_bug.cgi?id=55965

        Tests: http/tests/history/cross-origin-replace-history-object-child.html
               http/tests/history/cross-origin-replace-history-object.html

        * page/DOMWindow.idl:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85142 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 64169cc1bd55889ca62bca107bdad2e86ae0365d..a46bd506674be4bbcdc222f83aaea61ecee17705 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2011-04-27  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Allow shadowing of history object
+        https://bugs.webkit.org/show_bug.cgi?id=55965
+
+        * fast/dom/Window/get-set-properties-expected.txt:
+        * fast/dom/Window/get-set-properties.html:
+        * fast/dom/Window/window-property-shadowing-expected.txt:
+        * fast/dom/Window/window-property-shadowing.html:
+        * fast/js/var-declarations-shadowing-expected.txt:
+        * fast/js/var-declarations-shadowing.html:
+        * http/tests/history/cross-origin-replace-history-object-child-expected.txt: Added.
+        * http/tests/history/cross-origin-replace-history-object-child.html: Added.
+        * http/tests/history/cross-origin-replace-history-object-expected.txt: Added.
+        * http/tests/history/cross-origin-replace-history-object.html: Added.
+        * http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html: Added.
+        * http/tests/history/resources/cross-origin-replaces-history-object-iframe.html: Added.
+        * http/tests/security/cross-frame-access-put-expected.txt: Note that a window property with
+          the DoNotCheckDomainSecurityOnGet attribute generates two cross-origin JS warnings. Amended
+          expected results to include the additional extra warning for the history object.
+
 2011-04-27  Dirk Pranke  <dpranke@chromium.org>
 
         Unreviewed, expectations change. Fix some

diff --git a/LayoutTests/fast/dom/Window/get-set-properties-expected.txt b/LayoutTests/fast/dom/Window/get-set-properties-expected.txt
index 78a21a66a2387b20192c7340aaec4d06af43b5e6..6d5f0afff4fc03fd97fd3ebd90bc032acf1deac6 100644 (file)
--- a/LayoutTests/fast/dom/Window/get-set-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/get-set-properties-expected.txt
@@ -217,6 +217,8 @@ PASS: canGet('event') should be 'true' and is.
 PASS: canSet('event') should be 'true' and is.
 PASS: canGet('frames') should be 'true' and is.
 PASS: canSet('frames') should be 'true' and is.
+PASS: canGet('history') should be 'true' and is.
+PASS: canSet('history') should be 'true' and is.
 PASS: canGet('innerHeight') should be 'true' and is.
 PASS: canSet('innerHeight') should be 'true' and is.
 PASS: canGet('innerWidth') should be 'true' and is.
@@ -270,8 +272,6 @@ PASS: canGet('closed') should be 'true' and is.
 PASS: canSet('closed') should be 'false' and is.
 PASS: canGet('document') should be 'true' and is.
 PASS: canSet('document') should be 'false' and is.
-PASS: canGet('history') should be 'true' and is.
-PASS: canSet('history') should be 'false' and is.
 PASS: canGet('pageXOffset') should be 'true' and is.
 PASS: canSet('pageXOffset') should be 'false' and is.
 PASS: canGet('pageYOffset') should be 'true' and is.

diff --git a/LayoutTests/fast/dom/Window/get-set-properties.html b/LayoutTests/fast/dom/Window/get-set-properties.html
index abb511c81416c828f7f6446a7eb6d5620fbbdab0..4dd24ad4ab6ba92c043c025291997cc9eaccf719 100644 (file)
--- a/LayoutTests/fast/dom/Window/get-set-properties.html
+++ b/LayoutTests/fast/dom/Window/get-set-properties.html
@@ -176,6 +176,7 @@ var windowReadWriteProperties = [
     "devicePixelRatio", 
     "event", 
     "frames",
+    "history",
     "innerHeight", 
     "innerWidth", 
     "length",
@@ -204,7 +205,6 @@ var windowReadWriteProperties = [
 var windowReadOnlyProperties = [
     "closed",
     "document",
-    "history",
     "pageXOffset",
     "pageYOffset",
     "window"

diff --git a/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt b/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
index db96d866762e586982e1f009bfa2d27a39b343b8..f539cb3fa68665cf81200d0f9f7fd008c58100f3 100644 (file)
--- a/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
@@ -29,6 +29,7 @@ PASS: scrollX successfully shadowed
 PASS: scrollY successfully shadowed
 PASS: self successfully shadowed
 PASS: top successfully shadowed
+PASS: history successfully shadowed
 PASS: getSelection successfully shadowed
 PASS: getComputedStyle successfully shadowed
 PASS: getMatchedCSSRules successfully shadowed

diff --git a/LayoutTests/fast/dom/Window/window-property-shadowing.html b/LayoutTests/fast/dom/Window/window-property-shadowing.html
index f034d297d0f569aaafb25485cecc6a618c2132a0..5691e8d4cb8bf5a2523c7fd2deed1ff919c3f3a5 100644 (file)
--- a/LayoutTests/fast/dom/Window/window-property-shadowing.html
+++ b/LayoutTests/fast/dom/Window/window-property-shadowing.html
@@ -77,6 +77,8 @@
         log(self == 1 ? "PASS: self successfully shadowed" : "FAIL: self was not shadowed");
         var top = 1;
         log(top == 1 ? "PASS: top successfully shadowed" : "FAIL: top was not shadowed");
+        var history = 1;
+        log(history == 1 ? "PASS: history successfully shadowed" : "FAIL: history was not shadowed");
 
         // Window functions
         var getSelection = 1;

diff --git a/LayoutTests/fast/js/var-declarations-shadowing-expected.txt b/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
index 999fd23a92ab462b729b6dc0a202dcb9e8c17143..c365596067000e29640e0b58176aa2aa593bf914 100644 (file)
--- a/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
+++ b/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
@@ -82,9 +82,9 @@ PASS: defaultstatus == marker should be true and is.
 PASS: eval('defaultstatus == marker') should be true and is.
 PASS: screen == marker should be true and is.
 PASS: eval('screen == marker') should be true and is.
+PASS: history == marker should be true and is.
+PASS: eval('history == marker') should be true and is.
 -----
-PASS: history == marker should be false and is.
-PASS: eval('history == marker') should be false and is.
 PASS: frameElement == marker should be false and is.
 PASS: eval('frameElement == marker') should be false and is.
 PASS: pageXOffset == marker should be false and is.

diff --git a/LayoutTests/fast/js/var-declarations-shadowing.html b/LayoutTests/fast/js/var-declarations-shadowing.html
index 6282bec93e92eec42432729ba06d4d1049bd05ea..b83981ca81606bd3e67e7de96883b6ac9f3421a8 100644 (file)
--- a/LayoutTests/fast/js/var-declarations-shadowing.html
+++ b/LayoutTests/fast/js/var-declarations-shadowing.html
@@ -259,13 +259,13 @@ try {
 shouldBe(screen == marker, "screen == marker", true);
 shouldBe(eval('screen == marker'), "eval('screen == marker')", true);
 
-log("-----");
-
 try {
     eval("var history = marker");
 } catch(e) { }
-shouldBe(history == marker, "history == marker", false);
-shouldBe(eval('history == marker'), "eval('history == marker')", false);
+shouldBe(history == marker, "history == marker", true);
+shouldBe(eval('history == marker'), "eval('history == marker')", true);
+
+log("-----");
 
 try {
     eval("var frameElement = marker");

diff --git a/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt b/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt
new file mode 100644 (file)
index 0000000..b7892af
--- /dev/null
+++ b/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt
@@ -0,0 +1,9 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/history/resources/cross-origin-replaces-history-object-child-iframe.html from frame with URL http://127.0.0.1:8000/history/cross-origin-replace-history-object-child.html. Domains, protocols and ports must match.
+
+ALERT: Child window's history object before attempt to clear: [object History]
+ALERT: About to shadow child window's history object: [object History]
+ALERT: Shadowed child window's history object: 
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/history/resources/cross-origin-replaces-history-object-child-iframe.html from frame with URL http://127.0.0.1:8000/history/cross-origin-replace-history-object-child.html. Domains, protocols and ports must match.
+
+ALERT: Child window's history object after attempt to clear: [object History]
+

diff --git a/LayoutTests/http/tests/history/cross-origin-replace-history-object-child.html b/LayoutTests/http/tests/history/cross-origin-replace-history-object-child.html
new file mode 100644 (file)
index 0000000..ff4ebe6
--- /dev/null
+++ b/LayoutTests/http/tests/history/cross-origin-replace-history-object-child.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+<script>
+
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+window.onmessage = function(evt)
+{
+    if (evt.data != "done") {
+        alert("Unexpected message: " + evt.data);
+        layoutTestController.notifyDone();
+        return;
+    }
+
+    alert("Child window's history object after attempt to clear: " + window.frames[0].history);
+    layoutTestController.notifyDone();
+}
+
+function setHistoryLength()
+{
+    alert("Child window's history object before attempt to clear: " + window.frames[0].history);
+    window.frames[0].postMessage("setHistoryLength", "*");
+}
+
+</script>
+</head>
+<body onload="setHistoryLength();">
+<iframe id='testFrame' src="http://localhost:8000/history/resources/cross-origin-replaces-history-object-child-iframe.html"></iframe>
+</body>
+</html>

diff --git a/LayoutTests/http/tests/history/cross-origin-replace-history-object-expected.txt b/LayoutTests/http/tests/history/cross-origin-replace-history-object-expected.txt
new file mode 100644 (file)
index 0000000..08a9554
--- /dev/null
+++ b/LayoutTests/http/tests/history/cross-origin-replace-history-object-expected.txt
@@ -0,0 +1,6 @@
+ALERT: Parent window's history object before attempt to clear: [object History]
+ALERT: Attempting to clear parent window's history object:
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/history/cross-origin-replace-history-object.html from frame with URL http://localhost:8000/history/resources/cross-origin-replaces-history-object-iframe.html. Domains, protocols and ports must match.
+
+ALERT: Parent window's history object after attempt to clear: [object History]
+

diff --git a/LayoutTests/http/tests/history/cross-origin-replace-history-object.html b/LayoutTests/http/tests/history/cross-origin-replace-history-object.html
new file mode 100644 (file)
index 0000000..259e0b2
--- /dev/null
+++ b/LayoutTests/http/tests/history/cross-origin-replace-history-object.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+<script>
+
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+window.onmessage = function(evt)
+{
+    if (evt.data != "done") {
+        alert("Unexpected message: " + evt.data);
+        layoutTestController.notifyDone();
+        return;
+    }
+
+    alert("Parent window's history object after attempt to clear: " + window.history);
+    layoutTestController.notifyDone();
+}
+
+function setHistoryLength()
+{
+    alert("Parent window's history object before attempt to clear: " + window.history);
+    window.frames[0].postMessage("setHistoryLength", "*");
+}
+
+</script>
+</head>
+<body onload="setHistoryLength();">
+<iframe id='testFrame' src="http://localhost:8000/history/resources/cross-origin-replaces-history-object-iframe.html"></iframe>
+</body>
+</html>

diff --git a/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html b/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html
new file mode 100644 (file)
index 0000000..7bed7c0
--- /dev/null
+++ b/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html
@@ -0,0 +1,27 @@
+<html>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+window.onmessage = function(evt)
+{
+    if (evt.data == "setHistoryLength") {
+        setHistoryLength();
+        return;
+    } else
+        alert("Unknown message.");
+}
+
+function setHistoryLength()
+{
+    alert("About to shadow child window's history object: " + window.history);
+    window.history = "";
+    alert("Shadowed child window's history object: " + window.history);
+    parent.window.postMessage("done", "*");
+}
+
+</script>
+<body>
+HELLO THERE
+</body>
+</html>

diff --git a/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-iframe.html b/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-iframe.html
new file mode 100644 (file)
index 0000000..5c392bc
--- /dev/null
+++ b/LayoutTests/http/tests/history/resources/cross-origin-replaces-history-object-iframe.html
@@ -0,0 +1,26 @@
+<html>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+window.onmessage = function(evt)
+{
+    if (evt.data == "setHistoryLength") {
+        setHistoryLength();
+        return;
+    } else
+        alert("Unknown message.");
+}
+
+function setHistoryLength()
+{
+    alert("Attempting to clear parent window's history object:");
+    parent.window.history = "";
+    parent.window.postMessage("done", "*");
+}
+
+</script>
+<body>
+HELLO THERE
+</body>
+</html>

diff --git a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
index 8e26f645275d824601361d043f47d8e9dfd31ffb..184133c6e7d0f4bba5cd9556652e2bfa4ca4f053 100644 (file)
--- a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
+++ b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
@@ -374,6 +374,8 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
 
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match.
+
 ALERT: PASS: window.Attr should be '[object AttrConstructor]' and is.
 ALERT: PASS: window.CDATASection should be '[object CDATASectionConstructor]' and is.
 ALERT: PASS: window.CharacterData should be '[object CharacterDataConstructor]' and is.

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index aa7530fae881fa6dcd963f4dfe9c297c9ea33aab..88e573dd8f0e0954c38fb2ba8ab744402189bd7c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-27  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Allow shadowing of history object
+        https://bugs.webkit.org/show_bug.cgi?id=55965
+
+        Tests: http/tests/history/cross-origin-replace-history-object-child.html
+               http/tests/history/cross-origin-replace-history-object.html
+
+        * page/DOMWindow.idl:
+
 2011-04-27  James Robinson  <jamesr@chromium.org>
 
         Reviewed by Kenneth Russell.

diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
index fccf73185649c3e24071673254d052ea77f2bc30..87f9b2bcc84840d44b2d3f42f7e83e884fc19590 100644 (file)
--- a/Source/WebCore/page/DOMWindow.idl
+++ b/Source/WebCore/page/DOMWindow.idl
@@ -45,7 +45,7 @@ module window {
     ] DOMWindow {
         // DOM Level 0
         attribute [Replaceable] Screen screen;
-        readonly attribute [DoNotCheckDomainSecurity, JSCCustomGetter] History history;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet, JSCCustomGetter] History history;
         attribute [Replaceable] BarInfo locationbar;
         attribute [Replaceable] BarInfo menubar;
         attribute [Replaceable] BarInfo personalbar;