<!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>[165986] 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/165986">165986</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-20 12:34:48 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preserve original document URL for XSSAuditor reports
Merged from Blink (patch by Tom Sepez):
https://src.chromium.org/viewvc/blink?view=rev&revision=158406
Source/WebCore:
Test: http/tests/security/xssAuditor/report-script-tag-replace-state.html
* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::filterToken):
* html/parser/XSSAuditorDelegate.cpp:
(WebCore::buildConsoleError):
(WebCore::XSSAuditorDelegate::generateViolationReport):
(WebCore::XSSAuditorDelegate::didBlockScript):
* html/parser/XSSAuditorDelegate.h:
(WebCore::XSSInfo::XSSInfo):
LayoutTests:
* http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt: Added.
* http/tests/security/xssAuditor/report-script-tag-replace-state.html: Added.
* http/tests/security/xssAuditor/resources/echo-intertag.pl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorresourcesechointertagpl">trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorcpp">trunk/Source/WebCore/html/parser/XSSAuditor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp">trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorDelegateh">trunk/Source/WebCore/html/parser/XSSAuditorDelegate.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorreportscripttagreplacestateexpectedtxt">trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorreportscripttagreplacestatehtml">trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/LayoutTests/ChangeLog 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-03-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Preserve original document URL for XSSAuditor reports
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=158406
+
+ * http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt: Added.
+ * http/tests/security/xssAuditor/report-script-tag-replace-state.html: Added.
+ * http/tests/security/xssAuditor/resources/echo-intertag.pl:
+
+2014-03-20 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> XSSAuditor bypass with frameset tags
</span><span class="cx">
</span><span class="cx"> Merged from Blink (patch by Tom Sepez):
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorreportscripttagreplacestateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt (0 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+CONSOLE MESSAGE: line 5: The XSS Auditor refused to execute a script in 'http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&replaceState=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E' because its source code was found within the request. The server sent an 'X-XSS-Protection' header requesting this behavior.
+This tests that the X-XSS-Protection reports are sent out properly with the original, unmodified URL even when a history.replaceState() changes it.
+
+
+
+--------
+Frame: 'frame'
+--------
+CSP report received:
+CONTENT_TYPE: application/json
+HTTP_REFERER: http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&replaceState=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E
+REQUEST_METHOD: POST
+=== POST DATA ===
+{"xss-report":{"request-url":"http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&replaceState=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E","request-body":""}}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorreportscripttagreplacestatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state.html (0 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state.html 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="http://localhost:8000/security/xssAuditor/resources/utilities.js"></script>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+ testRunner.setXSSAuditorEnabled(true);
+}
+</script>
+</head>
+<body>
+<p>This tests that the X-XSS-Protection reports are sent out properly with
+the original, unmodified URL even when a history.replaceState() changes it.</p>
+<iframe id="frame" src="http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&replaceState=1&q=<script>alert(String.fromCharCode(0x58,0x53,0x53))</script><p>If you see this message, no JavaScript alert(), and a dump of the report below, then the test PASSED.</p>">
+</iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorresourcesechointertagpl"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -89,6 +89,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> print "<body>\n";
</span><span class="cx"> }
</span><ins>+if ($cgi->param('replaceState')) {
+ print "<script>history.replaceState({}, '', '#must-not-appear');</script>\n";
+}
</ins><span class="cx"> print $cgi->param('q');
</span><span class="cx"> if ($cgi->param('clutter')) {
</span><span class="cx"> print $cgi->param('clutter');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/Source/WebCore/ChangeLog 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-03-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Preserve original document URL for XSSAuditor reports
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=158406
+
+ Test: http/tests/security/xssAuditor/report-script-tag-replace-state.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::XSSAuditor::filterToken):
+ * html/parser/XSSAuditorDelegate.cpp:
+ (WebCore::buildConsoleError):
+ (WebCore::XSSAuditorDelegate::generateViolationReport):
+ (WebCore::XSSAuditorDelegate::didBlockScript):
+ * html/parser/XSSAuditorDelegate.h:
+ (WebCore::XSSInfo::XSSInfo):
+
+2014-03-20 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> XSSAuditor bypass with frameset tags
</span><span class="cx">
</span><span class="cx"> Merged from Blink (patch by Tom Sepez):
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> bool didBlockEntirePage = (m_xssProtection == ContentSecurityPolicy::BlockReflectedXSS);
</span><del>- return std::make_unique<XSSInfo>(didBlockEntirePage, m_didSendValidXSSProtectionHeader, m_didSendValidCSPHeader);
</del><ins>+ return std::make_unique<XSSInfo>(m_documentURL, didBlockEntirePage, m_didSendValidXSSProtectionHeader, m_didSendValidCSPHeader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool XSSAuditor::filterStartToken(const FilterTokenRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline String buildConsoleError(const XSSInfo& xssInfo, const String& url)
</del><ins>+static inline String buildConsoleError(const XSSInfo& xssInfo)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder message;
</span><span class="cx"> message.append("The XSS Auditor ");
</span><span class="cx"> message.append(xssInfo.m_didBlockEntirePage ? "blocked access to" : "refused to execute a script in");
</span><span class="cx"> message.append(" '");
</span><del>- message.append(url);
</del><ins>+ message.append(xssInfo.m_originalURL);
</ins><span class="cx"> message.append("' because ");
</span><span class="cx"> message.append(xssInfo.m_didBlockEntirePage ? "the source code of a script" : "its source code");
</span><span class="cx"> message.append(" was found within the request.");
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return message.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FormData> XSSAuditorDelegate::generateViolationReport()
</del><ins>+PassRefPtr<FormData> XSSAuditorDelegate::generateViolationReport(const XSSInfo& xssInfo)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> reportDetails = InspectorObject::create();
</span><del>- reportDetails->setString("request-url", m_document.url().string());
</del><ins>+ reportDetails->setString("request-url", xssInfo.m_originalURL);
</ins><span class="cx"> reportDetails->setString("request-body", httpBody);
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> reportObject = InspectorObject::create();
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- m_document.addConsoleMessage(MessageSource::JS, MessageLevel::Error, buildConsoleError(xssInfo, m_document.url().string()));
</del><ins>+ m_document.addConsoleMessage(MessageSource::JS, MessageLevel::Error, buildConsoleError(xssInfo));
</ins><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = m_document.frame()->loader();
</span><span class="cx"> if (xssInfo.m_didBlockEntirePage)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> frameLoader.client().didDetectXSS(m_document.url(), xssInfo.m_didBlockEntirePage);
</span><span class="cx">
</span><span class="cx"> if (!m_reportURL.isEmpty())
</span><del>- PingLoader::sendViolationReport(*m_document.frame(), m_reportURL, generateViolationReport());
</del><ins>+ PingLoader::sendViolationReport(*m_document.frame(), m_reportURL, generateViolationReport(xssInfo));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (xssInfo.m_didBlockEntirePage)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditorDelegate.h (165985 => 165986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditorDelegate.h 2014-03-20 19:32:50 UTC (rev 165985)
+++ trunk/Source/WebCore/html/parser/XSSAuditorDelegate.h 2014-03-20 19:34:48 UTC (rev 165986)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -37,13 +38,15 @@
</span><span class="cx">
</span><span class="cx"> class XSSInfo {
</span><span class="cx"> public:
</span><del>- XSSInfo(bool didBlockEntirePage, bool didSendXSSProtectionHeader, bool didSendCSPHeader)
- : m_didBlockEntirePage(didBlockEntirePage)
</del><ins>+ XSSInfo(const String& originalURL, bool didBlockEntirePage, bool didSendXSSProtectionHeader, bool didSendCSPHeader)
+ : m_originalURL(originalURL.isolatedCopy())
+ , m_didBlockEntirePage(didBlockEntirePage)
</ins><span class="cx"> , m_didSendXSSProtectionHeader(didSendXSSProtectionHeader)
</span><span class="cx"> , m_didSendCSPHeader(didSendCSPHeader)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String m_originalURL;
</ins><span class="cx"> bool m_didBlockEntirePage;
</span><span class="cx"> bool m_didSendXSSProtectionHeader;
</span><span class="cx"> bool m_didSendCSPHeader;
</span><span class="lines">@@ -59,7 +62,7 @@
</span><span class="cx"> void setReportURL(const URL& url) { m_reportURL = url; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PassRefPtr<FormData> generateViolationReport();
</del><ins>+ PassRefPtr<FormData> generateViolationReport(const XSSInfo&);
</ins><span class="cx">
</span><span class="cx"> Document& m_document;
</span><span class="cx"> bool m_didSendNotifications;
</span></span></pre>
</div>
</div>
</body>
</html>