<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205596] releases/WebKitGTK/webkit-2.14</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205596">205596</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-08 00:44:49 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205200">r205200</a> - [[Delete]] should throw for cross-origin Window / Location objects
https://bugs.webkit.org/show_bug.cgi?id=161397
Reviewed by Ryosuke Niwa.
Source/WebCore:
[[Delete]] should throw for cross-origin Window / Location objects:
- https://github.com/whatwg/html/pull/1728
Firefox and Chrome already throw. Previously, WebKit was merely
ignoring the call and logging an error message.
No new tests, updated existing test.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::deleteProperty):
(WebCore::JSDOMWindow::deletePropertyByIndex):
* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::deleteProperty):
(WebCore::JSLocation::deletePropertyByIndex):
LayoutTests:
Update / rebaseline existing test to reflect behavior change.
* http/tests/security/cross-frame-access-delete-expected.txt:
* http/tests/security/cross-frame-access-delete.html:
* http/tests/security/resources/cross-frame-iframe-for-delete-test.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestshttptestssecuritycrossframeaccessdeleteexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestshttptestssecuritycrossframeaccessdeletehtml">releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestshttptestssecurityresourcescrossframeiframefordeletetesthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorebindingsjsJSDOMWindowCustomcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorebindingsjsJSLocationCustomcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-30 Chris Dumez <cdumez@apple.com>
+
+ [[Delete]] should throw for cross-origin Window / Location objects
+ https://bugs.webkit.org/show_bug.cgi?id=161397
+
+ Reviewed by Ryosuke Niwa.
+
+ Update / rebaseline existing test to reflect behavior change.
+
+ * http/tests/security/cross-frame-access-delete-expected.txt:
+ * http/tests/security/cross-frame-access-delete.html:
+ * http/tests/security/resources/cross-frame-iframe-for-delete-test.html:
+
</ins><span class="cx"> 2016-08-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestshttptestssecuritycrossframeaccessdeleteexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -1,14 +1,20 @@
</span><del>-CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 1: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</del><ins>+Tests [[Delete]] for cross origin Window / Location.
</ins><span class="cx">
</span><del>-PASS: eval('delete targetWindow.existingProperty') should be 'false' and is.
-PASS: eval('delete targetWindow[1]') should be 'false' and is.
-PASS: eval('delete targetWindow.location.existingProperty') should be 'false' and is.
-PASS: eval('delete targetWindow.location[1]') should be 'false' and is.
</del><ins>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</ins><span class="cx">
</span><span class="cx">
</span><ins>+PASS delete targetWindow.existingProperty threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS delete targetWindow.name threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS delete targetWindow[1] threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS delete targetWindow.location.existingProperty threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS delete targetWindow.location.host threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS delete targetWindow.location[1] threw exception SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match..
+PASS: successfullyParsed should be 'true' and is.
+
+TEST COMPLETE
+
+
+
</ins><span class="cx"> --------
</span><span class="cx"> Frame: '<!--framePath //<!--frame0-->-->'
</span><span class="cx"> --------
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestshttptestssecuritycrossframeaccessdeletehtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete.html (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete.html 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/cross-frame-access-delete.html 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -1,17 +1,20 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><ins>+ <script src="/js-test-resources/js-test-pre.js"></script>
</ins><span class="cx"> <script src="resources/cross-frame-access.js"></script>
</span><span class="cx"> <script>
</span><del>- if (window.testRunner) {
- testRunner.dumpAsText();
</del><ins>+ description("Tests [[Delete]] for cross origin Window / Location.");
+ jsTestIsAsync = true;
+
+ if (window.testRunner)
</ins><span class="cx"> testRunner.dumpChildFramesAsText();
</span><del>- testRunner.waitUntilDone();
- }
</del><span class="cx">
</span><span class="cx"> receiver = function(e)
</span><span class="cx"> {
</span><span class="cx"> if (e.data == "setValuesComplete")
</span><span class="cx"> deleteTest();
</span><ins>+ if (e.data == "checkValuesComplete")
+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx"> addEventListener('message', receiver, false);
</span><span class="cx">
</span><span class="lines">@@ -19,10 +22,12 @@
</span><span class="cx"> {
</span><span class="cx"> targetWindow = frames[0];
</span><span class="cx">
</span><del>- shouldBe("eval('delete targetWindow.existingProperty')", "false");
- shouldBe("eval('delete targetWindow[1]')", "false");
- shouldBe("eval('delete targetWindow.location.existingProperty')", "false");
- shouldBe("eval('delete targetWindow.location[1]')", "false");
</del><ins>+ shouldThrowErrorName("delete targetWindow.existingProperty", "SecurityError");
+ shouldThrowErrorName("delete targetWindow.name", "SecurityError");
+ shouldThrowErrorName("delete targetWindow[1]", "SecurityError");
+ shouldThrowErrorName("delete targetWindow.location.existingProperty", "SecurityError");
+ shouldThrowErrorName("delete targetWindow.location.host", "SecurityError");
+ shouldThrowErrorName("delete targetWindow.location[1]", "SecurityError");
</ins><span class="cx">
</span><span class="cx"> targetWindow.postMessage("deletingValuesComplete", "*");
</span><span class="cx"> }
</span><span class="lines">@@ -31,5 +36,6 @@
</span><span class="cx"> <body>
</span><span class="cx"> <iframe src="http://localhost:8000/security/resources/cross-frame-iframe-for-delete-test.html"></iframe>
</span><span class="cx"> <pre id="console"></pre>
</span><ins>+ <script src="/js-test-resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestshttptestssecurityresourcescrossframeiframefordeletetesthtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-delete-test.html 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> shouldBe("window.location.existingProperty", "'test value'");
</span><span class="cx"> shouldBe("window.location[1]", "'test value'");
</span><span class="cx">
</span><del>- if (window.testRunner)
- testRunner.notifyDone();
</del><ins>+ window.parent.postMessage("checkValuesComplete", "*");
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-30 Chris Dumez <cdumez@apple.com>
+
+ [[Delete]] should throw for cross-origin Window / Location objects
+ https://bugs.webkit.org/show_bug.cgi?id=161397
+
+ Reviewed by Ryosuke Niwa.
+
+ [[Delete]] should throw for cross-origin Window / Location objects:
+ - https://github.com/whatwg/html/pull/1728
+
+ Firefox and Chrome already throw. Previously, WebKit was merely
+ ignoring the call and logging an error message.
+
+ No new tests, updated existing test.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::deleteProperty):
+ (WebCore::JSDOMWindow::deletePropertyByIndex):
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::deleteProperty):
+ (WebCore::JSLocation::deletePropertyByIndex):
+
</ins><span class="cx"> 2016-08-30 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce the ThrowScope and force every throw site to instantiate a ThrowScope.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
</span><span class="cx"> // Only allow deleting properties by frames in the same origin.
</span><del>- if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
</del><ins>+ if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), ThrowSecurityError))
</ins><span class="cx"> return false;
</span><span class="cx"> return Base::deleteProperty(thisObject, exec, propertyName);
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
</span><span class="cx"> // Only allow deleting properties by frames in the same origin.
</span><del>- if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
</del><ins>+ if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), ThrowSecurityError))
</ins><span class="cx"> return false;
</span><span class="cx"> return Base::deletePropertyByIndex(thisObject, exec, propertyName);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSLocationCustom.cpp (205595 => 205596)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-08 07:44:11 UTC (rev 205595)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-08 07:44:49 UTC (rev 205596)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSLocation* thisObject = jsCast<JSLocation*>(cell);
</span><span class="cx"> // Only allow deleting by frames in the same origin.
</span><del>- if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
</del><ins>+ if (!BindingSecurity::shouldAllowAccessToFrame(exec, thisObject->wrapped().frame(), ThrowSecurityError))
</ins><span class="cx"> return false;
</span><span class="cx"> return Base::deleteProperty(thisObject, exec, propertyName);
</span><span class="cx"> }
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSLocation* thisObject = jsCast<JSLocation*>(cell);
</span><span class="cx"> // Only allow deleting by frames in the same origin.
</span><del>- if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
</del><ins>+ if (!BindingSecurity::shouldAllowAccessToFrame(exec, thisObject->wrapped().frame(), ThrowSecurityError))
</ins><span class="cx"> return false;
</span><span class="cx"> return Base::deletePropertyByIndex(thisObject, exec, propertyName);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>