<!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>[188333] 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/188333">188333</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-08-12 03:12:28 -0700 (Wed, 12 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>XHR.setRequestHeader should remove trailing and leading whitespaces from the header value
https://bugs.webkit.org/show_bug.cgi?id=147445
Reviewed by Darin Adler.
Source/WebCore:
Covered by added and modifed tests.
* platform/network/HTTPParsers.h:
(WebCore::isHTTPSpace):
(WebCore::stripLeadingAndTrailingHTTPSpaces):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setRequestHeader): strip trailing and leading whitespace before testing for header value validity and storing.
LayoutTests:
* http/tests/xmlhttprequest/inject-header-expected.txt:
* http/tests/xmlhttprequest/inject-header.html:
* http/tests/xmlhttprequest/resources/print-xtest-header.cgi: Added.
* http/tests/xmlhttprequest/set-bad-headervalue-expected.txt:
* http/tests/xmlhttprequest/set-bad-headervalue.html:
* http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt: Added.
* http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestinjectheaderexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/inject-header-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestinjectheaderhtml">trunk/LayoutTests/http/tests/xmlhttprequest/inject-header.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsetbadheadervalueexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsetbadheadervaluehtml">trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParsersh">trunk/Source/WebCore/platform/network/HTTPParsers.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesprintxtestheadercgi">trunk/LayoutTests/http/tests/xmlhttprequest/resources/print-xtest-header.cgi</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsetrequestheaderallowwhitespaceinvalueexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestsetrequestheaderallowwhitespaceinvaluehtm">trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/LayoutTests/ChangeLog 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-12 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ XHR.setRequestHeader should remove trailing and leading whitespaces from the header value
+ https://bugs.webkit.org/show_bug.cgi?id=147445
+
+ Reviewed by Darin Adler.
+
+ * http/tests/xmlhttprequest/inject-header-expected.txt:
+ * http/tests/xmlhttprequest/inject-header.html:
+ * http/tests/xmlhttprequest/resources/print-xtest-header.cgi: Added.
+ * http/tests/xmlhttprequest/set-bad-headervalue-expected.txt:
+ * http/tests/xmlhttprequest/set-bad-headervalue.html:
+ * http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt: Added.
+ * http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm: Added.
+
</ins><span class="cx"> 2015-08-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [font-features] Map OpenType feature tags to TrueType feature selectors
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestinjectheaderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/inject-header-expected.txt (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/inject-header-expected.txt 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/inject-header-expected.txt 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> Test that setRequestHeader properly checks for line feeds in header values.
</span><span class="cx">
</span><del>-%0AEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</del><ins>+a%0AEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</ins><span class="cx">
</span><del>-%0DEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</del><ins>+a%0DEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</ins><span class="cx">
</span><del>-%0D%0AEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</del><ins>+a%0D%0AEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</ins><span class="cx">
</span><del>-%0A%0DEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</del><ins>+a%0A%0DEvil%3A%20on -> SUCCESS, setRequestHeader() raised an exception Error: SyntaxError: DOM Exception 12
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestinjectheaderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/inject-header.html (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/inject-header.html 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/inject-header.html 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-test("\nEvil: on");
-test("\rEvil: on");
-test("\r\nEvil: on");
-test("\n\rEvil: on");
</del><ins>+test("a\nEvil: on");
+test("a\rEvil: on");
+test("a\r\nEvil: on");
+test("a\n\rEvil: on");
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesprintxtestheadercgi"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resources/print-xtest-header.cgi (0 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/print-xtest-header.cgi (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/print-xtest-header.cgi 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+#!/usr/bin/perl -w
+
+use CGI qw(:standard);
+my $cgi = new CGI;
+
+print "Cache-Control: no-cache, no-store\n";
+print "Content-type: text/plain\n\n";
+print "x-test: $ENV{\"HTTP_X_TEST\"}\n";
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/xmlhttprequest/resources/print-xtest-header.cgi
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsetbadheadervalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -9,6 +9,4 @@
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() value argument checks 7
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() value argument checks 8
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() value argument checks 9
</span><del>-PASS XMLHttpRequest: setRequestHeader() value argument checks 10
-PASS XMLHttpRequest: setRequestHeader() value argument checks 11
</del><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsetbadheadervaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> try_value("t\vt", true)
</span><span class="cx"> try_value("t\tt", false)
</span><span class="cx"> try_value("t t", false)
</span><del>- try_value(" t", true)
- try_value("t ", true)
</del><span class="cx"> try_value("\xd0\xa1", false)
</span><span class="cx"> try_value("\x7f", true)
</span><span class="cx"> test(function() {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsetrequestheaderallowwhitespaceinvalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt (0 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value-expected.txt 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+PASS XMLHttpRequest: setRequestHeader() - header value with whitespace ( )
+PASS XMLHttpRequest: setRequestHeader() - header value with whitespace ( t)
+PASS XMLHttpRequest: setRequestHeader() - header value with whitespace (t )
+PASS XMLHttpRequest: setRequestHeader() - header value with whitespace ( t )
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsetrequestheaderallowwhitespaceinvaluehtm"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm (0 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/setrequestheader-allow-whitespace-in-value.htm 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: setRequestHeader() - header value with whitespace</title>
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[4]/p[contains(@class,'note')] /following::ol/li[6]" />
+ </head>
+ <body>
+ <!-- This is an adaptation of https://github.com/w3c/web-platform-tests/blob/4f91feb51adfdbfd150743bb3b94744b13b1edae/XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm -->
+ <div id="log"></div>
+ <script>
+ function request(value) {
+ test(function() {
+ var client = new XMLHttpRequest()
+ client.open("POST", "resources/print-xtest-header.cgi", false)
+ client.setRequestHeader("X-Test", value)
+ client.send(null)
+ assert_equals(client.responseText, "x-test: " + String(value.trim()).toLowerCase() + "\n" )
+ }, document.title + " (" + value + ")")
+ }
+ request(" ")
+ request(" t")
+ request("t ")
+ request(" t ")
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-12 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ XHR.setRequestHeader should remove trailing and leading whitespaces from the header value
+ https://bugs.webkit.org/show_bug.cgi?id=147445
+
+ Reviewed by Darin Adler.
+
+ Covered by added and modifed tests.
+
+ * platform/network/HTTPParsers.h:
+ (WebCore::isHTTPSpace):
+ (WebCore::stripLeadingAndTrailingHTTPSpaces):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::setRequestHeader): strip trailing and leading whitespace before testing for header value validity and storing.
+
</ins><span class="cx"> 2015-08-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkProcess: DNS prefetch happens in the Web Process
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParsersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.h (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.h 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.h 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -87,6 +87,17 @@
</span><span class="cx"> size_t parseHTTPHeader(const char* data, size_t length, String& failureReason, String& nameStr, String& valueStr, bool strict = true);
</span><span class="cx"> size_t parseHTTPRequestBody(const char* data, size_t length, Vector<unsigned char>& body);
</span><span class="cx">
</span><ins>+inline bool isHTTPSpace(UChar character)
+{
+ return character <= ' ' && (character == ' ' || character == '\n' || character == '\t' || character == '\r');
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// Strip leading and trailing whitespace as defined in https://fetch.spec.whatwg.org/#concept-header-value-normalize.
+inline String stripLeadingAndTrailingHTTPSpaces(const String& string)
+{
+ return string.stripWhiteSpace(isHTTPSpace);
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (188332 => 188333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-08-12 07:29:33 UTC (rev 188332)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-08-12 10:12:28 UTC (rev 188333)
</span><span class="lines">@@ -940,7 +940,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!isValidHTTPToken(name) || !isValidHTTPHeaderValue(value)) {
</del><ins>+ String normalizedValue = stripLeadingAndTrailingHTTPSpaces(value);
+ if (!isValidHTTPToken(name) || !isValidHTTPHeaderValue(normalizedValue)) {
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -951,7 +952,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setRequestHeaderInternal(name, value);
</del><ins>+ setRequestHeaderInternal(name, normalizedValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::setRequestHeaderInternal(const String& name, const String& value)
</span></span></pre>
</div>
</div>
</body>
</html>