Title: [91165] branches/chromium/782
- Revision
- 91165
- Author
- [email protected]
- Date
- 2011-07-16 22:40:03 -0700 (Sat, 16 Jul 2011)
Log Message
Merge 91152
BUG=89520
Review URL: http://codereview.chromium.org/7395022
Modified Paths
Added Paths
Diff
Copied: branches/chromium/782/LayoutTests/http/tests/security/resources/xss-DENIED-window-open-parent-attacker.html (from rev 91152, trunk/LayoutTests/http/tests/security/resources/xss-DENIED-window-open-parent-attacker.html) (0 => 91165)
--- branches/chromium/782/LayoutTests/http/tests/security/resources/xss-DENIED-window-open-parent-attacker.html (rev 0)
+++ branches/chromium/782/LayoutTests/http/tests/security/resources/xss-DENIED-window-open-parent-attacker.html 2011-07-17 05:40:03 UTC (rev 91165)
@@ -0,0 +1,4 @@
+<script>
+open("_javascript_:alert('failed')", "_top");
+parent.postMessage("", "*");
+</script>
Copied: branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent-expected.txt (from rev 91152, trunk/LayoutTests/http/tests/security/xss-DENIED-window-open-parent-expected.txt) (0 => 91165)
--- branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent-expected.txt (rev 0)
+++ branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent-expected.txt 2011-07-17 05:40:03 UTC (rev 91165)
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: line 1: Unsafe _javascript_ attempt to access frame with URL http://127.0.0.1:8000/security/xss-DENIED-window-open-parent.html from frame with URL http://localhost:8080/security/resources/xss-DENIED-window-open-parent-attacker.html. Domains, protocols and ports must match.
+
+This test passes if there is no alert dialog.
+
Copied: branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent.html (from rev 91152, trunk/LayoutTests/http/tests/security/xss-DENIED-window-open-parent.html) (0 => 91165)
--- branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent.html (rev 0)
+++ branches/chromium/782/LayoutTests/http/tests/security/xss-DENIED-window-open-parent.html 2011-07-17 05:40:03 UTC (rev 91165)
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+
+window._onmessage_ = function()
+{
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+</script>
+</head>
+<body>
+This test passes if there is no alert dialog.<br>
+<iframe src=""
+</body>
+</html>
Modified: branches/chromium/782/Source/WebCore/page/DOMWindow.cpp (91164 => 91165)
--- branches/chromium/782/Source/WebCore/page/DOMWindow.cpp 2011-07-17 05:04:36 UTC (rev 91164)
+++ branches/chromium/782/Source/WebCore/page/DOMWindow.cpp 2011-07-17 05:40:03 UTC (rev 91165)
@@ -1806,7 +1806,7 @@
if (!activeFrame->loader()->shouldAllowNavigation(targetFrame))
return 0;
- if (isInsecureScriptAccess(activeWindow, urlString))
+ if (targetFrame->domWindow()->isInsecureScriptAccess(activeWindow, urlString))
return targetFrame->domWindow();
if (urlString.isEmpty())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
