<!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>[174920] 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/174920">174920</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-20 18:50:41 -0700 (Mon, 20 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tighten XMLHttpRequest setRequestHeader value check
https://bugs.webkit.org/show_bug.cgi?id=128593

Patch by Youenn Fablet &lt;youenn.fablet@crf.canon.fr&gt; 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="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174919 => 174920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-10-21 01:49:43 UTC (rev 174919)
+++ trunk/LayoutTests/ChangeLog        2014-10-21 01:50:41 UTC (rev 174920)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-20  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
+        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-20  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Mark a few tests as no-longer failing.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestsetbadheadervalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt (0 => 174920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue-expected.txt        2014-10-21 01:50:41 UTC (rev 174920)
</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="trunkLayoutTestshttptestsxmlhttprequestsetbadheadervaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html (0 => 174920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/set-bad-headervalue.html        2014-10-21 01:50:41 UTC (rev 174920)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+&lt;!doctype html&gt;
+&lt;html&gt;
+  &lt;head&gt;
+    &lt;meta charset=&quot;utf-8&quot;&gt;
+    &lt;title&gt;XMLHttpRequest: setRequestHeader() value argument checks&lt;/title&gt;
+    &lt;script src=&quot;/js-test-resources/testharness.js&quot;&gt;&lt;/script&gt;
+    &lt;script src=&quot;/js-test-resources/testharnessreport.js&quot;&gt;&lt;/script&gt;
+    &lt;!-- 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 --&gt;
+  &lt;/head&gt;
+  &lt;body&gt;
+    &lt;div id=&quot;log&quot;&gt;&lt;/div&gt;
+    &lt;script&gt;
+      function try_value(value, expectError) {
+        test(function() {
+          var client = new XMLHttpRequest()
+          client.open(&quot;GET&quot;, &quot;...&quot;)
+          if (expectError)
+              assert_throws(&quot;SyntaxError&quot;, function() { client.setRequestHeader(&quot;x-test&quot;, value) }, ' given value ' + value+', ')
+          else
+              client.setRequestHeader(&quot;x-test&quot;, value)  
+          })
+      }
+
+      try_value(&quot;t\rt&quot;, true)
+      try_value(&quot;t\nt&quot;, true)
+      try_value(&quot;テスト&quot;, true)
+      try_value(&quot;t\bt&quot;, true)
+      try_value(&quot;t\vt&quot;, true)
+      try_value(&quot;t\tt&quot;, false)
+      try_value(&quot;t t&quot;, false)
+      try_value(&quot; t&quot;, true)
+      try_value(&quot;t &quot;, true)
+      try_value(&quot;\xd0\xa1&quot;, false)
+      try_value(&quot;\x7f&quot;, true)
+      test(function() {
+        var client = new XMLHttpRequest()
+        client.open(&quot;GET&quot;, &quot;...&quot;)
+        assert_throws({name:'TypeError'}, function() { client.setRequestHeader(&quot;x-test&quot;) })
+      })
+    &lt;/script&gt;
+  &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174919 => 174920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-21 01:49:43 UTC (rev 174919)
+++ trunk/Source/WebCore/ChangeLog        2014-10-21 01:50:41 UTC (rev 174920)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-20  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
+        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  Michael Saboff  &lt;msaboff@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make post checkin suggested changes to r174847
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (174919 => 174920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp        2014-10-21 01:49:43 UTC (rev 174919)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp        2014-10-21 01:50:41 UTC (rev 174920)
</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&amp; name)
</del><ins>+// See RFC 7230, Section 3.2.3.
+bool isValidHTTPHeaderValue(const String&amp; 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') &amp;&amp; !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 &lt; value.length(); ++i) {
+        c = value[i];
+        if (c == 0x7F || c &gt; 0xFF || (c &lt; 0x20 &amp;&amp; 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&amp; characters)
</del><ins>+// See RFC 7230, Section 3.2.6.
+bool isValidHTTPToken(const String&amp; 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 &lt; characters.length(); ++i) {
-        UChar c = characters[i];
</del><ins>+    for (unsigned i = 0; i &lt; value.length(); ++i) {
+        UChar c = value[i];
</ins><span class="cx">         if (c &lt;= 0x20 || c &gt;= 0x7F
</span><span class="cx">             || c == '(' || c == ')' || c == '&lt;' || c == '&gt;' || c == '@'
</span><span class="cx">             || c == ',' || c == ';' || c == ':' || c == '\\' || c == '&quot;'
</span></span></pre>
</div>
</div>

</body>
</html>