<!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>[203288] trunk</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/203288">203288</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-15 11:39:27 -0700 (Fri, 15 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit should prevent push/replace state with username in URL.
<rdar://problem/27361737> and https://bugs.webkit.org/show_bug.cgi?id=159818
Reviewed by Brent Fulgham.
Source/WebCore:
Test: http/tests/security/history-username-password.html
* page/History.cpp:
(WebCore::History::stateObjectAdded): Don't allow URLs with usernames/passwords.
LayoutTests:
* http/tests/security/history-username-password-expected.txt: Added.
* http/tests/security/history-username-password.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageHistorycpp">trunk/Source/WebCore/page/History.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityhistoryusernamepasswordexpectedtxt">trunk/LayoutTests/http/tests/security/history-username-password-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityhistoryusernamepasswordhtml">trunk/LayoutTests/http/tests/security/history-username-password.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203287 => 203288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-15 18:33:32 UTC (rev 203287)
+++ trunk/LayoutTests/ChangeLog 2016-07-15 18:39:27 UTC (rev 203288)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-15 Brady Eidson <beidson@apple.com>
+
+ WebKit should prevent push/replace state with username in URL.
+ <rdar://problem/27361737> and https://bugs.webkit.org/show_bug.cgi?id=159818
+
+ Reviewed by Brent Fulgham.
+
+ * http/tests/security/history-username-password-expected.txt: Added.
+ * http/tests/security/history-username-password.html: Added.
+
</ins><span class="cx"> 2016-07-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r203266.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityhistoryusernamepasswordexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/history-username-password-expected.txt (0 => 203288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/history-username-password-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/history-username-password-expected.txt 2016-07-15 18:39:27 UTC (rev 203288)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Click to test in new window
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+Error: SecurityError: DOM Exception 18
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityhistoryusernamepasswordhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/history-username-password.html (0 => 203288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/history-username-password.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/history-username-password.html 2016-07-15 18:39:27 UTC (rev 203288)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ testRunner.waitUntilDone();
+}
+
+function log(msg)
+{
+ document.getElementById("logger").innerHTML += msg + "<br>";
+}
+
+function testHistoryObject(historyToTest)
+{
+ try {
+ historyToTest.replaceState(null, "Phishy Title", location.protocol + "//www.webkit.org" + "@" + location.host);
+ log("replaceState with username worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+
+ try {
+ historyToTest.replaceState(null, "Phishy Title", location.protocol + "//:www.webkit.org" + "@" + location.host);
+ log("replaceState with password worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+
+ try {
+ historyToTest.replaceState(null, "Phishy Title", location.protocol + "//www.webkit:org" + "@" + location.host);
+ log("replaceState with username and password worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+
+ try {
+ historyToTest.pushState(null, "Phishy Title", location.protocol + "//www.webkit.org" + "@" + location.host);
+ log("pushState with username worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+
+ try {
+ historyToTest.pushState(null, "Phishy Title", location.protocol + "//:www.webkit.org" + "@" + location.host);
+ log("pushState with password worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+
+ try {
+ historyToTest.pushState(null, "Phishy Title", location.protocol + "//www.webkit:org" + "@" + location.host);
+ log("pushState with username and password worked, shouldn't have.");
+ } catch(e) {
+ log(e);
+ }
+}
+
+function clicked()
+{
+ newWindow = window.open('','newWindow');
+ testHistoryObject(newWindow.history);
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function loaded()
+{
+ testHistoryObject(window.history);
+
+ if (window.eventSender) {
+ var button = document.getElementById("theButton");
+ eventSender.mouseMoveTo(button.offsetLeft + 5, button.offsetTop + 5);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+}
+
+</script>
+<body onload="loaded();">
+<button id="theButton" onclick="clicked();">Click to test in new window</button>
+<div id="logger"></div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203287 => 203288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-15 18:33:32 UTC (rev 203287)
+++ trunk/Source/WebCore/ChangeLog 2016-07-15 18:39:27 UTC (rev 203288)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-15 Brady Eidson <beidson@apple.com>
+
+ WebKit should prevent push/replace state with username in URL.
+ <rdar://problem/27361737> and https://bugs.webkit.org/show_bug.cgi?id=159818
+
+ Reviewed by Brent Fulgham.
+
+ Test: http/tests/security/history-username-password.html
+
+ * page/History.cpp:
+ (WebCore::History::stateObjectAdded): Don't allow URLs with usernames/passwords.
+
</ins><span class="cx"> 2016-07-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r203266.
</span></span></pre></div>
<a id="trunkSourceWebCorepageHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/History.cpp (203287 => 203288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/History.cpp 2016-07-15 18:33:32 UTC (rev 203287)
+++ trunk/Source/WebCore/page/History.cpp 2016-07-15 18:39:27 UTC (rev 203288)
</span><span class="lines">@@ -152,6 +152,15 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (fullURL.hasUsername() || fullURL.hasPassword()) {
+ ec.code = SECURITY_ERR;
+ if (stateObjectType == StateObjectType::Replace)
+ ec.message = makeString("Attempt to use history.replaceState() to change session history URL to ", fullURL.string(), " is insecure; Username/passwords aren't allowed in state object URLs");
+ else
+ ec.message = makeString("Attempt to use history.pushState() to add URL ", fullURL.string(), " to session history is insecure; Username/passwords aren't allowed in state object URLs");
+ return;
+ }
+
</ins><span class="cx"> Document* mainDocument = m_frame->page()->mainFrame().document();
</span><span class="cx"> History* mainHistory = nullptr;
</span><span class="cx"> if (mainDocument) {
</span></span></pre>
</div>
</div>
</body>
</html>