<!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>[165984] 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/165984">165984</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-20 12:32:16 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>XSSAuditor bypass with frameset tags
Merged from Blink (patch by Tom Sepez):
https://src.chromium.org/viewvc/blink?view=rev&revision=157794
Source/WebCore:
Test: http/tests/security/xssAuditor/frameset-injection.html
* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::filterStartToken):
(WebCore::XSSAuditor::filterFrameToken):
* html/parser/XSSAuditor.h:
LayoutTests:
* http/tests/security/xssAuditor/frameset-injection-expected.txt: Added.
* http/tests/security/xssAuditor/frameset-injection.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="#trunkSourceWebCorehtmlparserXSSAuditorh">trunk/Source/WebCore/html/parser/XSSAuditor.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorframesetinjectionexpectedtxt">trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorframesetinjectionhtml">trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165983 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-20 19:31:27 UTC (rev 165983)
+++ trunk/LayoutTests/ChangeLog 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-20 Daniel Bates <dabates@apple.com>
+
+ XSSAuditor bypass with frameset tags
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=157794
+
+ * http/tests/security/xssAuditor/frameset-injection-expected.txt: Added.
+ * http/tests/security/xssAuditor/frameset-injection.html: Added.
+ * http/tests/security/xssAuditor/resources/echo-intertag.pl:
+
</ins><span class="cx"> 2014-03-20 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Cleanup scrollable regions tests
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorframesetinjectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection-expected.txt (0 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection-expected.txt 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?inHead=1&q=%3Cframeset%3E%3Cframe%20src='data:text/html,%3Cscript%3Ealert(0)%3C/script%3E'%3E%3C/frameset%3E' because its source code was found within the request. The auditor was enabled as the server sent neither an 'X-XSS-Protection' nor 'Content-Security-Policy' header.
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorframesetinjectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection.html (0 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/frameset-injection.html 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setXSSAuditorEnabled(true);
+}
+</script>
+</head>
+<body>
+<iframe src="http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?inHead=1&q=<frameset><frame src='data:text/html,<script>alert(0)</script>'></frameset>">
+</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 (165983 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-20 19:31:27 UTC (rev 165983)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -84,7 +84,11 @@
</span><span class="cx"> print "}, true);\n";
</span><span class="cx"> print "</script>\n";
</span><span class="cx"> }
</span><del>-print "<body>\n";
</del><ins>+if ($cgi->param('inHead')) {
+ print "<head>\n";
+} else {
+ print "<body>\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 class="lines">@@ -133,5 +137,9 @@
</span><span class="cx"> if ($cgi->param('echo-report')) {
</span><span class="cx"> print "<script src=/security/contentSecurityPolicy/resources/go-to-echo-report.js></script>\n";
</span><span class="cx"> }
</span><del>-print "</body>\n";
</del><ins>+if ($cgi->param('inHead')) {
+ print "</head>\n";
+} else {
+ print "</body>\n";
+}
</ins><span class="cx"> print "</html>\n";
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165983 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-20 19:31:27 UTC (rev 165983)
+++ trunk/Source/WebCore/ChangeLog 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-20 Daniel Bates <dabates@apple.com>
+
+ XSSAuditor bypass with frameset tags
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=157794
+
+ Test: http/tests/security/xssAuditor/frameset-injection.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::XSSAuditor::filterStartToken):
+ (WebCore::XSSAuditor::filterFrameToken):
+ * html/parser/XSSAuditor.h:
+
</ins><span class="cx"> 2014-03-20 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: fix some oversights in the replay backend
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (165983 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-20 19:31:27 UTC (rev 165983)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -347,8 +347,8 @@
</span><span class="cx"> didBlockScript |= filterEmbedToken(request);
</span><span class="cx"> else if (hasName(request.token, appletTag))
</span><span class="cx"> didBlockScript |= filterAppletToken(request);
</span><del>- else if (hasName(request.token, iframeTag))
- didBlockScript |= filterIframeToken(request);
</del><ins>+ else if (hasName(request.token, iframeTag) || hasName(request.token, frameTag))
+ didBlockScript |= filterFrameToken(request);
</ins><span class="cx"> else if (hasName(request.token, metaTag))
</span><span class="cx"> didBlockScript |= filterMetaToken(request);
</span><span class="cx"> else if (hasName(request.token, baseTag))
</span><span class="lines">@@ -456,10 +456,10 @@
</span><span class="cx"> return didBlockScript;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool XSSAuditor::filterIframeToken(const FilterTokenRequest& request)
</del><ins>+bool XSSAuditor::filterFrameToken(const FilterTokenRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(request.token.type() == HTMLToken::StartTag);
</span><del>- ASSERT(hasName(request.token, iframeTag));
</del><ins>+ ASSERT(hasName(request.token, iframeTag) || hasName(request.token, frameTag));
</ins><span class="cx">
</span><span class="cx"> bool didBlockScript = eraseAttributeIfInjected(request, srcdocAttr, String(), ScriptLikeAttribute);
</span><span class="cx"> if (isContainedInRequest(decodedSnippetForName(request)))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.h (165983 => 165984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.h 2014-03-20 19:31:27 UTC (rev 165983)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.h 2014-03-20 19:32:16 UTC (rev 165984)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> bool filterParamToken(const FilterTokenRequest&);
</span><span class="cx"> bool filterEmbedToken(const FilterTokenRequest&);
</span><span class="cx"> bool filterAppletToken(const FilterTokenRequest&);
</span><del>- bool filterIframeToken(const FilterTokenRequest&);
</del><ins>+ bool filterFrameToken(const FilterTokenRequest&);
</ins><span class="cx"> bool filterMetaToken(const FilterTokenRequest&);
</span><span class="cx"> bool filterBaseToken(const FilterTokenRequest&);
</span><span class="cx"> bool filterFormToken(const FilterTokenRequest&);
</span></span></pre>
</div>
</div>
</body>
</html>