<!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>[211713] branches/safari-603-branch</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/211713">211713</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-05 22:17:42 -0800 (Sun, 05 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211504">r211504</a>. rdar://problem/30301117</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cChangeLog">branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt">branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorebindingsjsJSDOMWindowCustomcpp">branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorebindingsjsJSLocationCustomcpp">branches/safari-603-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestshttptestssecuritysymbolscrossoriginexpectedtxt">branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestshttptestssecuritysymbolscrossoriginhtml">branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211504. rdar://problem/30301117
+
+ 2017-02-01 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r205136): {}.toString.call(crossOriginWindow) should not throw
+ https://bugs.webkit.org/show_bug.cgi?id=167681
+ <rdar://problem/30301117>
+
+ Reviewed by Mark Lam.
+
+ Add layout test coverage.
+
+ * http/tests/security/symbols-cross-origin-expected.txt: Added.
+ * http/tests/security/symbols-cross-origin.html: Added.
+
+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211659. rdar://problem/28725791
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestshttptestssecuritysymbolscrossoriginexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin-expected.txt (0 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin-expected.txt 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Tests that symbols can be accessed on cross origin Window / Location objects
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* Window
+FAIL (new Object).toString.call(crossOriginWindow) should be [object Object]. Was [object Window].
+PASS crossOriginWindow instanceof Window is false
+PASS Array.prototype.concat.call(crossOriginWindow, ['A']) is [crossOriginWindow, 'A']
+PASS crossOriginWindow.toString() 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 '' + crossOriginWindow 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 crossOriginWindow.concat(['A']) 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..
+
+* Location
+FAIL (new Object).toString.call(crossOriginWindow.location) should be [object Object]. Was [object Location].
+PASS crossOriginWindow.location instanceof Location is false
+PASS Array.prototype.concat.call(crossOriginWindow.location, ['A']) is [crossOriginWindow.location, 'A']
+PASS crossOriginWindow.location.toString() 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 '' + crossOriginWindow.location 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 crossOriginWindow.location.concat(['A']) 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 is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestshttptestssecuritysymbolscrossoriginhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin.html (0 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/http/tests/security/symbols-cross-origin.html 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="/js-test-resources/js-test-pre.js"></script>
+<iframe id="crossOriginFrame" src="http://localhost:8000/security/resources/blank.html"></iframe>
+<script>
+description("Tests that symbols can be accessed on cross origin Window / Location objects");
+jsTestIsAsync = true;
+
+window.onload = function() {
+ crossOriginWindow = document.getElementById("crossOriginFrame").contentWindow;
+ debug("* Window");
+ try {
+ shouldBeEqualToString("(new Object).toString.call(crossOriginWindow)", "[object Object]");
+ } catch (e) {
+ testFailed("toString threw an exception: " + e);
+ }
+
+ try {
+ shouldBeFalse("crossOriginWindow instanceof Window");
+ } catch (e) {
+ testFailed("hasInstance threw an exception: " + e);
+ }
+
+ try {
+ shouldBe("Array.prototype.concat.call(crossOriginWindow, ['A'])", "[crossOriginWindow, 'A']");
+ } catch (e) {
+ testFailed("concat threw an exception: " + e);
+ }
+
+ shouldThrowErrorName("crossOriginWindow.toString()", "SecurityError");
+ shouldThrowErrorName("'' + crossOriginWindow", "SecurityError");
+ shouldThrowErrorName("crossOriginWindow.concat(['A'])", "SecurityError");
+
+ debug("");
+ debug("* Location");
+ try {
+ shouldBeEqualToString("(new Object).toString.call(crossOriginWindow.location)", "[object Object]");
+ } catch (e) {
+ testFailed("toString threw an exception: " + e);
+ }
+
+ try {
+ shouldBeFalse("crossOriginWindow.location instanceof Location");
+ } catch (e) {
+ testFailed("hasInstance threw an exception: " + e);
+ }
+
+ try {
+ shouldBe("Array.prototype.concat.call(crossOriginWindow.location, ['A'])", "[crossOriginWindow.location, 'A']");
+ } catch (e) {
+ testFailed("concat threw an exception: " + e);
+ }
+
+ shouldThrowErrorName("crossOriginWindow.location.toString()", "SecurityError");
+ shouldThrowErrorName("'' + crossOriginWindow.location", "SecurityError");
+ shouldThrowErrorName("crossOriginWindow.location.concat(['A'])", "SecurityError");
+
+ finishJSTest();
+}
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211504. rdar://problem/30301117
+
+ 2017-02-01 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r205136): {}.toString.call(crossOriginWindow) should not throw
+ https://bugs.webkit.org/show_bug.cgi?id=167681
+ <rdar://problem/30301117>
+
+ Reviewed by Mark Lam.
+
+ Rebaseline W3C test now that we passing one more check. We're still failing
+ later because {}.toString.call(crossOriginWindow) returns "[object Window]"
+ instead of "[object Object]". I am planning to fix this in a follow-up.
+ This is not a regression since we were returning "[object Window]" before
+ r205136.
+
+ * web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt:
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210860. rdar://problem/30080035
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -19,4 +19,5 @@
</span><span class="cx"> PASS Same-origin observers get different functions for cross-origin objects
</span><span class="cx"> PASS Same-origin observers get different accessors for cross-origin Window
</span><span class="cx"> PASS Same-origin observers get different accessors for cross-origin Location
</span><ins>+FAIL {}.toString.call() does the right thing on cross-origin objects assert_equals: expected "[object Object]" but got "[object Window]"
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211504. rdar://problem/30301117
+
+ 2017-02-01 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r205136): {}.toString.call(crossOriginWindow) should not throw
+ https://bugs.webkit.org/show_bug.cgi?id=167681
+ <rdar://problem/30301117>
+
+ Reviewed by Mark Lam.
+
+ As per https://html.spec.whatwg.org/#crossorigingetownpropertyhelper-(-o,-p-):
+ """
+ If P is @@toStringTag, @@hasInstance, or @@isConcatSpreadable, then return
+ PropertyDescriptor{ [[Value]]: undefined, [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]: true }.
+ """
+
+ We now implement this behavior instead of throwing.
+
+ Test: http/tests/security/symbols-cross-origin.html
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess):
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::getOwnPropertySlotDelegate):
+
+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211659. rdar://problem/28725791
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -95,6 +95,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (propertyName == exec->propertyNames().toStringTagSymbol || propertyName == exec->propertyNames().hasInstanceSymbol || propertyName == exec->propertyNames().isConcatSpreadableSymbol) {
+ slot.setUndefined();
+ return true;
+ }
+
</ins><span class="cx"> // These are the functions we allow access to cross-origin (DoNotCheckSecurity in IDL).
</span><span class="cx"> // Always provide the original function, on a fresh uncached function object.
</span><span class="cx"> if (propertyName == exec->propertyNames().blur) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp (211712 => 211713)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-02-06 06:17:38 UTC (rev 211712)
+++ branches/safari-603-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp 2017-02-06 06:17:42 UTC (rev 211713)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx"> if (BindingSecurity::shouldAllowAccessToFrame(*state, *frame, message))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (propertyName == state->propertyNames().toStringTagSymbol || propertyName == state->propertyNames().hasInstanceSymbol || propertyName == state->propertyNames().isConcatSpreadableSymbol) {
+ slot.setUndefined();
+ return true;
+ }
+
</ins><span class="cx"> // We only allow access to Location.replace() cross origin.
</span><span class="cx"> if (propertyName == state->propertyNames().replace) {
</span><span class="cx"> slot.setCustom(this, ReadOnly | DontEnum, nonCachingStaticFunctionGetter<jsLocationInstanceFunctionReplace, 1>);
</span></span></pre>
</div>
</div>
</body>
</html>