<!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>[195269] releases/WebKitGTK/webkit-2.10</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/195269">195269</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-19 01:06:14 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195073">r195073</a> - [XSS Auditor] Partial bypass when web server collapses path components
https://bugs.webkit.org/show_bug.cgi?id=152872
Reviewed by Brent Fulgham.
Merged from Blink (patch by Tom Sepez <tsepez@chromium.org>):
<https://src.chromium.org/viewvc/blink?revision=167610&view=revision>
Source/WebCore:
Test: http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html
* html/parser/XSSAuditor.cpp:
(WebCore::isNonCanonicalCharacter):
(WebCore::XSSAuditor::init):
(WebCore::XSSAuditor::decodedSnippetForName):
(WebCore::XSSAuditor::decodedSnippetForAttribute):
(WebCore::XSSAuditor::decodedSnippetForJavaScript):
(WebCore::fullyDecodeString): Deleted.
LayoutTests:
* http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt: Added.
* http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html: Added.
* http/tests/security/xssAuditor/intercept/.htaccess:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorintercepthtaccess">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/intercept/.htaccess</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlparserXSSAuditorcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/XSSAuditor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorembedtaginpathunterminatedexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorembedtaginpathunterminatedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195268 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-19 09:04:02 UTC (rev 195268)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-19 09:06:14 UTC (rev 195269)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-14 Daniel Bates <dabates@apple.com>
+
+ [XSS Auditor] Partial bypass when web server collapses path components
+ https://bugs.webkit.org/show_bug.cgi?id=152872
+
+ Reviewed by Brent Fulgham.
+
+ Merged from Blink (patch by Tom Sepez <tsepez@chromium.org>):
+ <https://src.chromium.org/viewvc/blink?revision=167610&view=revision>
+
+ * http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt: Added.
+ * http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html: Added.
+ * http/tests/security/xssAuditor/intercept/.htaccess:
+
</ins><span class="cx"> 2016-01-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorembedtaginpathunterminatedexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt (0 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated-expected.txt 2016-01-19 09:06:14 UTC (rev 195269)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/intercept/echo-intertag.pl/%3Cembed%20height=%22500%22src=%22https://127.0.0.1:8443/security/xssAuditor/resources/dummy.swf%22.xml&clutter=%3Cp%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.
+Check that the XSSAuditor catches reflected tags in path components
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorembedtaginpathunterminatedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html (0 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html 2016-01-19 09:06:14 UTC (rev 195269)
</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>
+<p>Check that the XSSAuditor catches reflected tags in path components</p>
+<iframe src="http://localhost:8000/security/xssAuditor/intercept/echo-intertag.pl/<embed height=%22500%22src=%22https://127.0.0.1:8443/security/xssAuditor/resources/dummy.swf%22.xml&clutter=<p>"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorintercepthtaccess"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/intercept/.htaccess (195268 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/intercept/.htaccess 2016-01-19 09:04:02 UTC (rev 195268)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/intercept/.htaccess 2016-01-19 09:06:14 UTC (rev 195269)
</span><span class="lines">@@ -1,2 +1,5 @@
</span><ins>+# For ease in testing path reflections, pass any path component containing <'"
+# (and subsequent characters) as the "q" query parameter to the script identified
+# by the path components preceeding it.
</ins><span class="cx"> RewriteEngine on
</span><del>-RewriteRule ^(.*)/(.*) /security/xssAuditor/resources/$1?q=$2 [L,NS]
</del><ins>+RewriteRule ^([^<"']*)/(.*) /security/xssAuditor/resources/$1?q=$2 [L,NS]
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195268 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 09:04:02 UTC (rev 195268)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 09:06:14 UTC (rev 195269)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-14 Daniel Bates <dabates@apple.com>
+
+ [XSS Auditor] Partial bypass when web server collapses path components
+ https://bugs.webkit.org/show_bug.cgi?id=152872
+
+ Reviewed by Brent Fulgham.
+
+ Merged from Blink (patch by Tom Sepez <tsepez@chromium.org>):
+ <https://src.chromium.org/viewvc/blink?revision=167610&view=revision>
+
+ Test: http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::isNonCanonicalCharacter):
+ (WebCore::XSSAuditor::init):
+ (WebCore::XSSAuditor::decodedSnippetForName):
+ (WebCore::XSSAuditor::decodedSnippetForAttribute):
+ (WebCore::XSSAuditor::decodedSnippetForJavaScript):
+ (WebCore::fullyDecodeString): Deleted.
+
</ins><span class="cx"> 2016-01-14 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> imported/blink/editing/text-iterator/read-past-cloned-first-letter.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/XSSAuditor.cpp (195268 => 195269)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/XSSAuditor.cpp 2016-01-19 09:04:02 UTC (rev 195268)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/XSSAuditor.cpp 2016-01-19 09:06:14 UTC (rev 195269)
</span><span class="lines">@@ -55,9 +55,11 @@
</span><span class="cx"> // Note, we don't remove backslashes like PHP stripslashes(), which among other things converts "\\0" to the \0 character.
</span><span class="cx"> // Instead, we remove backslashes and zeros (since the string "\\0" =(remove backslashes)=> "0"). However, this has the
</span><span class="cx"> // adverse effect that we remove any legitimate zeros from a string.
</span><ins>+ // We also remove forward-slash, because it is common for some servers to collapse successive path components, eg,
+ // a//b becomes a/b.
</ins><span class="cx"> //
</span><del>- // For instance: new String("http://localhost:8000") => new String("http://localhost:8").
- return (c == '\\' || c == '0' || c == '\0' || c >= 127);
</del><ins>+ // For instance: new String("http://localhost:8000") => new String("http:localhost:8").
+ return (c == '\\' || c == '0' || c == '\0' || c == '/' || c >= 127);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String canonicalize(const String& string)
</span><span class="lines">@@ -174,7 +176,6 @@
</span><span class="cx"> workingString = decode16BitUnicodeEscapeSequences(decodeStandardURLEscapeSequences(workingString, encoding));
</span><span class="cx"> } while (workingString.length() < oldWorkingStringLength);
</span><span class="cx"> workingString.replace('+', ' ');
</span><del>- workingString = canonicalize(workingString);
</del><span class="cx"> return workingString;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -267,7 +268,7 @@
</span><span class="cx"> if (document->decoder())
</span><span class="cx"> m_encoding = document->decoder()->encoding();
</span><span class="cx">
</span><del>- m_decodedURL = fullyDecodeString(m_documentURL.string(), m_encoding);
</del><ins>+ m_decodedURL = canonicalize(fullyDecodeString(m_documentURL.string(), m_encoding));
</ins><span class="cx"> if (m_decodedURL.find(isRequiredForInjection) == notFound)
</span><span class="cx"> m_decodedURL = String();
</span><span class="cx">
</span><span class="lines">@@ -305,7 +306,7 @@
</span><span class="cx"> if (httpBody && !httpBody->isEmpty()) {
</span><span class="cx"> httpBodyAsString = httpBody->flattenToString();
</span><span class="cx"> if (!httpBodyAsString.isEmpty()) {
</span><del>- m_decodedHTTPBody = fullyDecodeString(httpBodyAsString, m_encoding);
</del><ins>+ m_decodedHTTPBody = canonicalize(fullyDecodeString(httpBodyAsString, m_encoding));
</ins><span class="cx"> if (m_decodedHTTPBody.find(isRequiredForInjection) == notFound)
</span><span class="cx"> m_decodedHTTPBody = String();
</span><span class="cx"> if (m_decodedHTTPBody.length() >= minimumLengthForSuffixTree)
</span><span class="lines">@@ -566,7 +567,7 @@
</span><span class="cx"> String XSSAuditor::decodedSnippetForName(const FilterTokenRequest& request)
</span><span class="cx"> {
</span><span class="cx"> // Grab a fixed number of characters equal to the length of the token's name plus one (to account for the "<").
</span><del>- return fullyDecodeString(request.sourceTracker.source(request.token), m_encoding).substring(0, request.token.name().size() + 1);
</del><ins>+ return canonicalize(fullyDecodeString(request.sourceTracker.source(request.token), m_encoding).substring(0, request.token.name().size() + 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String XSSAuditor::decodedSnippetForAttribute(const FilterTokenRequest& request, const HTMLToken::Attribute& attribute, AttributeKind treatment)
</span><span class="lines">@@ -577,6 +578,9 @@
</span><span class="cx"> // FIXME: We should grab one character before the name also.
</span><span class="cx"> unsigned start = attribute.startOffset;
</span><span class="cx"> unsigned end = attribute.endOffset;
</span><ins>+
+ // We defer canonicalizing the decoded string here to preserve embedded slashes (if any) that
+ // may lead us to truncate the string.
</ins><span class="cx"> String decodedSnippet = fullyDecodeString(request.sourceTracker.source(request.token, start, end), m_encoding);
</span><span class="cx"> decodedSnippet.truncate(kMaximumFragmentLengthTarget);
</span><span class="cx"> if (treatment == SrcLikeAttribute) {
</span><span class="lines">@@ -625,7 +629,7 @@
</span><span class="cx"> decodedSnippet.truncate(position);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return decodedSnippet;
</del><ins>+ return canonicalize(decodedSnippet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String XSSAuditor::decodedSnippetForJavaScript(const FilterTokenRequest& request)
</span><span class="lines">@@ -696,7 +700,7 @@
</span><span class="cx"> lastNonSpacePosition = foundPosition;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result = fullyDecodeString(string.substring(startPosition, foundPosition - startPosition), m_encoding);
</del><ins>+ result = canonicalize(fullyDecodeString(string.substring(startPosition, foundPosition - startPosition), m_encoding));
</ins><span class="cx"> startPosition = foundPosition + 1;
</span><span class="cx"> }
</span><span class="cx"> return result;
</span></span></pre>
</div>
</div>
</body>
</html>