<!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>[166202] 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/166202">166202</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-24 16:11:43 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>XSS Auditor doesn't block <script> injected before an existing <script>
https://bugs.webkit.org/show_bug.cgi?id=130475
Merged from Blink (patch by Tom Sepez):
https://src.chromium.org/viewvc/blink?view=rev&revision=169697
Source/WebCore:
Tests: http/tests/security/xssAuditor/script-tag-expression-follows.html
http/tests/security/xssAuditor/script-tag-near-start.html
* html/parser/XSSAuditor.cpp:
(WebCore::startsHTMLCommentAt):
(WebCore::startsSingleLineCommentAt):
(WebCore::startsMultiLineCommentAt):
(WebCore::startsOpeningScriptTagAt):
(WebCore::XSSAuditor::decodedSnippetForJavaScript):
LayoutTests:
* http/tests/security/xssAuditor/resources/echo-intertag.pl:
* http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt: Added.
* http/tests/security/xssAuditor/script-tag-expression-follows.html: Added.
* http/tests/security/xssAuditor/script-tag-near-start-expected.txt: Added.
* http/tests/security/xssAuditor/script-tag-near-start.html: Added.</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagexpressionfollowsexpectedtxt">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagexpressionfollowshtml">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagnearstartexpectedtxt">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagnearstarthtml">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166201 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-24 23:01:56 UTC (rev 166201)
+++ trunk/LayoutTests/ChangeLog 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-24 Daniel Bates <dabates@apple.com>
+
+ XSS Auditor doesn't block <script> injected before an existing <script>
+ https://bugs.webkit.org/show_bug.cgi?id=130475
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=169697
+
+ * http/tests/security/xssAuditor/resources/echo-intertag.pl:
+ * http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt: Added.
+ * http/tests/security/xssAuditor/script-tag-expression-follows.html: Added.
+ * http/tests/security/xssAuditor/script-tag-near-start-expected.txt: Added.
+ * http/tests/security/xssAuditor/script-tag-near-start.html: Added.
+
</ins><span class="cx"> 2014-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Activate WebVTT Tests Once Merging is Complete
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorresourcesechointertagpl"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl (166201 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-24 23:01:56 UTC (rev 166201)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -92,7 +92,10 @@
</span><span class="cx"> if ($cgi->param('replaceState')) {
</span><span class="cx"> print "<script>history.replaceState({}, '', '#must-not-appear');</script>\n";
</span><span class="cx"> }
</span><del>-print $cgi->param('q');
</del><ins>+print $cgi->param('q'); # XSS reflected here.
+if ($cgi->param('script-expression-follows')) {
+ print "\n <script>42;</script>\n";
+}
</ins><span class="cx"> if ($cgi->param('clutter')) {
</span><span class="cx"> print $cgi->param('clutter');
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorscripttagexpressionfollowsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt (0 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows-expected.txt 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 5: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?script-expression-follows=1&q=%3Cscript%3Ealert('XSS')' 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="trunkLayoutTestshttptestssecurityxssAuditorscripttagexpressionfollowshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows.html (0 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-expression-follows.html 2014-03-24 23:11:43 UTC (rev 166202)
</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?script-expression-follows=1&q=<script>alert('XSS')">
+</iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorscripttagnearstartexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start-expected.txt (0 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start-expected.txt 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 5: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?script-expression-follows=1&q=%3Cscript%3E%22%3Cscript%3E%22-alert(/XSS/)' 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="trunkLayoutTestshttptestssecurityxssAuditorscripttagnearstarthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start.html (0 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-near-start.html 2014-03-24 23:11:43 UTC (rev 166202)
</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?script-expression-follows=1&q=<script>%22<script>%22-alert(/XSS/)">
+</iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166201 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-24 23:01:56 UTC (rev 166201)
+++ trunk/Source/WebCore/ChangeLog 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-24 Daniel Bates <dabates@apple.com>
+
+ XSS Auditor doesn't block <script> injected before an existing <script>
+ https://bugs.webkit.org/show_bug.cgi?id=130475
+
+ Merged from Blink (patch by Tom Sepez):
+ https://src.chromium.org/viewvc/blink?view=rev&revision=169697
+
+ Tests: http/tests/security/xssAuditor/script-tag-expression-follows.html
+ http/tests/security/xssAuditor/script-tag-near-start.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::startsHTMLCommentAt):
+ (WebCore::startsSingleLineCommentAt):
+ (WebCore::startsMultiLineCommentAt):
+ (WebCore::startsOpeningScriptTagAt):
+ (WebCore::XSSAuditor::decodedSnippetForJavaScript):
+
</ins><span class="cx"> 2014-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Activate WebVTT Tests Once Merging is Complete
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (166201 => 166202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-24 23:01:56 UTC (rev 166201)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2014-03-24 23:11:43 UTC (rev 166202)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "XLinkNames.h"
</span><ins>+#include <wtf/ASCIICType.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -87,19 +88,30 @@
</span><span class="cx">
</span><span class="cx"> static bool startsHTMLCommentAt(const String& string, size_t start)
</span><span class="cx"> {
</span><del>- return (start + 3 < string.length() && string[start] == '<' && string[start+1] == '!' && string[start+2] == '-' && string[start+3] == '-');
</del><ins>+ return (start + 3 < string.length() && string[start] == '<' && string[start + 1] == '!' && string[start + 2] == '-' && string[start + 3] == '-');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool startsSingleLineCommentAt(const String& string, size_t start)
</span><span class="cx"> {
</span><del>- return (start + 1 < string.length() && string[start] == '/' && string[start+1] == '/');
</del><ins>+ return (start + 1 < string.length() && string[start] == '/' && string[start + 1] == '/');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool startsMultiLineCommentAt(const String& string, size_t start)
</span><span class="cx"> {
</span><del>- return (start + 1 < string.length() && string[start] == '/' && string[start+1] == '*');
</del><ins>+ return (start + 1 < string.length() && string[start] == '/' && string[start + 1] == '*');
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool startsOpeningScriptTagAt(const String& string, size_t start)
+{
+ return start + 6 < string.length() && string[start] == '<'
+ && WTF::toASCIILowerUnchecked(string[start + 1]) == 's'
+ && WTF::toASCIILowerUnchecked(string[start + 2]) == 'c'
+ && WTF::toASCIILowerUnchecked(string[start + 3]) == 'r'
+ && WTF::toASCIILowerUnchecked(string[start + 4]) == 'i'
+ && WTF::toASCIILowerUnchecked(string[start + 5]) == 'p'
+ && WTF::toASCIILowerUnchecked(string[start + 6]) == 't';
+}
+
</ins><span class="cx"> // If other files need this, we should move this to HTMLParserIdioms.h
</span><span class="cx"> template<size_t inlineCapacity>
</span><span class="cx"> bool threadSafeMatch(const Vector<UChar, inlineCapacity>& vector, const QualifiedName& qname)
</span><span class="lines">@@ -621,6 +633,7 @@
</span><span class="cx"> size_t startPosition = 0;
</span><span class="cx"> size_t endPosition = string.length();
</span><span class="cx"> size_t foundPosition = notFound;
</span><ins>+ size_t lastNonSpacePosition = notFound;
</ins><span class="cx">
</span><span class="cx"> // Skip over initial comments to find start of code.
</span><span class="cx"> while (startPosition < endPosition) {
</span><span class="lines">@@ -649,13 +662,10 @@
</span><span class="cx">
</span><span class="cx"> String result;
</span><span class="cx"> while (startPosition < endPosition && !result.length()) {
</span><del>- // Stop at next comment (using the same rules as above for SVG/XML vs HTML), when we
- // encounter a comma, or when we exceed the maximum length target. The comma rule
- // covers a common parameter concatenation case performed by some webservers.
- // After hitting the length target, we can only stop at a point where we know we are
- // not in the middle of a %-escape sequence. For the sake of simplicity, approximate
- // not stopping inside a (possibly multiply encoded) %-esacpe sequence by breaking on
- // whitespace only. We should have enough text in these cases to avoid false positives.
</del><ins>+ // Stop at next comment (using the same rules as above for SVG/XML vs HTML), when we encounter a comma,
+ // when we hit an opening <script> tag, or when we exceed the maximum length target. The comma rule
+ // covers a common parameter concatenation case performed by some web servers.
+ lastNonSpacePosition = notFound;
</ins><span class="cx"> for (foundPosition = startPosition; foundPosition < endPosition; foundPosition++) {
</span><span class="cx"> if (!request.shouldAllowCDATA) {
</span><span class="cx"> if (startsSingleLineCommentAt(string, foundPosition) || startsMultiLineCommentAt(string, foundPosition)) {
</span><span class="lines">@@ -667,9 +677,25 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (string[foundPosition] == ',' || (foundPosition > startPosition + kMaximumFragmentLengthTarget && isHTMLSpace(string[foundPosition]))) {
</del><ins>+ if (string[foundPosition] == ',')
</ins><span class="cx"> break;
</span><ins>+
+ if (lastNonSpacePosition != notFound && startsOpeningScriptTagAt(string, foundPosition)) {
+ foundPosition = lastNonSpacePosition;
+ break;
</ins><span class="cx"> }
</span><ins>+
+ if (foundPosition > startPosition + kMaximumFragmentLengthTarget) {
+ // After hitting the length target, we can only stop at a point where we know we are
+ // not in the middle of a %-escape sequence. For the sake of simplicity, approximate
+ // not stopping inside a (possibly multiply encoded) %-escape sequence by breaking on
+ // whitespace only. We should have enough text in these cases to avoid false positives.
+ if (isHTMLSpace(string[foundPosition]))
+ break;
+ }
+
+ if (!isHTMLSpace(string[foundPosition]))
+ lastNonSpacePosition = foundPosition;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result = fullyDecodeString(string.substring(startPosition, foundPosition - startPosition), m_encoding);
</span></span></pre>
</div>
</div>
</body>
</html>