<!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>[175896] releases/WebKitGTK/webkit-2.6</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/175896">175896</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-11 03:39:26 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174920">r174920</a> - Tighten XMLHttpRequest setRequestHeader value check
https://bugs.webkit.org/show_bug.cgi?id=128593
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-10-20
Reviewed by Darin Adler.
Source/WebCore:
Test: http/tests/xmlhttprequest/set-bad-headervalue.html
* platform/network/HTTPParsers.cpp:
(WebCore::isValidHTTPHeaderValue): Updated header values check according RFC 7230.
(WebCore::isValidHTTPToken): Renamed variable name and updated RFC related comment.
LayoutTests:
Added a test originating from w3c-test.org to test header values checking.
Testing headers with non ASCII characters and various control characters.
* http/tests/xmlhttprequest/set-bad-headervalue-expected.txt: Added.
* http/tests/xmlhttprequest/set-bad-headervalue.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkHTTPParserscpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestsetbadheadervalueexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestsetbadheadervaluehtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (175895 => 175896)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 11:37:44 UTC (rev 175895)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 11:39:26 UTC (rev 175896)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-20 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Tighten XMLHttpRequest setRequestHeader value check
+ https://bugs.webkit.org/show_bug.cgi?id=128593
+
+ Reviewed by Darin Adler.
+
+ Added a test originating from w3c-test.org to test header values checking.
+ Testing headers with non ASCII characters and various control characters.
+
+ * http/tests/xmlhttprequest/set-bad-headervalue-expected.txt: Added.
+ * http/tests/xmlhttprequest/set-bad-headervalue.html: Added.
+
</ins><span class="cx"> 2014-10-15 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED in WebCore::RenderFlowThread::getRegionRangeForBox
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestsetbadheadervalueexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt (0 => 175896)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt 2014-11-11 11:39:26 UTC (rev 175896)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+
+PASS XMLHttpRequest: setRequestHeader() value argument checks
+PASS XMLHttpRequest: setRequestHeader() value argument checks 1
+PASS XMLHttpRequest: setRequestHeader() value argument checks 2
+PASS XMLHttpRequest: setRequestHeader() value argument checks 3
+PASS XMLHttpRequest: setRequestHeader() value argument checks 4
+PASS XMLHttpRequest: setRequestHeader() value argument checks 5
+PASS XMLHttpRequest: setRequestHeader() value argument checks 6
+PASS XMLHttpRequest: setRequestHeader() value argument checks 7
+PASS XMLHttpRequest: setRequestHeader() value argument checks 8
+PASS XMLHttpRequest: setRequestHeader() value argument checks 9
+PASS XMLHttpRequest: setRequestHeader() value argument checks 10
+PASS XMLHttpRequest: setRequestHeader() value argument checks 11
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestsetbadheadervaluehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html (0 => 175896)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html 2014-11-11 11:39:26 UTC (rev 175896)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>XMLHttpRequest: setRequestHeader() value argument checks</title>
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ <!-- Test based on http://w3c-test.org/web-platform-tests/master/XMLHttpRequest/setrequestheader-bogus-value.htm This test should be removed once wpt XMLHttpRequest is imported if both tests are in sync -->
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ function try_value(value, expectError) {
+ test(function() {
+ var client = new XMLHttpRequest()
+ client.open("GET", "...")
+ if (expectError)
+ assert_throws("SyntaxError", function() { client.setRequestHeader("x-test", value) }, ' given value ' + value+', ')
+ else
+ client.setRequestHeader("x-test", value)
+ })
+ }
+
+ try_value("t\rt", true)
+ try_value("t\nt", true)
+ try_value("ﾃｽﾄ", true)
+ try_value("t\bt", true)
+ try_value("t\vt", true)
+ try_value("t\tt", false)
+ try_value("t t", false)
+ try_value(" t", true)
+ try_value("t ", true)
+ try_value("\xd0\xa1", false)
+ try_value("\x7f", true)
+ test(function() {
+ var client = new XMLHttpRequest()
+ client.open("GET", "...")
+ assert_throws({name:'TypeError'}, function() { client.setRequestHeader("x-test") })
+ })
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175895 => 175896)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 11:37:44 UTC (rev 175895)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 11:39:26 UTC (rev 175896)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-20 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Tighten XMLHttpRequest setRequestHeader value check
+ https://bugs.webkit.org/show_bug.cgi?id=128593
+
+ Reviewed by Darin Adler.
+
+ Test: http/tests/xmlhttprequest/set-bad-headervalue.html
+
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::isValidHTTPHeaderValue): Updated header values check according RFC 7230.
+ (WebCore::isValidHTTPToken): Renamed variable name and updated RFC related comment.
+
</ins><span class="cx"> 2014-10-20 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Use glFlush instead of glFinish when drawing WebGL output to screen.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/HTTPParsers.cpp (175895 => 175896)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/HTTPParsers.cpp 2014-11-11 11:37:44 UTC (rev 175895)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/HTTPParsers.cpp 2014-11-11 11:39:26 UTC (rev 175896)
</span><span class="lines">@@ -102,21 +102,30 @@
</span><span class="cx"> return pos != start;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool isValidHTTPHeaderValue(const String& name)
</del><ins>+// See RFC 7230, Section 3.2.3.
+bool isValidHTTPHeaderValue(const String& value)
</ins><span class="cx"> {
</span><del>- // FIXME: This should really match name against
- // field-value in section 4.2 of RFC 2616.
-
- return !name.contains('\r') && !name.contains('\n');
</del><ins>+ UChar c = value[0];
+ if (c == ' ' || c == '\t')
+ return false;
+ c = value[value.length() - 1];
+ if (c == ' ' || c == '\t')
+ return false;
+ for (unsigned i = 0; i < value.length(); ++i) {
+ c = value[i];
+ if (c == 0x7F || c > 0xFF || (c < 0x20 && c != '\t'))
+ return false;
+ }
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// See RFC 2616, Section 2.2.
-bool isValidHTTPToken(const String& characters)
</del><ins>+// See RFC 7230, Section 3.2.6.
+bool isValidHTTPToken(const String& value)
</ins><span class="cx"> {
</span><del>- if (characters.isEmpty())
</del><ins>+ if (value.isEmpty())
</ins><span class="cx"> return false;
</span><del>- for (unsigned i = 0; i < characters.length(); ++i) {
- UChar c = characters[i];
</del><ins>+ for (unsigned i = 0; i < value.length(); ++i) {
+ UChar c = value[i];
</ins><span class="cx"> if (c <= 0x20 || c >= 0x7F
</span><span class="cx"> || c == '(' || c == ')' || c == '<' || c == '>' || c == '@'
</span><span class="cx"> || c == ',' || c == ';' || c == ':' || c == '\\' || c == '"'
</span></span></pre>
</div>
</div>
</body>
</html>