<!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>[202910] 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/202910">202910</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-07 09:24:14 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Response constructor should throw in case of bad reason phrase
https://bugs.webkit.org/show_bug.cgi?id=159508
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-07
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/response/response-error-expected.txt:
Source/WebCore:
Covered by rebased test.
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::initializeWith): Validating reason phrase with new routine.
Throwing a TypeError in case of error.
* platform/network/HTTPParsers.cpp:
(WebCore::isValidReasonPhrase): Added to validate reason phrase according
https://tools.ietf.org/html/rfc7230#section-3.1.2
* platform/network/HTTPParsers.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseerrorexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-error-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParsersh">trunk/Source/WebCore/platform/network/HTTPParsers.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-07-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [Fetch API] Response constructor should throw in case of bad reason phrase
+ https://bugs.webkit.org/show_bug.cgi?id=159508
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/fetch/api/response/response-error-expected.txt:
+
+2016-07-07 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> [Fetch API] Response.redirect should throw a RangeError in case of bad status code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159507
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiresponseresponseerrorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-error-expected.txt (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-error-expected.txt 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-error-expected.txt 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -4,10 +4,9 @@
</span><span class="cx"> PASS Throws RangeError when responseInit's status is 199
</span><span class="cx"> PASS Throws RangeError when responseInit's status is 600
</span><span class="cx"> PASS Throws RangeError when responseInit's status is 1000
</span><del>-FAIL Throws TypeError when responseInit's statusText is
- assert_throws: Expect TypeError exception
- function "function () { new Response("", { "statusText" : statusTex..." did not throw
-FAIL Throws TypeError when responseInit's statusText is Ā assert_throws: Expect TypeError exception Ā function "function () { new Response("", { "statusText" : statusTex..." did not throw
</del><ins>+PASS Throws TypeError when responseInit's statusText is
+
+PASS Throws TypeError when responseInit's statusText is Ā
</ins><span class="cx"> PASS Throws TypeError when building a response with body and a body status of 204
</span><span class="cx"> PASS Throws TypeError when building a response with body and a body status of 205
</span><span class="cx"> PASS Throws TypeError when building a response with body and a body status of 304
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/Source/WebCore/ChangeLog 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-07-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [Fetch API] Response constructor should throw in case of bad reason phrase
+ https://bugs.webkit.org/show_bug.cgi?id=159508
+
+ Reviewed by Alex Christensen.
+
+ Covered by rebased test.
+
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::initializeWith): Validating reason phrase with new routine.
+ Throwing a TypeError in case of error.
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::isValidReasonPhrase): Added to validate reason phrase according
+ https://tools.ietf.org/html/rfc7230#section-3.1.2
+ * platform/network/HTTPParsers.h:
+
+2016-07-07 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> [Fetch API] Response.redirect should throw a RangeError in case of bad status code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159507
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "FetchRequest.h"
</span><ins>+#include "HTTPParsers.h"
</ins><span class="cx"> #include "JSFetchResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx">
</span><span class="lines">@@ -86,9 +87,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Validate reason phrase (https://tools.ietf.org/html/rfc7230#section-3.1.2).
</del><span class="cx"> String statusText;
</span><del>- if (!init.get("statusText", statusText)) {
</del><ins>+ if (!init.get("statusText", statusText) || !isValidReasonPhrase(statusText)) {
</ins><span class="cx"> ec = TypeError;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -102,6 +102,17 @@
</span><span class="cx"> return pos != start;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// See RFC 7230, Section 3.1.2.
+bool isValidReasonPhrase(const String& value)
+{
+ for (unsigned i = 0; i < value.length(); ++i) {
+ UChar c = value[i];
+ if (c == 0x7F || c > 0xFF || (c < 0x20 && c != '\t'))
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> // See RFC 7230, Section 3.2.3.
</span><span class="cx"> bool isValidHTTPHeaderValue(const String& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParsersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.h (202909 => 202910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-07-07 16:03:18 UTC (rev 202909)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-07-07 16:24:14 UTC (rev 202910)
</span><span class="lines">@@ -69,13 +69,14 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ContentDispositionType contentDispositionType(const String&);
</span><ins>+bool isValidReasonPhrase(const String&);
</ins><span class="cx"> bool isValidHTTPHeaderValue(const String&);
</span><span class="cx"> bool isValidHTTPToken(const String&);
</span><span class="cx"> bool parseHTTPRefresh(const String& refresh, bool fromHttpEquivMeta, double& delay, String& url);
</span><span class="cx"> Optional<std::chrono::system_clock::time_point> parseHTTPDate(const String&);
</span><del>-String filenameFromHTTPContentDisposition(const String&);
</del><ins>+String filenameFromHTTPContentDisposition(const String&);
</ins><span class="cx"> String extractMIMETypeFromMediaType(const String&);
</span><del>-String extractCharsetFromMediaType(const String&);
</del><ins>+String extractCharsetFromMediaType(const String&);
</ins><span class="cx"> void findCharsetInMediaType(const String& mediaType, unsigned int& charsetPos, unsigned int& charsetLen, unsigned int start = 0);
</span><span class="cx"> XSSProtectionDisposition parseXSSProtectionHeader(const String& header, String& failureReason, unsigned& failurePosition, String& reportURL);
</span><span class="cx"> AtomicString extractReasonPhraseFromHTTPStatusLine(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>