<!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>[198377] 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/198377">198377</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-17 21:45:46 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[XSS Auditor] Off by one in XSSAuditor::canonicalizedSnippetForJavaScript()
https://bugs.webkit.org/show_bug.cgi?id=155624
<rdar://problem/25219962>
Unreviewed merge from Blink (patch by Tom Sepez <tsepez@chromium.org>):
<https://src.chromium.org/viewvc/blink?revision=201803&view=revision>
Source/WebCore:
Test: http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html
* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::canonicalizedSnippetForJavaScript): Correct off-by-one error.
LayoutTests:
* http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt: Added.
* http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.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="#trunkSourceWebCorehtmlparserXSSAuditorcpp">trunk/Source/WebCore/html/parser/XSSAuditor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagwithtrailingscriptandurlencodeexpectedtxt">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityxssAuditorscripttagwithtrailingscriptandurlencodehtml">trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198376 => 198377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-18 04:06:59 UTC (rev 198376)
+++ trunk/LayoutTests/ChangeLog 2016-03-18 04:45:46 UTC (rev 198377)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-17 Brent Fulgham <bfulgham@apple.com>
+
+ [XSS Auditor] Off by one in XSSAuditor::canonicalizedSnippetForJavaScript()
+ https://bugs.webkit.org/show_bug.cgi?id=155624
+ <rdar://problem/25219962>
+
+ Unreviewed merge from Blink (patch by Tom Sepez <tsepez@chromium.org>):
+ <https://src.chromium.org/viewvc/blink?revision=201803&view=revision>
+
+ * http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt: Added.
+ * http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html: Added.
+
</ins><span class="cx"> 2016-03-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Images in feed on ebay.com jiggle when one is hovered
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityxssAuditorscripttagwithtrailingscriptandurlencodeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt (0 => 198377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode-expected.txt 2016-03-18 04:45:46 UTC (rev 198377)
</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?q=%3Cscript%3Ealert(/xss/)-1%2502%3Cscript%3C/script%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="trunkLayoutTestshttptestssecurityxssAuditorscripttagwithtrailingscriptandurlencodehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html (0 => 198377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html 2016-03-18 04:45:46 UTC (rev 198377)
</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?q=<script>alert(/xss/)-1%2502<script</script>">
+ </iframe>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198376 => 198377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-18 04:06:59 UTC (rev 198376)
+++ trunk/Source/WebCore/ChangeLog 2016-03-18 04:45:46 UTC (rev 198377)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-17 Brent Fulgham <bfulgham@apple.com>
+
+ [XSS Auditor] Off by one in XSSAuditor::canonicalizedSnippetForJavaScript()
+ https://bugs.webkit.org/show_bug.cgi?id=155624
+ <rdar://problem/25219962>
+
+ Unreviewed merge from Blink (patch by Tom Sepez <tsepez@chromium.org>):
+ <https://src.chromium.org/viewvc/blink?revision=201803&view=revision>
+
+ Test: http/tests/security/xssAuditor/script-tag-with-trailing-script-and-urlencode.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::XSSAuditor::canonicalizedSnippetForJavaScript): Correct off-by-one error.
+
</ins><span class="cx"> 2016-03-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Images in feed on ebay.com jiggle when one is hovered
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (198376 => 198377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2016-03-18 04:06:59 UTC (rev 198376)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp 2016-03-18 04:45:46 UTC (rev 198377)
</span><span class="lines">@@ -695,7 +695,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (lastNonSpacePosition != notFound && startsOpeningScriptTagAt(string, foundPosition)) {
</span><del>- foundPosition = lastNonSpacePosition;
</del><ins>+ foundPosition = lastNonSpacePosition + 1;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (foundPosition > startPosition + kMaximumFragmentLengthTarget) {
</span></span></pre>
</div>
</div>
</body>
</html>