<!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>[205802] branches/safari-602-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/205802">205802</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 00:54:06 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205154">r205154</a>. rdar://problem/28233330</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestssecuritylocationcrossoriginexpectedtxt">branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestssecuritylocationcrossoriginhtml">branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin.html</a></li>
<li><a href="#branchessafari602branchLayoutTestshttptestssecurityxssDENIEDassignlocationhrefjavascriptexpectedtxt">branches/safari-602-branch/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorebindingsjsJSLocationCustomcpp">branches/safari-602-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorebindingsscriptsCodeGeneratorJSpm">branches/safari-602-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageLocationidl">branches/safari-602-branch/Source/WebCore/page/Location.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205154. rdar://problem/28233330
+
+ 2016-08-29 Chris Dumez <cdumez@apple.com>
+
+ Regression(r204923): It should be possible to set 'Location.href' cross origin
+ https://bugs.webkit.org/show_bug.cgi?id=161343
+ <rdar://problem/28063361>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test coverage.
+
+ * http/tests/security/location-cross-origin-expected.txt:
+ * http/tests/security/location-cross-origin.html:
+ * http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt:
+
+2016-09-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204923. rdar://problem/28233330
</span><span class="cx">
</span><span class="cx"> 2016-08-24 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestssecuritylocationcrossoriginexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin-expected.txt (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin-expected.txt 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin-expected.txt 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(window.location, 'ancestorOrigins').get.call(frames[0].location) is undefined.
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(window.location, 'toString').value.call(frames[0].location) is undefined.
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(window.location, 'href').get.call(frames[0].location) is undefined.
</span><ins>+PASS frames[0].location.href = 'about:blank' did not throw exception.
+PASS frames[0].location.href is "about:blank"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestssecuritylocationcrossoriginhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin.html (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin.html 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/LayoutTests/http/tests/security/location-cross-origin.html 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -36,7 +36,12 @@
</span><span class="cx"> // The specification seems to allow access to href but Firefox does not.
</span><span class="cx"> shouldBeUndefined("Object.getOwnPropertyDescriptor(window.location, 'href').get.call(frames[0].location)");
</span><span class="cx">
</span><del>- finishJSTest();
</del><ins>+ // Setting 'href' cross origin should be allowed.
+ shouldNotThrow("frames[0].location.href = 'about:blank'");
+ setTimeout(function() {
+ shouldBeEqualToString("frames[0].location.href", "about:blank");
+ finishJSTest();
+ }, 100);
</ins><span class="cx"> };
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestshttptestssecurityxssDENIEDassignlocationhrefjavascriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> CONSOLE MESSAGE: line 13: 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.
</span><del>-CONSOLE MESSAGE: line 13: 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><span class="cx">
</span><span class="cx">
</span><span class="cx"> --------
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2016-09-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205154. rdar://problem/28233330
+
+ 2016-08-29 Chris Dumez <cdumez@apple.com>
+
+ Regression(r204923): It should be possible to set 'Location.href' cross origin
+ https://bugs.webkit.org/show_bug.cgi?id=161343
+ <rdar://problem/28063361>
+
+ Reviewed by Ryosuke Niwa.
+
+ It should be possible to set 'Location.href' cross origin:
+ - https://html.spec.whatwg.org/#crossoriginproperties-(-o-)
+
+ Firefox and Chrome allow this but we throw a SecurityError.
+
+ We already allow setting crossOrigin.window.location which is equivalent.
+
+ No new tests, updated existing test.
+
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::putDelegate):
+ Refactor the [Put] delegate so that it does not log a security error
+ when setting 'href' attribute, given that setting it works as expected.
+ This fixes a bug in shipping Safari where setting 'href' would work but
+ log an error message anyway.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ Add support for [DoNotCheckSecurityOnSetter] IDL extended attribute,
+ in addition to the already supported [DoNotCheckSecurity] and
+ [DoNotCheckSecurityOnGetter].
+
+ * page/Location.idl:
+ Use [DoNotCheckSecurityOnSetter] on 'href' attribute as it can be
+ set cross-origin. This fixes the regression introduced in r204923.
+
+2016-09-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204943. rdar://problem/28233330
</span><span class="cx">
</span><span class="cx"> 2016-08-24 Ryan Haddad <ryanhaddad@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -70,13 +70,19 @@
</span><span class="cx"> if (propertyName == exec->propertyNames().toString || propertyName == exec->propertyNames().valueOf)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (shouldAllowAccessToFrame(exec, frame))
</del><ins>+ String errorMessage;
+ if (shouldAllowAccessToFrame(exec, frame, errorMessage))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Cross-domain access to the location is allowed when assigning the whole location,
</span><del>- //but not when assigning the individual pieces, since that might inadvertently
</del><ins>+ // but not when assigning the individual pieces, since that might inadvertently
</ins><span class="cx"> // disclose other parts of the original location.
</span><del>- return propertyName != exec->propertyNames().href;
</del><ins>+ if (propertyName != exec->propertyNames().href) {
+ // FIXME: We should throw a SecurityError.
+ printErrorMessageForFrame(frame, errorMessage);
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSLocation::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -2888,7 +2888,7 @@
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " }\n");
</span><span class="cx"> }
</span><del>- if ($interface->extendedAttributes->{"CheckSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
</del><ins>+ if ($interface->extendedAttributes->{"CheckSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckSecurityOnSetter"}) {
</ins><span class="cx"> if ($interfaceName eq "DOMWindow") {
</span><span class="cx"> push(@implContent, " if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))\n");
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageLocationidl"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Location.idl (205801 => 205802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/Location.idl 2016-09-12 07:54:02 UTC (rev 205801)
+++ branches/safari-602-branch/Source/WebCore/page/Location.idl 2016-09-12 07:54:06 UTC (rev 205802)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> JSCustomDefineOwnPropertyOnPrototype,
</span><span class="cx"> Unforgeable
</span><span class="cx"> ] interface Location {
</span><del>- [SetterCallWith=ActiveWindow&FirstWindow] attribute DOMString href;
</del><ins>+ [SetterCallWith=ActiveWindow&FirstWindow, DoNotCheckSecurityOnSetter] attribute DOMString href;
</ins><span class="cx">
</span><span class="cx"> [CallWith=ActiveWindow&FirstWindow, ForwardDeclareInHeader] void assign(DOMString url);
</span><span class="cx"> [DoNotCheckSecurity, CallWith=ActiveWindow&FirstWindow, ForwardDeclareInHeader] void replace(DOMString url);
</span></span></pre>
</div>
</div>
</body>
</html>