<!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>[182969] branches/safari-600.6-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/182969">182969</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-04-17 14:52:32 -0700 (Fri, 17 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/182284">r182284</a>. rdar://problem/20540450</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6006branchLayoutTestsChangeLog">branches/safari-600.6-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6006branchLayoutTestshttptestssecuritycrossframeaccesscallexpectedtxt">branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt</a></li>
<li><a href="#branchessafari6006branchLayoutTestshttptestssecuritycrossframeaccesscallhtml">branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call.html</a></li>
<li><a href="#branchessafari6006branchSourceWebCoreChangeLog">branches/safari-600.6-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6006branchSourceWebCorebindingsjsJSHistoryCustomcpp">branches/safari-600.6-branch/Source/WebCore/bindings/js/JSHistoryCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6006branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.6-branch/LayoutTests/ChangeLog (182968 => 182969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.6-branch/LayoutTests/ChangeLog 2015-04-17 21:46:51 UTC (rev 182968)
+++ branches/safari-600.6-branch/LayoutTests/ChangeLog 2015-04-17 21:52:32 UTC (rev 182969)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-04-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r182284
+
+ 2015-04-02 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up access checks in JSHistoryCustom.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=143227
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/security/cross-frame-access-call-expected.txt:
+ * http/tests/security/cross-frame-access-call.html:
+
+2015-04-17 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r182051
</span><span class="cx">
</span><span class="cx"> 2015-03-26 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6006branchLayoutTestshttptestssecuritycrossframeaccesscallexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt (182968 => 182969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt 2015-04-17 21:46:51 UTC (rev 182968)
+++ branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt 2015-04-17 21:52:32 UTC (rev 182969)
</span><span class="lines">@@ -59,4 +59,6 @@
</span><span class="cx"> PASS: window.showModalDialog.call(targetWindow); should be 'undefined' and is.
</span><span class="cx"> PASS: window.eval.call(targetWindow, '1+2'); should be '3' and is.
</span><span class="cx"> PASS: window.location.toString.call(targetWindow.location) should be 'undefined' and is.
</span><ins>+PASS: history.pushState.call(targetWindow.history, {}, '', 'http://localhost:8000/foobar') should be 'undefined' and is.
+PASS: history.replaceState.call(targetWindow.history, {}, '', 'http://localhost:8000/foobar') should be 'undefined' and is.
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari6006branchLayoutTestshttptestssecuritycrossframeaccesscallhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call.html (182968 => 182969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call.html 2015-04-17 21:46:51 UTC (rev 182968)
+++ branches/safari-600.6-branch/LayoutTests/http/tests/security/cross-frame-access-call.html 2015-04-17 21:52:32 UTC (rev 182969)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> // undefined value indicates failure
</span><span class="cx"> shouldBe("window.location.toString.call(targetWindow.location)", "undefined");
</span><span class="cx">
</span><ins>+ // - Tests for the History object -
+ shouldBe("history.pushState.call(targetWindow.history, {}, '', 'http://localhost:8000/foobar')", "undefined"),
+ shouldBe("history.replaceState.call(targetWindow.history, {}, '', 'http://localhost:8000/foobar')", "undefined"),
+
</ins><span class="cx"> // Work around DRT bug that causes subsequent tests to fail.
</span><span class="cx"> window.stop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6006branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.6-branch/Source/WebCore/ChangeLog (182968 => 182969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.6-branch/Source/WebCore/ChangeLog 2015-04-17 21:46:51 UTC (rev 182968)
+++ branches/safari-600.6-branch/Source/WebCore/ChangeLog 2015-04-17 21:52:32 UTC (rev 182969)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-04-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r182284
+
+ 2015-04-02 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up access checks in JSHistoryCustom.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=143227
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/JSHistoryCustom.cpp:
+ (WebCore::JSHistory::putDelegate):
+ (WebCore::JSHistory::deleteProperty):
+ (WebCore::JSHistory::deletePropertyByIndex):
+ (WebCore::JSHistory::getOwnPropertyNames):
+ (WebCore::JSHistory::pushState):
+ (WebCore::JSHistory::replaceState):
+
+2015-04-17 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r182051
</span><span class="cx">
</span><span class="cx"> 2015-03-26 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6006branchSourceWebCorebindingsjsJSHistoryCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.6-branch/Source/WebCore/bindings/js/JSHistoryCustom.cpp (182968 => 182969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.6-branch/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2015-04-17 21:46:51 UTC (rev 182968)
+++ branches/safari-600.6-branch/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2015-04-17 21:52:32 UTC (rev 182969)
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx">
</span><span class="cx"> bool JSHistory::putDelegate(ExecState* exec, PropertyName, JSValue, PutPropertySlot&)
</span><span class="cx"> {
</span><del>- // Only allow putting by frames in the same origin.
</del><span class="cx"> if (!shouldAllowAccessToFrame(exec, impl().frame()))
</span><span class="cx"> return true;
</span><span class="cx"> return false;
</span><span class="lines">@@ -85,7 +84,6 @@
</span><span class="cx"> bool JSHistory::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> JSHistory* thisObject = jsCast<JSHistory*>(cell);
</span><del>- // Only allow deleting by frames in the same origin.
</del><span class="cx"> if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
</span><span class="cx"> return false;
</span><span class="cx"> return Base::deleteProperty(thisObject, exec, propertyName);
</span><span class="lines">@@ -94,7 +92,6 @@
</span><span class="cx"> bool JSHistory::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
</span><span class="cx"> {
</span><span class="cx"> JSHistory* thisObject = jsCast<JSHistory*>(cell);
</span><del>- // Only allow deleting by frames in the same origin.
</del><span class="cx"> if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
</span><span class="cx"> return false;
</span><span class="cx"> return Base::deletePropertyByIndex(thisObject, exec, propertyName);
</span><span class="lines">@@ -103,7 +100,6 @@
</span><span class="cx"> void JSHistory::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> JSHistory* thisObject = jsCast<JSHistory*>(object);
</span><del>- // Only allow the history object to enumerated by frames in the same origin.
</del><span class="cx"> if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
</span><span class="cx"> return;
</span><span class="cx"> Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
</span><span class="lines">@@ -125,6 +121,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSHistory::pushState(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ if (!shouldAllowAccessToFrame(exec, impl().frame()))
+ return jsUndefined();
+
</ins><span class="cx"> RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(exec, exec->argument(0), 0, 0);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -151,6 +150,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSHistory::replaceState(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ if (!shouldAllowAccessToFrame(exec, impl().frame()))
+ return jsUndefined();
+
</ins><span class="cx"> RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(exec, exec->argument(0), 0, 0);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return jsUndefined();
</span></span></pre>
</div>
</div>
</body>
</html>